ulysse
/
2D_Engine_C
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Making functionnal build chain. Tested on linux.

This commit is contained in:
Ulysse Cura 2026-09-08 23:14:21 +02:00
parent 416f313878
commit cd455c58fc
7 changed files with 156 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
.vscode/tasks.json vendored
View File

@ -1,6 +1,23 @@
{ {
"version": "2.0.0", "version": "2.0.0",
"tasks": [ "tasks": [
{
"label": "Configure",
"detail": "Configure project",
"type": "shell",
"command": "${workspaceFolder}/configure",
"args": [
],
"group": "build",
"presentation": {
"echo": true,
"reveal": "always",
"focus": true,
"panel": "shared",
"showReuseMessage": true,
"clear": true
}
},
{ {
"label": "Build", "label": "Build",
"detail": "Build project", "detail": "Build project",
@ -56,12 +73,13 @@
} }
}, },
{ {
"label": "Run", "label": "Run Debug",
"detail": "Build project and run", "detail": "Build project in debug mode and run",
"type": "shell", "type": "shell",
"command": "make", "command": "make",
"args": [ "args": [
"-j$(nproc)", "-j$(nproc)",
"DEBUG=2",
"run" "run"
], ],
"group": "build", "group": "build",
@ -75,13 +93,13 @@
} }
}, },
{ {
"label": "Build Release", "label": "Build Debug",
"detail": "Build project in release mode", "detail": "Build project in debug mode",
"type": "shell", "type": "shell",
"command": "make", "command": "make",
"args": [ "args": [
"-j$(nproc)", "-j$(nproc)",
"RELEASE=1" "DEBUG=2"
], ],
"group": "build", "group": "build",
"presentation": { "presentation": {
@ -93,5 +111,5 @@
"clear": true "clear": true
} }
} }
] ]
} }

41
Makefile
View File

@ -1,3 +1,5 @@
export
SHELL = /usr/bin/env bash SHELL = /usr/bin/env bash
ROOT := $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) ROOT := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
@ -9,20 +11,22 @@ endif
include $(ROOT)/config.mk include $(ROOT)/config.mk
# #
# User config # User settings
# #
BUILD_DIR_NAME = build BUILD_DIR = build
SOURCE_DIR = src SOURCE_DIR = src
CORE_DIR = core CORE_DIR = core
HOST_DIR = host ASSETS_DIR = assets
ASSET_BUILDER_DIR = asset_builder
OUTPUT = 2D_Engine OUTPUT = 2D_Engine
ASSET_OUTPUT = game.data ASSET_OUTPUT = game.data
ASSET_BUILDER_OUTPUT = asset_builder/asset_builder
ifneq ($(DEBUG),) ifneq ($(DEBUG),)
CFLAGS += -O1 -g -DDEBUG=$(DEBUG) -Wextra -Wall --pedantic -Wno-missing-braces \ TARGET_HOST_CFLAGS += -O1 -g -DDEBUG=$(DEBUG) -Wextra -Wall --pedantic -Wno-missing-braces \
-Wno-missing-field-initializers -Wformat=2 -Wswitch-default -Wswitch \ -Wno-missing-field-initializers -Wformat=2 -Wswitch-default -Wswitch \
-Wcast-align -Wpointer-arith -Wbad-function-cast -Wstrict-overflow=5 \ -Wcast-align -Wpointer-arith -Wbad-function-cast -Wstrict-overflow=5 \
-Wstrict-prototypes -Winline -Wundef -Wnested-externs -Wcast-qual \ -Wstrict-prototypes -Winline -Wundef -Wnested-externs -Wcast-qual \
@ -34,11 +38,21 @@ endif
# End # End
# #
# Relocate build dir # Relocate vars
BUILD_DIR := $(ROOT)/$(BUILD_DIR_NAME)/$(HOST) BUILD_DIR := $(ROOT)/$(BUILD_DIR)/$(TARGET_HOST)
SOURCE_DIR := $(ROOT)/$(SOURCE_DIR)
CORE_DIR := $(ROOT)/$(CORE_DIR)
ASSETS_DIR := $(ROOT)/$(ASSETS_DIR)
ASSET_BUILDER_DIR := $(ROOT)/$(ASSET_BUILDER_DIR)
OUTPUT := $(BUILD_DIR)/$(OUTPUT)
LIBCORE := $(BUILD_DIR)/$(LIBCORE)
ASSET_OUTPUT := $(BUILD_DIR)/$(ASSET_OUTPUT)
ASSET_BUILDER_OUTPUT := $(BUILD_DIR)/$(ASSET_BUILDER_OUTPUT)
# Verbosity # Verbosity
Q := @ export Q := @
ifeq ($(VERBOSE), 1) ifeq ($(VERBOSE), 1)
Q := Q :=
endif endif
@ -49,21 +63,20 @@ YELLOW := \033[33m
RESET := \033[m RESET := \033[m
# Default targets # Default targets
all: setup $(BUILD_DIR)/$(OUTPUT) all: $(OUTPUT) $(ASSET_OUTPUT)
include $(ROOT)/$(SOURCE_DIR)/Makefile $(OUTPUT):
include $(ROOT)/$(CORE_DIR)/Makefile $(Q)cd $(SOURCE_DIR) && $(MAKE) $@
setup: $(ASSET_OUTPUT):
$(eval export TOTAL_BUILD_FILES := $(shell echo $$(($$(make -n $(OBJECTS) $(CORE_OBJECTS) 2>/dev/null | grep -c $(CC)) + 2)))) $(Q)cd $(ASSETS_DIR) && $(MAKE) $@
$(Q)mkdir -p $(dir $(OBJECTS) $(CORE_OBJECTS))
.PHONY: clean run print-var-% .PHONY: clean run print-var-%
clean: clean:
$(Q)rm -rf $(dir $(BUILD_DIR)) $(Q)rm -rf $(dir $(BUILD_DIR))
run: all run: all
$(Q)cd $(BUILD_DIR) && ./$(OUTPUT) $(Q)cd $(BUILD_DIR) && ./$(notdir $(OUTPUT))
print-var-% : print-var-% :
@echo $($*) @echo $($*)

39
assets/Makefile
View File

@ -9,37 +9,22 @@ ASSETS := \
maps/dungeon_entry.map \ maps/dungeon_entry.map \
maps/dungeon_room_1.map maps/dungeon_room_1.map
ASSETS := $(addprefix $(ASSETS_DIR)/,$(ASSETS)) OBJECTS := $(ASSETS:%=$(BUILD_DIR)/$(notdir $(ASSETS_DIR))/%.o)
ASSETS_OBJECTS = $(ASSETS:%=$(BUILD_DIR)/%.o) ifeq ($(TOTAL_BUILD_FILES),)
TOTAL_BUILD_FILES := $(shell echo $$(($$($(MAKE) -n $(OBJECTS) TOTAL_BUILD_FILES=1 2>/dev/null | grep -c Building) + 1)))
endif
ASSET_BUILDER_DIR = $(ASSETS_DIR)/asset_builder/src $(ASSET_OUTPUT): $(OBJECTS) $(ASSET_BUILDER_OUTPUT)
ASSET_BUILDER_OUTPUT = $(BUILD_DIR)/$(ASSETS_DIR)/asset_builder/asset_builder
include $(ASSET_BUILDER_DIR)/Makefile
build_assets: setup_asset build_asset_builder count_assets_build asset_end
# Current file nb to process
CURRENT_ASSET_FILE := 0
# Count nb of files to build
count_assets_build:
$(eval export TOTAL_ASSETS_FILES := $(shell echo $$(($$(make -n $(ASSETS_OBJECTS) 2>/dev/null | grep -c "Building") + 1))))
setup_asset:
@echo "Building $(notdir $(ASSET_OUTPUT))"
$(Q)mkdir -p $(dir $(ASSETS_OBJECTS))
$(ASSET_OUTPUT): $(ASSETS_OBJECTS) $(ASSET_BUILDER_OUTPUT)
@echo -e "[100%] $(YELLOW)Building $(notdir $(ASSET_OUTPUT))$(RESET)" @echo -e "[100%] $(YELLOW)Building $(notdir $(ASSET_OUTPUT))$(RESET)"
$(Q)$(ASSET_BUILDER_OUTPUT) $@ $(ASSETS_OBJECTS) $(Q)$(ASSET_BUILDER_OUTPUT) $@ $(OBJECTS)
# Build .o files $(BUILD_DIR)/$(notdir $(ASSETS_DIR))/%.o: $(ASSETS_DIR)/% $(ASSET_BUILDER_OUTPUT)
$(BUILD_DIR)/$(ASSETS_DIR)/%.o: $(ASSETS_DIR)/% $(ASSET_BUILDER_OUTPUT) $(Q)mkdir -p $(dir $@)
$(eval CURRENT_ASSET_FILE := $(shell echo $$(($(CURRENT_ASSET_FILE)+1)))) $(eval CURRENT_FILE := $(shell echo $$(($(CURRENT_FILE) + 1))))
$(eval PERCENTAGE := $(shell echo $$(($(CURRENT_ASSET_FILE)*100/$(TOTAL_ASSETS_FILES))))) $(eval PERCENTAGE := $(shell echo $$(($(CURRENT_FILE) * 100 / $(TOTAL_BUILD_FILES)))))
@echo -e "[$(PERCENTAGE)%] $(GREEN)Building ASSET object $@$(RESET)" @echo -e "[$(PERCENTAGE)%] $(GREEN)Building ASSET object $@$(RESET)"
$(Q)$(ASSET_BUILDER_OUTPUT) $@ -c $< $(Q)$(ASSET_BUILDER_OUTPUT) $@ -c $<
asset_end: $(ASSET_OUTPUT) $(ASSET_BUILDER_OUTPUT):
@echo "Built target $(notdir $(ASSET_OUTPUT))" $(Q)cd $(ASSET_BUILDER_DIR) && $(MAKE) $@

100
configure vendored
View File

@ -93,70 +93,84 @@ case "${OSTYPE}" in
;; ;;
esac esac
echo "Detected current host: ${CURRENT_HOST}" echo "Configuring for current host: ${CURRENT_HOST}"
if [ "${TARGET_HOST}" = "guess" ]; then if [ "${TARGET_HOST}" = "guess" ]; then
TARGET_HOST=${CURRENT_HOST} TARGET_HOST=${CURRENT_HOST}
fi fi
case "${TARGET_HOST}" in case "${CURRENT_HOST}" in
linux|fxcg50) linux)
echo "Configuring for target: ${TARGET_HOST}" ASSET_BUILDER_CC="gcc"
ASSET_BUILDER_AR="ar"
ASSET_BUILDER_CFLAGS="--std=c17 -O2 \$(shell pkg-config --cflags libpng json-c)"
ASSET_BUILDER_LDFLAGS="\$(shell pkg-config --libs libpng json-c)"
;; ;;
*) *)
print_error "Unsupported target host: ${TARGET_HOST}" print_error "Compiling from ${CURRENT_HOST} is not supported yet."
;; ;;
esac esac
echo case "${TARGET_HOST}" in
linux)
echo "Configuring for target: ${TARGET_HOST}"
if [ "${CURRENT_HOST}" != "${TARGET_HOST}" ]; then case "${CURRENT_HOST}" in
CROSS_COMPILE=TRUE
fi
if [ -n "${CROSS_COMPILE}" ]; then
case "${TARGET_HOST}" in
fxcg50)
case "${CURRENT_HOST}" in
linux)
;;
*)
print_error "Cross compiling from ${CURRENT_HOST} for ${TARGET_HOST} is not supported yet."
;;
esac
CC="sh-elf-gcc"
AR="sh-elf-ar"
LIBCORE="libcore.a"
;;
esac
else
case "${TARGET_HOST}" in
linux) linux)
CC="gcc"
AR="ar"
CFLAGS="--std=c17 -Os -DASSET_FILE_NAME=\\\"\$(notdir \$(ASSET_OUTPUT))\\\" -D_GNU_SOURCE=1 \$(shell pkg-config --cflags sdl3)"
LDFLAGS="\$(shell pkg-config --libs sdl3) -lm"
LIBCORE="libcore.a"
;; ;;
*) *)
print_error "Cross compiling from ${CURRENT_HOST} to ${TARGET_HOST} is not supported yet."
;; ;;
esac esac
fi
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_LIBCORE="libcore.a"
;;
fxcg50)
echo "Configuring for target: ${TARGET_HOST}"
case "${CURRENT_HOST}" in
linux)
;;
*)
print_error "Cross compiling from ${CURRENT_HOST} to ${TARGET_HOST} is not supported yet."
;;
esac
TARGET_CC="sh-elf-gcc"
TARGET_AR="sh-elf-ar"
TARGET_CFLAGS="--std=c17 -O3"
TARGET_LDFLAGS=""
TARGET_LIBCORE="libcore.a"
;;
*)
print_error "Unsupported target host: ${TARGET_HOST}"
esac
echo "Writing config file." echo "Writing config file."
echo echo
echo "${CONFIG_FILE}:" echo "${CONFIG_FILE}:"
echo "\`\`\`" echo "\`\`\`"
echo "HOST = ${TARGET_HOST}" | tee ${CONFIG_FILE} tee ${CONFIG_FILE} <<EOF
echo | tee -a ${CONFIG_FILE} # This file was generated by the configure script.
echo "CC = ${CC}" | tee -a ${CONFIG_FILE}
echo "AR = ${AR}" | tee -a ${CONFIG_FILE} TARGET_HOST = ${TARGET_HOST}
echo "CFLAGS = ${CFLAGS}" | tee -a ${CONFIG_FILE} LIBCORE = ${TARGET_LIBCORE}
echo "LDFLAGS = ${LDFLAGS}" | tee -a ${CONFIG_FILE}
echo | tee -a ${CONFIG_FILE} TARGET_HOST_CC = ${TARGET_CC}
echo "LIBCORE = ${LIBCORE}" | tee -a ${CONFIG_FILE} TARGET_HOST_AR = ${TARGET_AR}
TARGET_HOST_CFLAGS = ${TARGET_CFLAGS}
TARGET_HOST_LDFLAGS = ${TARGET_LDFLAGS}
ASSET_BUILDER_CC = ${ASSET_BUILDER_CC}
ASSET_BUILDER_AR = ${ASSET_BUILDER_AR}
ASSET_BUILDER_CFLAGS = ${ASSET_BUILDER_CFLAGS}
ASSET_BUILDER_LDFLAGS = ${ASSET_BUILDER_LDFLAGS}
EOF
echo "\`\`\`" echo "\`\`\`"
# #

26
core/Makefile
View File

@ -1,4 +1,4 @@
CORE_SOURCES += \ SOURCES += \
main.c \ main.c \
camera.c \ camera.c \
linked_list.c \ linked_list.c \
@ -8,24 +8,30 @@ CORE_SOURCES += \
inputs.c \ inputs.c \
map.c map.c
CORE_INCLUDES += \ INCLUDES += \
$(CORE_DIR) \ $(CORE_DIR) \
$(CORE_DIR)/$(HOST_DIR)/$(HOST) \ $(CORE_DIR)/host/$(TARGET_HOST) \
$(SOURCE_DIR)/components $(SOURCE_DIR)/components
include $(ROOT)/$(CORE_DIR)/$(HOST_DIR)/$(HOST)/Makefile include $(CORE_DIR)/host/$(TARGET_HOST)/Makefile
CORE_OBJECTS := $(CORE_SOURCES:%=$(BUILD_DIR)/$(CORE_DIR)/%.o)
$(BUILD_DIR)/$(LIBCORE): $(CORE_OBJECTS) OBJECTS := $(SOURCES:%=$(BUILD_DIR)/$(notdir $(CORE_DIR))/%.o)
ifeq ($(TOTAL_BUILD_FILES),)
TOTAL_BUILD_FILES := $(shell echo $$(($$($(MAKE) -n $(OBJECTS) TOTAL_BUILD_FILES=1 2>/dev/null | grep -c Building) + 1)))
endif
$(LIBCORE): $(OBJECTS)
$(eval CURRENT_FILE := $(shell echo $$(($(CURRENT_FILE) + 1)))) $(eval CURRENT_FILE := $(shell echo $$(($(CURRENT_FILE) + 1))))
$(eval PERCENTAGE := $(shell echo $$(($(CURRENT_FILE) * 100 / $(TOTAL_BUILD_FILES))))) $(eval PERCENTAGE := $(shell echo $$(($(CURRENT_FILE) * 100 / $(TOTAL_BUILD_FILES)))))
@echo -e "[$(PERCENTAGE)%] $(YELLOW)Creating Static Lib $@$(RESET)" @echo -e "[$(PERCENTAGE)%] $(YELLOW)Creating Static Lib $@$(RESET)"
$(Q)$(AR) rcs $@ $(CORE_OBJECTS) $(Q)$(TARGET_HOST_AR) rcs $@ $(OBJECTS)
$(BUILD_DIR)/$(CORE_DIR)/%.c.o: $(ROOT)/$(CORE_DIR)/%.c $(BUILD_DIR)/$(notdir $(CORE_DIR))/%.o: $(CORE_DIR)/%
$(Q)mkdir -p $(dir $@)
$(eval CURRENT_FILE := $(shell echo $$(($(CURRENT_FILE) + 1)))) $(eval CURRENT_FILE := $(shell echo $$(($(CURRENT_FILE) + 1))))
$(eval PERCENTAGE := $(shell echo $$(($(CURRENT_FILE) * 100 / $(TOTAL_BUILD_FILES))))) $(eval PERCENTAGE := $(shell echo $$(($(CURRENT_FILE) * 100 / $(TOTAL_BUILD_FILES)))))
@echo -e "[$(PERCENTAGE)%] $(GREEN)Building C object $@$(RESET)" @echo -e "[$(PERCENTAGE)%] $(GREEN)Building C object $@$(RESET)"
$(Q)$(CC) $(CFLAGS) $(CORE_INCLUDES:%=-I%) -MMD -MP -c $< -o $@ $(Q)$(TARGET_HOST_CC) $(TARGET_HOST_CFLAGS) $(INCLUDES:%=-I%) -MMD -MP -c $< -o $@
-include $(CORE_OBJECTS:.o=.d) -include $(OBJECTS:.o=.d)

12
core/host/linux/Makefile
View File

@ -1,7 +1,5 @@
CORE_SOURCES += \ SOURCES += $(addprefix host/$(TARGET_HOST)/, \
$(HOST_DIR)/$(HOST)/display.c \ display.c \
$(HOST_DIR)/$(HOST)/vector2d.c \ vector2d.c \
$(HOST_DIR)/$(HOST)/texture.c texture.c \
)
CORE_INCLUDES += \
$(CORE_DIRE)

22
src/Makefile
View File

@ -14,18 +14,26 @@ SOURCES += \
INCLUDES += \ INCLUDES += \
$(SOURCE_DIR)/components \ $(SOURCE_DIR)/components \
$(CORE_DIR) \ $(CORE_DIR) \
$(CORE_DIR)/$(HOST_DIR)/$(HOST) $(CORE_DIR)/host/$(TARGET_HOST)
OBJECTS := $(SOURCES:%=$(BUILD_DIR)/$(SOURCE_DIR)/%.o) OBJECTS := $(SOURCES:%=$(BUILD_DIR)/$(notdir $(SOURCE_DIR))/%.o)
$(BUILD_DIR)/$(OUTPUT): $(BUILD_DIR)/$(LIBCORE) $(OBJECTS) ifeq ($(TOTAL_BUILD_FILES),)
@echo -e "[100%] $(YELLOW)Linking $(OUTPUT)$(RESET)" TOTAL_BUILD_FILES := $(shell echo $$(($$($(MAKE) -n $(OBJECTS) TOTAL_BUILD_FILES=1 2>/dev/null | grep -c Building) + 1)))
$(Q)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(BUILD_DIR)/$(LIBCORE) -o $@ endif
$(BUILD_DIR)/$(SOURCE_DIR)/%.c.o: $(ROOT)/$(SOURCE_DIR)/%.c $(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 $@
$(BUILD_DIR)/$(notdir $(SOURCE_DIR))/%.o: $(SOURCE_DIR)/%
$(Q)mkdir -p $(dir $@)
$(eval CURRENT_FILE := $(shell echo $$(($(CURRENT_FILE) + 1)))) $(eval CURRENT_FILE := $(shell echo $$(($(CURRENT_FILE) + 1))))
$(eval PERCENTAGE := $(shell echo $$(($(CURRENT_FILE) * 100 / $(TOTAL_BUILD_FILES))))) $(eval PERCENTAGE := $(shell echo $$(($(CURRENT_FILE) * 100 / $(TOTAL_BUILD_FILES)))))
@echo -e "[$(PERCENTAGE)%] $(GREEN)Building C object $@$(RESET)" @echo -e "[$(PERCENTAGE)%] $(GREEN)Building C object $@$(RESET)"
$(Q)$(CC) $(CFLAGS) $(INCLUDES:%=-I%) -MMD -MP -c $< -o $@ $(Q)$(TARGET_HOST_CC) $(TARGET_HOST_CFLAGS) $(INCLUDES:%=-I%) -MMD -MP -c $< -o $@
$(LIBCORE):
$(Q)cd $(CORE_DIR) && $(MAKE) $@
-include $(OBJECTS:.o=.d) -include $(OBJECTS:.o=.d)