summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesper Jensen <jesper@jnsn.dev>2025-09-26 18:26:44 +0200
committerJesper Jensen <jesper@jnsn.dev>2025-09-26 18:26:44 +0200
commit016a83faf62e27298729fc741fbcc0e5073a84c7 (patch)
tree60b5d4feb00693d313e567b7d87f47ec40dd9b6d
parent19db0c747735def79619a27cc119c7a57507cf57 (diff)
Include cglm as submodule
-rw-r--r--.gitmodules3
-rw-r--r--Makefile6
-rw-r--r--src/main.c2
m---------thirdparty/cglm0
4 files changed, 7 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..7576d0b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "thirdparty/cglm"]
+ path = thirdparty/cglm
+ url = https://github.com/recp/cglm.git
diff --git a/Makefile b/Makefile
index 9b2c9d7..161b034 100644
--- a/Makefile
+++ b/Makefile
@@ -3,11 +3,11 @@ CC ?= gcc
SRCDIR ?= src
OBJDIR ?= obj
-LIBS = $(shell pkg-config --libs SDL2) -Wl,-rpath,./SDL/build/ $(shell pkg-config --libs cglm)
-INCS = -ISDL/build/include/SDL2 -ISDL/build/include-config-/SDL2
+LIBS = -lm
+INCS = -Ithirdparty/cglm/include
CFLAGS ?= -D_FORTIFY_SOURCE=2 -Wall -Werror -Wno-error=unused-variable -g -Og
-CFLAGS += -std=gnu11 -fms-extensions -flto $(shell pkg-config --cflags cglm)
+CFLAGS += -std=gnu11 -fms-extensions -flto
APP_SOURCES = $(shell find $(SRCDIR) -name "*.c")
APP_OBJS = $(APP_SOURCES:%.c=$(OBJDIR)/%.o)
diff --git a/src/main.c b/src/main.c
index e7216a7..c684edf 100644
--- a/src/main.c
+++ b/src/main.c
@@ -979,7 +979,7 @@ candidate_found:
;
}
- double *params = malloc(sizeof(double) * (sizeof(components[0])/sizeof(components)));
+ double *params = malloc(sizeof(double) * (sizeof(constraints)/sizeof(constraints[0])));
for(size_t i = 0; i < sizeof(constraints)/sizeof(constraints[0]); i++) {
params[i] = constraints[i].v;
}
diff --git a/thirdparty/cglm b/thirdparty/cglm
new file mode 160000
+Subproject a4602f2d5f1f275c02ef608ef27d4021572d9d6