diff --git a/Makefile b/Makefile index fcc1e54..707b720 100644 --- a/Makefile +++ b/Makefile @@ -34,6 +34,13 @@ TARGET_HOST_CFLAGS += -O1 -g -DDEBUG=$(DEBUG) -Wextra -Wall --pedantic -Wno-miss -Wstrict-prototypes -Winline -Wundef -Wnested-externs -Wcast-qual \ -Wshadow -Wunreachable-code -Wlogical-op -Wfloat-equal -Wstrict-aliasing=2 \ -Wredundant-decls -Wold-style-definition + +ASSET_BUILDER_CFLAGS += -O1 -g -DDEBUG=$(DEBUG) -Wextra -Wall --pedantic -Wno-missing-braces \ + -Wno-missing-field-initializers -Wformat=2 -Wswitch-default -Wswitch \ + -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 endif # @@ -85,5 +92,5 @@ clean-all: run: all $(Q)cd $(BUILD_DIR) && ./$(notdir $(OUTPUT)) -print-var-% : +print-var-% : @echo $($*) diff --git a/asset_builder/Makefile b/asset_builder/Makefile index fe1ef8b..dd0ca7e 100644 --- a/asset_builder/Makefile +++ b/asset_builder/Makefile @@ -17,14 +17,14 @@ endif $(ASSET_BUILDER_OUTPUT): $(OBJECTS) $(Q)mkdir -p $(dir $@) - @echo -e "[100%] $(YELLOW)Linking $(notdir $(ASSET_BUILDER_OUTPUT))$(RESET)" - $(Q)$(ASSET_BUILDER_CC) $(ASSET_BUILDER_CFLAGS) $(ASSET_BUILDER_LDFLAGS) $(OBJECTS) -o $@ + @echo "[100%] $(YELLOW)Linking $(notdir $(ASSET_BUILDER_OUTPUT))$(RESET)" + $(Q)$(ASSET_BUILDER_CC) $(ASSET_BUILDER_CFLAGS) $(OBJECTS) -o $@ $(ASSET_BUILDER_LDFLAGS) $(BUILD_DIR)/$(notdir $(ASSET_BUILDER_DIR))/%.o: $(ASSET_BUILDER_DIR)/% $(Q)mkdir -p $(dir $@) $(eval CURRENT_FILE := $(shell echo $$(($(CURRENT_FILE)+1)))) $(eval PERCENTAGE := $(shell echo $$(($(CURRENT_FILE)*100/$(TOTAL_BUILD_FILES))))) - @echo -e "[$(PERCENTAGE)%] $(GREEN)Building C object $@$(RESET)" + @echo "[$(PERCENTAGE)%] $(GREEN)Building C object $@$(RESET)" $(Q)$(ASSET_BUILDER_CC) $(ASSET_BUILDER_CFLAGS) $(INCLUDES:%=-I%) -MMD -MP -c $< -o $@ -include $(ASSET_BUILDER_OBJECTS:.o=.d) diff --git a/assets/Makefile b/assets/Makefile index d42c758..e5a27e8 100644 --- a/assets/Makefile +++ b/assets/Makefile @@ -19,14 +19,14 @@ TOTAL_BUILD_FILES := $(shell echo $$(($$($(MAKE) -n $(OBJECTS) TOTAL_BUILD_FILES endif $(ASSET_OUTPUT): $(OBJECTS) $(ASSET_BUILDER_OUTPUT) - @echo -e "[100%] $(YELLOW)Building $(notdir $(ASSET_OUTPUT))$(RESET)" + @echo "[100%] $(YELLOW)Building $(notdir $(ASSET_OUTPUT))$(RESET)" $(Q)$(ASSET_BUILDER_OUTPUT) $@ $(OBJECTS) $(BUILD_DIR)/$(notdir $(ASSETS_DIR))/%.o: $(ASSETS_DIR)/% $(ASSET_BUILDER_OUTPUT) $(Q)mkdir -p $(dir $@) $(eval CURRENT_FILE := $(shell echo $$(($(CURRENT_FILE) + 1)))) $(eval PERCENTAGE := $(shell echo $$(($(CURRENT_FILE) * 100 / $(TOTAL_BUILD_FILES))))) - @echo -e "[$(PERCENTAGE)%] $(GREEN)Building ASSET object $@$(RESET)" + @echo "[$(PERCENTAGE)%] $(GREEN)Building ASSET object $@$(RESET)" $(Q)$(ASSET_BUILDER_OUTPUT) $@ -c $< $(ASSET_BUILDER_OUTPUT): FORCE diff --git a/configure b/configure index c981390..ed62454 100755 --- a/configure +++ b/configure @@ -125,8 +125,8 @@ case "${TARGET_HOST}" in TARGET_CC="gcc" TARGET_AR="ar" - TARGET_CFLAGS="--std=c17 -Os -DASSET_FILE_NAME=\\\"\$(notdir \$(ASSET_OUTPUT))\\\" -D_GNU_SOURCE=1 \$(shell pkg-config --cflags sdl3)" - TARGET_LDFLAGS="\$(shell pkg-config --libs sdl3) -lm" + TARGET_CFLAGS="--std=c17 -Os -DASSET_FILE_NAME=\\\"\$(notdir \$(ASSET_OUTPUT))\\\" -D_GNU_SOURCE=1 \$(shell pkg-config --cflags sdl3 lua)" + TARGET_LDFLAGS="\$(shell pkg-config --libs sdl3 lua) -lm" TARGET_LIBCORE="libcore.a" ;; diff --git a/core/Makefile b/core/Makefile index 1465005..a8ff7cd 100644 --- a/core/Makefile +++ b/core/Makefile @@ -24,14 +24,14 @@ endif $(LIBCORE): $(OBJECTS) $(eval CURRENT_FILE := $(shell echo $$(($(CURRENT_FILE) + 1)))) $(eval PERCENTAGE := $(shell echo $$(($(CURRENT_FILE) * 100 / $(TOTAL_BUILD_FILES))))) - @echo -e "[$(PERCENTAGE)%] $(YELLOW)Creating Static Lib $@$(RESET)" + @echo "[$(PERCENTAGE)%] $(YELLOW)Creating Static Lib $@$(RESET)" $(Q)$(TARGET_HOST_AR) rcs $@ $(OBJECTS) $(BUILD_DIR)/$(notdir $(CORE_DIR))/%.o: $(CORE_DIR)/% $(Q)mkdir -p $(dir $@) $(eval CURRENT_FILE := $(shell echo $$(($(CURRENT_FILE) + 1)))) $(eval PERCENTAGE := $(shell echo $$(($(CURRENT_FILE) * 100 / $(TOTAL_BUILD_FILES))))) - @echo -e "[$(PERCENTAGE)%] $(GREEN)Building C object $@$(RESET)" + @echo "[$(PERCENTAGE)%] $(GREEN)Building C object $@$(RESET)" $(Q)$(TARGET_HOST_CC) $(TARGET_HOST_CFLAGS) $(INCLUDES:%=-I%) -MMD -MP -c $< -o $@ -include $(OBJECTS:.o=.d) diff --git a/core/host/linux/display.c b/core/host/linux/display.c index 433de1c..37ce96b 100644 --- a/core/host/linux/display.c +++ b/core/host/linux/display.c @@ -28,14 +28,19 @@ inline int display_init(void) return EXIT_FAILURE; } +#ifdef DRIVERS debug_printf("Listing available render drivers."); const int NB_DRIVERS = SDL_GetNumRenderDrivers(); for(int i = 0; i < NB_DRIVERS; i++) debug_printf("%d : %s", i, SDL_GetRenderDriver(i)); - if(DRIVERS) warning_printf("This build of 2D_Engine_C only support the following drivers : %s", DRIVERS); + warning_printf("This build of 2D_Engine_C only support the following drivers : %s", DRIVERS); game.display.renderer = SDL_CreateRenderer(game.display.window, DRIVERS); +#else + game.display.renderer = SDL_CreateRenderer(game.display.window, NULL); +#endif // DRIVERS + if(!game.display.renderer) { error_printf("Failed to create renderer : %s", SDL_GetError()); @@ -53,13 +58,13 @@ inline int display_init(void) error_printf("Failed to set renderer draw blend mode : %s", SDL_GetError()); return EXIT_FAILURE; } - +/* if(!SDL_SetDefaultTextureScaleMode(game.display.renderer, SDL_SCALEMODE_NEAREST)) { error_printf("Failed to set default texture scale mode : %s", SDL_GetError()); return EXIT_FAILURE; } - +*/ debug_printf("Initialized display."); return EXIT_SUCCESS; diff --git a/core/host/linux/display.h b/core/host/linux/display.h index 5978833..3083c53 100644 --- a/core/host/linux/display.h +++ b/core/host/linux/display.h @@ -14,7 +14,6 @@ #define DISPLAY_WIDTH 720 #define DISPLAY_HEIGHT 480 -//#define DRIVERS NULL #define DRIVERS "vulkan,gpu,software" typedef struct display_t { diff --git a/src/Makefile b/src/Makefile index c82f374..4ff26f5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -23,14 +23,14 @@ TOTAL_BUILD_FILES := $(shell echo $$(($$($(MAKE) -n $(OBJECTS) TOTAL_BUILD_FILES endif $(OUTPUT): $(OBJECTS) $(LIBCORE) - @echo -e "[100%] $(YELLOW)Linking $(notdir $(OUTPUT))$(RESET)" - $(Q)$(TARGET_HOST_CC) $(TARGET_HOST_CFLAGS) $(TARGET_HOST_LDFLAGS) $(OBJECTS) -L$(BUILD_DIR) -lcore -o $@ + @echo "[100%] $(YELLOW)Linking $(notdir $(OUTPUT))$(RESET)" + $(Q)$(TARGET_HOST_CC) $(TARGET_HOST_CFLAGS) $(OBJECTS) -o $@ -L$(BUILD_DIR) -lcore $(TARGET_HOST_LDFLAGS) $(BUILD_DIR)/$(notdir $(SOURCE_DIR))/%.o: $(SOURCE_DIR)/% $(Q)mkdir -p $(dir $@) $(eval CURRENT_FILE := $(shell echo $$(($(CURRENT_FILE) + 1)))) $(eval PERCENTAGE := $(shell echo $$(($(CURRENT_FILE) * 100 / $(TOTAL_BUILD_FILES))))) - @echo -e "[$(PERCENTAGE)%] $(GREEN)Building C object $@$(RESET)" + @echo "[$(PERCENTAGE)%] $(GREEN)Building C object $@$(RESET)" $(Q)$(TARGET_HOST_CC) $(TARGET_HOST_CFLAGS) $(INCLUDES:%=-I%) -MMD -MP -c $< -o $@ $(LIBCORE): FORCE diff --git a/src/components/lua_component.h b/src/components/lua_component.h index bfd6051..4a41be6 100644 --- a/src/components/lua_component.h +++ b/src/components/lua_component.h @@ -1,8 +1,8 @@ #ifndef LUA_COMPONENT_H #define LUA_COMPONENT_H +#include #include "ecs.h" -#include "lua.h" #include "errors.h" typedef struct lua_component_data_t { diff --git a/src/game.c b/src/game.c index 60e2bcc..fe12cb7 100644 --- a/src/game.c +++ b/src/game.c @@ -118,15 +118,15 @@ int game_init(void) if(!entity_new_component(player_entity, PLAYER_SYSTEM)) return_failure_int; } - /* ======== Enemy ======== */ +/* { entity_t *enemy_entity = entity_manager_new_entity(1); if(!enemy_entity) return_failure_int; if(!entity_new_component(enemy_entity, LUA_COMPONENT)) return_failure_int; } - +*/ game.is_running = true; return EXIT_SUCCESS;