Merge branch 'master' into chromadeck

StoneOrbits · Dec 23, 2023 · 79dc548 · 79dc548
2 parents 0f50d6e + 0dcdd17
commit 79dc548
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/VortexEngine/VortexLib/Makefile b/VortexEngine/VortexLib/Makefile
@@ -17,7 +17,12 @@ MAKE=make
 RM=rm -rf
 RANLIB=ranlib
 
-CFLAGS=-O2 -g -Wall
+CFLAGS=-O2 -Wall
+
+# add -g flag for debug symbols if we're not using wasm
+ifndef WASM
+CFLAGS += -g
+endif
 
 # compiler defines
 DEFINES=\
@@ -31,7 +36,8 @@ INCLUDES=\
 
 ifdef WASM
 DEFINES += -D WASM
-CFLAGS += --bind -s MODULARIZE=1 -s EXPORT_ES6=1 -s EXPORT_NAME='VortexLib'
+# this was used before but I think only the above is necessary
+#CFLAGS += --bind -s MODULARIZE=1 -s EXPORT_ES6=1 -s EXPORT_NAME='VortexLib'
 endif
 
 ifdef TESTFRAMEWORK
@@ -114,7 +120,7 @@ vortex.a: $(DEPS)
 	$(AR) $@ $^
 
 VortexLib.js: $(DEPS)
-	$(CC) $(CFLAGS) $^ -o $@ $(LLIBS)
+	$(CC) $(CFLAGS) --bind $^ -o $@ $(LLIBS)
 
 # catch-all make target to generate .o and .d files
 %.o: %.cpp