diff --git a/CMakeLists.txt b/CMakeLists.txt index 6422ef6..0f5b72c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -198,7 +198,7 @@ add_executable(My3D lib/xmlparser/src/xmlparser.c lib/xmlparser/src/xmlproperties.c src/game_loader.c - main.c) + main.c lib/gamacon/include/errors.h lib/gamacon/src/ui/button.c lib/gamacon/src/ui/setup_ui.c lib/gamacon/include/ui.h) add_compile_options(-W -Wall -Wextra -Wshadow) diff --git a/Makefile b/Makefile index bf65782..8976365 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ CC = gcc all: build -build: $(OBJ) +$(NAME): $(OBJ) $(MAKE) -C lib/gamacon $(MAKE) -C lib/my $(MAKE) -C lib/xmlparser diff --git a/lib/gamacon b/lib/gamacon index 1b3b69b..1a11c50 160000 --- a/lib/gamacon +++ b/lib/gamacon @@ -1 +1 @@ -Subproject commit 1b3b69b65b298eea3c4b98a3ce6392c54be1c1ed +Subproject commit 1a11c5074a4d40df9c0bb1cdf9af4d275bc1a3dc diff --git a/prefabs/game.gcprefab b/prefabs/game.gcprefab index 20a1235..d7216f4 100644 --- a/prefabs/game.gcprefab +++ b/prefabs/game.gcprefab @@ -1,9 +1,11 @@ + +