From 97e73361fb046b69c0ae6ba473f5ba18357da4b9 Mon Sep 17 00:00:00 2001
From: Anonymus Raccoon
Date: Wed, 25 Mar 2020 16:47:38 +0100
Subject: [PATCH] Cleaning up
---
.gitignore | 2 +-
CMakeLists.txt | 6 +++---
Makefile | 28 ++++++++++++++--------------
prefabs/mainmenu.gcprefab | 2 +-
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/.gitignore b/.gitignore
index ce4a145..eaf7889 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
**/*.gcdo
**/*.gcna
**/vgcore*
-my_world
+my_rpg
**/ut
.vscode/
.idea/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 891f72a..82cb160 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.15)
-project(My3D C)
+project(my_rpg C)
set(CMAKE_C_STANDARD 11)
@@ -12,7 +12,7 @@ include_directories(lib/gamacon/include/systems/controllers)
include_directories(lib/my/include)
include_directories(lib/xmlparser/include)
-add_executable(My3D
+add_executable(my_rpg
include/my.h
include/setup.h
lib/gamacon/include/components/controllers/keyboard_controller.h
@@ -268,4 +268,4 @@ target_link_libraries(My3D
csfml-audio
csfml-window
m
-)
\ No newline at end of file
+)
diff --git a/Makefile b/Makefile
index 87541fb..921ed54 100644
--- a/Makefile
+++ b/Makefile
@@ -5,24 +5,24 @@
## Makefile
##
-SRC = src/main.c \
+SRC = src/main.c \
src/game_loader.c \
src/framerate.c \
src/main_menu.c \
src/options.c \
src/selectors.c \
src/toolbar.c \
- src/teams/absent.c \
- src/teams/forgot.c \
- src/systems/game_display_system.c \
- src/systems/game_manager_system.c \
- src/systems/teams_system.c \
- src/isometry/map_interactions.c \
- src/isometry/tile_collision_manager.c \
- src/components/map_manager_component.c \
- src/components/game_display.c \
- src/components/game_manager.c \
- src/components/teams_component.c
+ src/teams/absent.c \
+ src/teams/forgot.c \
+ src/systems/game_display_system.c \
+ src/systems/game_manager_system.c \
+ src/systems/teams_system.c \
+ src/isometry/map_interactions.c \
+ src/isometry/tile_collision_manager.c \
+ src/components/map_manager_component.c \
+ src/components/game_display.c \
+ src/components/game_manager.c \
+ src/components/teams_component.c
OBJ = $(SRC:%.c=%.o)
@@ -33,7 +33,7 @@ CFLAGS = $(INCLUDE) -Wall -Wshadow -Wextra -Wno-unused-parameter
LDFLAGS = -L lib/gamacon -L lib/my -L lib/xmlparser -L lib/quadtree\
-lgamacon -lxmlparser -lquadtree -lmy -lcsfml-system -lcsfml-graphics -lcsfml-audio -lcsfml-window -lm
-NAME = my_world
+NAME = my_rpg
CC = gcc
@@ -72,4 +72,4 @@ dbg: clean $(OBJ)
$(MAKE) -C lib/quadtree dbg
$(CC) -o $(NAME) $(OBJ) $(LDFLAGS)
-.PHONY: all build clean fclean ffclean
\ No newline at end of file
+.PHONY: all build clean fclean ffclean
diff --git a/prefabs/mainmenu.gcprefab b/prefabs/mainmenu.gcprefab
index b430f52..8c7cab7 100644
--- a/prefabs/mainmenu.gcprefab
+++ b/prefabs/mainmenu.gcprefab
@@ -7,7 +7,7 @@
-
+