fix(windows): partialy fix windows compilation

This commit is contained in:
PedroEdiaz
2025-04-12 11:46:10 -06:00
parent dc49810a67
commit 10133bca3e

View File

@@ -15,6 +15,7 @@ EXAMPLES = \
example/basic \ example/basic \
example/riemman \ example/riemman \
example/n-cube \ example/n-cube \
example/n-hilbert-cube \
example/lens example/lens
CFLAGS = \ CFLAGS = \
@@ -24,17 +25,6 @@ CFLAGS = \
-I./include \ -I./include \
-Wall -Wno-unused-function -std=c99 -D_GNU_SOURCE \ -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: help:
@echo "Usage:" @echo "Usage:"
@echo " $(MAKE) windows" @echo " $(MAKE) windows"
@@ -50,8 +40,8 @@ help:
src/main.o: src/data/shaders.h src/main.o: src/data/shaders.h
windows: $(OBJ) windows: $(OBJ)
cd ext; $(MAKE) -f glfw.mk windows; cd - #cd ext; $(MAKE) -f glfw.mk windows; cd -
$(CC) $(CFLAGS) $(OBJ) -o $(BIN) -L. -lglfw -lopengl32 $(CC) $(CFLAGS) $(OBJ) -o $(BIN) -L. -lglfw -lopengl32 -lgdi32
glfw.dll: glfw.dll:
$(CC) -fPIC -shared -D_GLFW_WIN32 -D_GLFW_BUILD_DLL ./ext/glfw/src/*.c -o $@ -lgdi32 $(CC) -fPIC -shared -D_GLFW_WIN32 -D_GLFW_BUILD_DLL ./ext/glfw/src/*.c -o $@ -lgdi32
@@ -59,11 +49,11 @@ glfw.dll:
# LINUX # LINUX
linux-wayland: $(OBJ) linux-wayland: $(OBJ)
cd ext; $(MAKE) -f glfw.mk linux-wayland; cd - 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) linux-x11: $(OBJ)
cd ext; $(MAKE) -f glfw.mk linux-x11; cd - 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) cocoa: $(OBJ)
cd ext; $(MAKE) -f glfw.mk cocoa; cd - 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) $(CC) -sUSE_WEBGL2=1 -sUSE_GLFW=3 -o $(BIN).html $(OBJ)
chmod -x $(BIN).wasm chmod -x $(BIN).wasm
libglfw.so:
$(CC) -fPIC -shared $(DFLAGS) -D_GLFW_BUILD_DLL -Iext/glfw/deps/wayland ./ext/glfw/src/*.c -o $@
clean: clean:
rm $(OBJ) $(BIN) $(EXAMPLES) rm $(OBJ) $(BIN) $(EXAMPLES)
cd ext; $(MAKE) -f glfw.mk clean; cd - cd ext; $(MAKE) -f glfw.mk clean; cd -
@@ -89,5 +76,4 @@ examples: $(EXAMPLES)
$(CC) -Wno-implicit-function-declaration $(CFLAGS) -c -o $@ $< $(CC) -Wno-implicit-function-declaration $(CFLAGS) -c -o $@ $<
.c: .c:
$(CC) -lm -Wno-implicit-function-declaration $(CFLAGS) -c -o $@ $< $(CC) -I include -o $@ $< -lm