Compare commits

..

No commits in common. "067a3ec2c99eb5b0f4c326a22a2c09b14fcbfa89" and "cd7a4912af143bec975031bff663199b45a35436" have entirely different histories.

7 changed files with 9 additions and 36 deletions

5
.vscode/launch.json vendored
View File

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

23
.vscode/tasks.json vendored
View File

@ -21,7 +21,7 @@
},
{
"label": "Clean",
"detail": "Clean build directory",
"detail": "Clean build directory and executable",
"type": "shell",
"command": "make",
"args": [
@ -57,7 +57,7 @@
},
{
"label": "Run",
"detail": "Build project and run",
"detail": "Build executable and run.",
"type": "shell",
"command": "make",
"args": [
@ -73,25 +73,6 @@
"showReuseMessage": 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 911bdd7999a5c8af912ea3d23ba86140541fd064
Subproject commit 1821d2092357eecc3ed4999751fb1a71b521324b

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

View File

@ -6,10 +6,8 @@ ASSET_BUILDER_SOURCES := \
# Compiler and flags
ASSET_BUILDER_CC = gcc
ifeq ($(RELEASE), 1)
ASSET_BUILDER_CFLAGS = --std=c17 --pedantic -O3 $(shell pkg-config --cflags libpng) # RELEASE
else
ASSET_BUILDER_CFLAGS = --std=c17 --pedantic -O1 -g $(shell pkg-config --cflags libpng) \
#ASSET_BUILDER_CFLAGS = --std=c17 --pedantic -O1 -g $(shell pkg-config --cflags libpng) \
-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 \
@ -17,7 +15,6 @@ ASSET_BUILDER_CFLAGS = --std=c17 --pedantic -O1 -g $(shell pkg-config --cflags l
-Wcast-qual -Wshadow -Wunreachable-code -Wlogical-op \
-Wfloat-equal -Wstrict-aliasing=2 -Wredundant-decls \
-Wold-style-definition # DEVELOPEMENT
endif
ASSET_BUILDER_INCLUDE_DIRS = $(ASSET_BUILDER_DIR)/headers
ASSET_BUILDER_INCLUDE_DIRS := $(addprefix -I, $(ASSET_BUILDER_INCLUDE_DIRS))

View File

@ -16,6 +16,5 @@ stdenv.mkDerivation {
shellHook = ''
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
unset TEMP TMP TEMPDIR TMPDIR
'';
}

View File

@ -10,10 +10,8 @@ SOURCES := \
# Compiler and flags
SRC_CC = gcc
ifeq ($(RELEASE), 1)
SRC_CFLAGS = --std=c17 --pedantic -O3 # RELEASE
else
SRC_CFLAGS = --std=c17 --pedantic -O0 -g \
#SRC_CFLAGS = --std=c17 --pedantic -O3 # RELEASE
SRC_CFLAGS = --std=c17 --pedantic -O1 -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 \
@ -21,7 +19,6 @@ SRC_CFLAGS = --std=c17 --pedantic -O0 -g \
-Wcast-qual -Wshadow -Wunreachable-code -Wlogical-op \
-Wfloat-equal -Wstrict-aliasing=2 -Wredundant-decls \
-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 := $(addprefix -I, $(SRC_INCLUDE_DIRS))