mirror of
https://github.com/zoriya/ForecastingVillage.git
synced 2025-12-06 05:46:09 +00:00
Cleaning up
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -3,7 +3,7 @@
|
|||||||
**/*.gcdo
|
**/*.gcdo
|
||||||
**/*.gcna
|
**/*.gcna
|
||||||
**/vgcore*
|
**/vgcore*
|
||||||
my_world
|
my_rpg
|
||||||
**/ut
|
**/ut
|
||||||
.vscode/
|
.vscode/
|
||||||
.idea/
|
.idea/
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
cmake_minimum_required(VERSION 3.15)
|
cmake_minimum_required(VERSION 3.15)
|
||||||
project(My3D C)
|
project(my_rpg C)
|
||||||
|
|
||||||
set(CMAKE_C_STANDARD 11)
|
set(CMAKE_C_STANDARD 11)
|
||||||
|
|
||||||
@@ -12,7 +12,7 @@ include_directories(lib/gamacon/include/systems/controllers)
|
|||||||
include_directories(lib/my/include)
|
include_directories(lib/my/include)
|
||||||
include_directories(lib/xmlparser/include)
|
include_directories(lib/xmlparser/include)
|
||||||
|
|
||||||
add_executable(My3D
|
add_executable(my_rpg
|
||||||
include/my.h
|
include/my.h
|
||||||
include/setup.h
|
include/setup.h
|
||||||
lib/gamacon/include/components/controllers/keyboard_controller.h
|
lib/gamacon/include/components/controllers/keyboard_controller.h
|
||||||
@@ -268,4 +268,4 @@ target_link_libraries(My3D
|
|||||||
csfml-audio
|
csfml-audio
|
||||||
csfml-window
|
csfml-window
|
||||||
m
|
m
|
||||||
)
|
)
|
||||||
|
|||||||
28
Makefile
28
Makefile
@@ -5,24 +5,24 @@
|
|||||||
## Makefile
|
## Makefile
|
||||||
##
|
##
|
||||||
|
|
||||||
SRC = src/main.c \
|
SRC = src/main.c \
|
||||||
src/game_loader.c \
|
src/game_loader.c \
|
||||||
src/framerate.c \
|
src/framerate.c \
|
||||||
src/main_menu.c \
|
src/main_menu.c \
|
||||||
src/options.c \
|
src/options.c \
|
||||||
src/selectors.c \
|
src/selectors.c \
|
||||||
src/toolbar.c \
|
src/toolbar.c \
|
||||||
src/teams/absent.c \
|
src/teams/absent.c \
|
||||||
src/teams/forgot.c \
|
src/teams/forgot.c \
|
||||||
src/systems/game_display_system.c \
|
src/systems/game_display_system.c \
|
||||||
src/systems/game_manager_system.c \
|
src/systems/game_manager_system.c \
|
||||||
src/systems/teams_system.c \
|
src/systems/teams_system.c \
|
||||||
src/isometry/map_interactions.c \
|
src/isometry/map_interactions.c \
|
||||||
src/isometry/tile_collision_manager.c \
|
src/isometry/tile_collision_manager.c \
|
||||||
src/components/map_manager_component.c \
|
src/components/map_manager_component.c \
|
||||||
src/components/game_display.c \
|
src/components/game_display.c \
|
||||||
src/components/game_manager.c \
|
src/components/game_manager.c \
|
||||||
src/components/teams_component.c
|
src/components/teams_component.c
|
||||||
|
|
||||||
OBJ = $(SRC:%.c=%.o)
|
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\
|
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
|
-lgamacon -lxmlparser -lquadtree -lmy -lcsfml-system -lcsfml-graphics -lcsfml-audio -lcsfml-window -lm
|
||||||
|
|
||||||
NAME = my_world
|
NAME = my_rpg
|
||||||
|
|
||||||
CC = gcc
|
CC = gcc
|
||||||
|
|
||||||
@@ -72,4 +72,4 @@ dbg: clean $(OBJ)
|
|||||||
$(MAKE) -C lib/quadtree dbg
|
$(MAKE) -C lib/quadtree dbg
|
||||||
$(CC) -o $(NAME) $(OBJ) $(LDFLAGS)
|
$(CC) -o $(NAME) $(OBJ) $(LDFLAGS)
|
||||||
|
|
||||||
.PHONY: all build clean fclean ffclean
|
.PHONY: all build clean fclean ffclean
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
<gc_entities>
|
<gc_entities>
|
||||||
<camera x="0" y="0" />
|
<camera x="0" y="0" />
|
||||||
<panel src="panel" x="50%" y="45%" width="300" height="69%"/>
|
<panel src="panel" x="50%" y="45%" width="300" height="69%"/>
|
||||||
<text text="DPR tycoon" x="50%" y="25%" resize="false"/>
|
<text text="Forcast Village" x="50%" y="25%" resize="false"/>
|
||||||
<button text="Start Game" x="50%" y="50%" click="start_button" color="black" width="200" resize="false" />
|
<button text="Start Game" x="50%" y="50%" click="start_button" color="black" width="200" resize="false" />
|
||||||
<button text="Options" x="50%" y="61%" click="options" color="black" width="200" resize="false" />
|
<button text="Options" x="50%" y="61%" click="options" color="black" width="200" resize="false" />
|
||||||
<button text="Quit game" x="50%" y="72%" click="quit" color="black" width="200" resize="false" />
|
<button text="Quit game" x="50%" y="72%" click="quit" color="black" width="200" resize="false" />
|
||||||
|
|||||||
Reference in New Issue
Block a user