diff --git a/assets/Makefile b/assets/Makefile index cc3562a..12771c5 100644 --- a/assets/Makefile +++ b/assets/Makefile @@ -20,8 +20,7 @@ asset_setup: # Compress assets into tar file $(BUILD_DIR)/$(ASSET_OUTPUT): $(ASSETS:%=$(ASSETS_DIR)/%) @echo -e "[100%] $(YELLOW)Compressing $(ASSET_OUTPUT)$(RESET)" - $(Q)tar -cf $(BUILD_DIR)/$(ASSETS_DIR)/assets.tar $^ - $(Q)lz4 --favor-decSpeed -fqtz $(BUILD_DIR)/$(ASSETS_DIR)/assets.tar $@ + $(Q)tar -cf $@ $^ # Print ending message assets_end: $(BUILD_DIR)/$(SOURCE_OUTPUT) diff --git a/src/Makefile b/src/Makefile index b2d2670..e5d9871 100644 --- a/src/Makefile +++ b/src/Makefile @@ -10,7 +10,16 @@ SOURCES := \ # Compiler and flags SRC_CC = gcc -SRC_CFLAGS = -Wall -Wextra -std=c17 -g +#SRC_CFLAGS = -std=c17 -pedantic -O3 # RELEASE +SRC_CFLAGS = -std=c17 --pedantic -O0 -g \ + -Wall -Wno-missing-braces -Wextra -Wno-missing-field-initializers \ + -Wformat=2 -Wswitch-default -Wswitch-enum -Wcast-align \ + -Wpointer-arith -Wbad-function-cast -Wstrict-overflow=5 \ + -Wstrict-prototypes -Winline -Wundef -Wnested-externs \ + -Wcast-qual -Wshadow -Wunreachable-code -Wlogical-op \ + -Wfloat-equal -Wstrict-aliasing=2 -Wredundant-decls \ + -Wold-style-definition # DEVELOPEMENT + SRC_INCLUDE_DIRS = $(SOURCE_DIR)/headers $(SOURCE_DIR)/ecs/headers $(SOURCE_DIR)/ecs/components/headers $(CORE_DIR)/$(CORE_SRC_DIR)/headers SRC_LDFLAGS = diff --git a/src/game.c b/src/game.c index 4396531..46c692d 100644 --- a/src/game.c +++ b/src/game.c @@ -1,15 +1,16 @@ #include #include #include +#include #include "game.h" #include "components.h" void game_init(void) { display_init(); + asset_manager_init(); texture_manager_init(&game.texture_manager); - entity_manager_init(&game.entity_manager); entity_t *player = create_entity(0); @@ -71,5 +72,6 @@ void game_exit(void) entity_manager_clear(&game.entity_manager); texture_manager_clear(&game.texture_manager); + asset_manager_exit(); display_exit(); } diff --git a/src/main.c b/src/main.c index a2ab168..8efbc40 100644 --- a/src/main.c +++ b/src/main.c @@ -29,7 +29,7 @@ int main(void) int main(void) { - display_clear(COLOR_WHITE); + display_clear(C_BLACK); texture_manager_t texture_manager; texture_manager_init(&texture_manager); @@ -72,7 +72,7 @@ int main(void) int main(void) { - display_clear(COLOR_WHITE); + display_clear(C_BLACK); linked_list_t linked_list; linked_list_init(&linked_list, sizeof(int), NULL);