Merge: roberto -> main

This commit is contained in:
PedroEdiaz
2024-11-16 13:12:16 -06:00
5 changed files with 29 additions and 22 deletions

View File

@@ -14,7 +14,7 @@ OBJ = \
CFLAGS = \
-I./ext/cglm/include \
-I./ext/glfw/include \
-Wall -Wno-unused-function -std=c99 -D_POSIX_C_SOURCE \
-Wall -Wno-unused-function -std=c99 -D_GNU_SOURCE \
WAYLAND-LIB = \
xdg-shell \
@@ -48,6 +48,8 @@ windows: $(OBJ) glfw.dll
glfw.dll:
$(CC) -fPIC -shared -D_GLFW_WIN32 -D_GLFW_BUILD_DLL ./ext/glfw/src/*.c -o $@ -lgdi32
src/main.o: src/data/shaders.h src/data/axis.h
# LINUX
linux-wayland: $(OBJ)
for i in $(WAYLAND-LIB); \
@@ -79,4 +81,5 @@ clean:
.SUFFIXES: .c .o
.c.o: src/main.h
clang-format -i $<
$(CC) $(CFLAGS) -c -o $@ $<