Compare commits

...

2 Commits

Author SHA1 Message Date
Ulysse Cura 067a3ec2c9 Added RELEASE var and task. 2026-07-22 18:18:24 +02:00
Ulysse Cura 64e356bb83 Fixed debug issues. 2026-07-22 18:04:47 +02:00
7 changed files with 36 additions and 9 deletions

5
.vscode/launch.json vendored
View File

@ -9,8 +9,9 @@
"type": "gdb", "type": "gdb",
"request": "launch", "request": "launch",
"target": "${workspaceFolder}/build/2D_Engine", "target": "${workspaceFolder}/build/2D_Engine",
"cwd": "${workspaceRoot}", "cwd": "${workspaceFolder}",
"valuesFormatting": "parseText" "valuesFormatting": "parseText",
"preLaunchTask": "Build"
} }
] ]
} }

23
.vscode/tasks.json vendored
View File

@ -21,7 +21,7 @@
}, },
{ {
"label": "Clean", "label": "Clean",
"detail": "Clean build directory and executable", "detail": "Clean build directory",
"type": "shell", "type": "shell",
"command": "make", "command": "make",
"args": [ "args": [
@ -57,7 +57,7 @@
}, },
{ {
"label": "Run", "label": "Run",
"detail": "Build executable and run.", "detail": "Build project and run",
"type": "shell", "type": "shell",
"command": "make", "command": "make",
"args": [ "args": [
@ -73,6 +73,25 @@
"showReuseMessage": true, "showReuseMessage": true,
"clear": true "clear": true
} }
},
{
"label": "Build Release",
"detail": "Build project in release mode",
"type": "shell",
"command": "make",
"args": [
"-j$(nproc)",
"RELEASE=1"
],
"group": "build",
"presentation": {
"echo": true,
"reveal": "always",
"focus": true,
"panel": "shared",
"showReuseMessage": true,
"clear": true
}
} }
] ]
} }

@ -1 +1 @@
Subproject commit 1821d2092357eecc3ed4999751fb1a71b521324b Subproject commit 911bdd7999a5c8af912ea3d23ba86140541fd064

@ -1 +1 @@
Subproject commit 9b6ac3c1455aa0ac3036cef40db80974aa27410e Subproject commit d193aa5fd49666be31f2b97e6dcc9a0788d58d7d

View File

@ -6,8 +6,10 @@ ASSET_BUILDER_SOURCES := \
# Compiler and flags # Compiler and flags
ASSET_BUILDER_CC = gcc ASSET_BUILDER_CC = gcc
ifeq ($(RELEASE), 1)
ASSET_BUILDER_CFLAGS = --std=c17 --pedantic -O3 $(shell pkg-config --cflags libpng) # RELEASE ASSET_BUILDER_CFLAGS = --std=c17 --pedantic -O3 $(shell pkg-config --cflags libpng) # RELEASE
#ASSET_BUILDER_CFLAGS = --std=c17 --pedantic -O1 -g $(shell pkg-config --cflags libpng) \ else
ASSET_BUILDER_CFLAGS = --std=c17 --pedantic -O1 -g $(shell pkg-config --cflags libpng) \
-Wall -Wno-missing-braces -Wextra -Wno-missing-field-initializers \ -Wall -Wno-missing-braces -Wextra -Wno-missing-field-initializers \
-Wformat=2 -Wswitch-default -Wswitch-enum -Wcast-align \ -Wformat=2 -Wswitch-default -Wswitch-enum -Wcast-align \
-Wpointer-arith -Wbad-function-cast -Wstrict-overflow=5 \ -Wpointer-arith -Wbad-function-cast -Wstrict-overflow=5 \
@ -15,6 +17,7 @@ ASSET_BUILDER_CFLAGS = --std=c17 --pedantic -O3 $(shell pkg-config --cflags libp
-Wcast-qual -Wshadow -Wunreachable-code -Wlogical-op \ -Wcast-qual -Wshadow -Wunreachable-code -Wlogical-op \
-Wfloat-equal -Wstrict-aliasing=2 -Wredundant-decls \ -Wfloat-equal -Wstrict-aliasing=2 -Wredundant-decls \
-Wold-style-definition # DEVELOPEMENT -Wold-style-definition # DEVELOPEMENT
endif
ASSET_BUILDER_INCLUDE_DIRS = $(ASSET_BUILDER_DIR)/headers ASSET_BUILDER_INCLUDE_DIRS = $(ASSET_BUILDER_DIR)/headers
ASSET_BUILDER_INCLUDE_DIRS := $(addprefix -I, $(ASSET_BUILDER_INCLUDE_DIRS)) ASSET_BUILDER_INCLUDE_DIRS := $(addprefix -I, $(ASSET_BUILDER_INCLUDE_DIRS))

View File

@ -16,5 +16,6 @@ stdenv.mkDerivation {
shellHook = '' shellHook = ''
export LD_LIBRARY_PATH=${pkgs.libpng}/lib:${pkgs.SDL2}/lib:${pkgs.sdl3}/lib:${pkgs.ncurses}/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH=${pkgs.libpng}/lib:${pkgs.SDL2}/lib:${pkgs.sdl3}/lib:${pkgs.ncurses}/lib:$LD_LIBRARY_PATH
export PKG_CONFIG_PATH=${pkgs.libpng}/lib/pkgconfig:${pkgs.SDL2}/lib/pkgconfig:${pkgs.sdl3}/lib/pkgconfig:${pkgs.ncurses}/lib/pkgconfig:$PKG_CONFIG_PATH export PKG_CONFIG_PATH=${pkgs.libpng}/lib/pkgconfig:${pkgs.SDL2}/lib/pkgconfig:${pkgs.sdl3}/lib/pkgconfig:${pkgs.ncurses}/lib/pkgconfig:$PKG_CONFIG_PATH
unset TEMP TMP TEMPDIR TMPDIR
''; '';
} }

View File

@ -10,8 +10,10 @@ SOURCES := \
# Compiler and flags # Compiler and flags
SRC_CC = gcc SRC_CC = gcc
#SRC_CFLAGS = --std=c17 --pedantic -O3 # RELEASE ifeq ($(RELEASE), 1)
SRC_CFLAGS = --std=c17 --pedantic -O1 -g \ SRC_CFLAGS = --std=c17 --pedantic -O3 # RELEASE
else
SRC_CFLAGS = --std=c17 --pedantic -O0 -g \
-Wall -Wno-missing-braces -Wextra -Wno-missing-field-initializers \ -Wall -Wno-missing-braces -Wextra -Wno-missing-field-initializers \
-Wformat=2 -Wswitch-default -Wswitch-enum -Wcast-align \ -Wformat=2 -Wswitch-default -Wswitch-enum -Wcast-align \
-Wpointer-arith -Wbad-function-cast -Wstrict-overflow=5 \ -Wpointer-arith -Wbad-function-cast -Wstrict-overflow=5 \
@ -19,6 +21,7 @@ SRC_CFLAGS = --std=c17 --pedantic -O1 -g \
-Wcast-qual -Wshadow -Wunreachable-code -Wlogical-op \ -Wcast-qual -Wshadow -Wunreachable-code -Wlogical-op \
-Wfloat-equal -Wstrict-aliasing=2 -Wredundant-decls \ -Wfloat-equal -Wstrict-aliasing=2 -Wredundant-decls \
-Wold-style-definition # DEVELOPEMENT -Wold-style-definition # DEVELOPEMENT
endif
SRC_INCLUDE_DIRS = $(SOURCE_DIR)/headers $(SOURCE_DIR)/ecs/headers $(SOURCE_DIR)/ecs/components/headers $(CORE_DIR)/headers SRC_INCLUDE_DIRS = $(SOURCE_DIR)/headers $(SOURCE_DIR)/ecs/headers $(SOURCE_DIR)/ecs/components/headers $(CORE_DIR)/headers
SRC_INCLUDE_DIRS := $(addprefix -I, $(SRC_INCLUDE_DIRS)) SRC_INCLUDE_DIRS := $(addprefix -I, $(SRC_INCLUDE_DIRS))