From 10133bca3e1a99d1584c78819e71ad770fb90b4b Mon Sep 17 00:00:00 2001 From: PedroEdiaz Date: Sat, 12 Apr 2025 11:46:10 -0600 Subject: [PATCH] fix(windows): partialy fix windows compilation --- Makefile | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index f44fbc0..f431d83 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,7 @@ EXAMPLES = \ example/basic \ example/riemman \ example/n-cube \ + example/n-hilbert-cube \ example/lens CFLAGS = \ @@ -24,17 +25,6 @@ CFLAGS = \ -I./include \ -Wall -Wno-unused-function -std=c99 -D_GNU_SOURCE \ -WAYLAND-LIB = \ - xdg-shell \ - relative-pointer-unstable-v1 \ - xdg-decoration-unstable-v1 \ - pointer-constraints-unstable-v1 \ - viewporter \ - idle-inhibit-unstable-v1 \ - fractional-scale-v1 \ - xdg-activation-v1 \ - wayland - help: @echo "Usage:" @echo " $(MAKE) windows" @@ -50,8 +40,8 @@ help: src/main.o: src/data/shaders.h windows: $(OBJ) - cd ext; $(MAKE) -f glfw.mk windows; cd - - $(CC) $(CFLAGS) $(OBJ) -o $(BIN) -L. -lglfw -lopengl32 + #cd ext; $(MAKE) -f glfw.mk windows; cd - + $(CC) $(CFLAGS) $(OBJ) -o $(BIN) -L. -lglfw -lopengl32 -lgdi32 glfw.dll: $(CC) -fPIC -shared -D_GLFW_WIN32 -D_GLFW_BUILD_DLL ./ext/glfw/src/*.c -o $@ -lgdi32 @@ -59,11 +49,11 @@ glfw.dll: # LINUX linux-wayland: $(OBJ) cd ext; $(MAKE) -f glfw.mk linux-wayland; cd - - $(CC) -o $(BIN) $(OBJ) ext/libglfw.a -lGL -lm + $(CC) -o $(BIN) $(OBJ) ext/libglfw.a -lm linux-x11: $(OBJ) cd ext; $(MAKE) -f glfw.mk linux-x11; cd - - $(CC) -o $(BIN) $(OBJ) ext/libglfw.a -lGL -lm + $(CC) -o $(BIN) $(OBJ) ext/libglfw.a -lm cocoa: $(OBJ) cd ext; $(MAKE) -f glfw.mk cocoa; cd - @@ -73,9 +63,6 @@ wasm: $(OBJ) $(CC) -sUSE_WEBGL2=1 -sUSE_GLFW=3 -o $(BIN).html $(OBJ) chmod -x $(BIN).wasm -libglfw.so: - $(CC) -fPIC -shared $(DFLAGS) -D_GLFW_BUILD_DLL -Iext/glfw/deps/wayland ./ext/glfw/src/*.c -o $@ - clean: rm $(OBJ) $(BIN) $(EXAMPLES) cd ext; $(MAKE) -f glfw.mk clean; cd - @@ -89,5 +76,4 @@ examples: $(EXAMPLES) $(CC) -Wno-implicit-function-declaration $(CFLAGS) -c -o $@ $< .c: - $(CC) -lm -Wno-implicit-function-declaration $(CFLAGS) -c -o $@ $< - + $(CC) -I include -o $@ $< -lm