Merge: crisel -> main
This commit is contained in:
12
Makefile
12
Makefile
@@ -14,7 +14,7 @@ OBJ = \
|
||||
CFLAGS = \
|
||||
-I./ext/cglm/include \
|
||||
-I./ext/glfw/include \
|
||||
-Wall -Wno-unused-function -std=c99 \
|
||||
-Wall -Wno-unused-function -std=c99 -D_GNU_SOURCE \
|
||||
|
||||
WAYLAND-LIB = \
|
||||
xdg-shell \
|
||||
@@ -54,6 +54,11 @@ linux-x11: $(OBJ)
|
||||
$(CC) -o $(BIN) $(OBJ) -L. -lGLEW -lGL -lglfw -lm
|
||||
|
||||
linux-wayland: $(OBJ)
|
||||
for i in $(WAYLAND-LIB); \
|
||||
do \
|
||||
wayland-scanner client-header ext/glfw/deps/wayland/$$i.xml ext/glfw/deps/wayland/$$i-client-protocol.h; \
|
||||
wayland-scanner private-code ext/glfw/deps/wayland/$$i.xml ext/glfw/deps/wayland/$$i-client-protocol-code.h; \
|
||||
done
|
||||
$(MAKE) BKN=_GLFW_WAYLAND libglfw.so
|
||||
$(CC) -o $(BIN) $(OBJ) -L. -lGLEW -lGL -lglfw -lm
|
||||
|
||||
@@ -66,11 +71,6 @@ cocoa: $(OBJ)
|
||||
$(CC) -framework OpenGL -o $(BIN) $(OBJ) -L. -lGLEW -lGL -lglfw
|
||||
|
||||
libglfw.so:
|
||||
for i in $(WAYLAND-LIB); \
|
||||
do \
|
||||
wayland-scanner client-header ext/glfw/deps/wayland/$$i.xml ext/glfw/deps/wayland/$$i-client-protocol.h; \
|
||||
wayland-scanner private-code ext/glfw/deps/wayland/$$i.xml ext/glfw/deps/wayland/$$i-client-protocol-code.h; \
|
||||
done
|
||||
$(CC) -fPIC -shared -D$(BKN) -D_GLFW_BUILD_DLL -Iext/glfw/deps/wayland ./ext/glfw/src/*.c -o $@
|
||||
|
||||
clean:
|
||||
|
||||
Reference in New Issue
Block a user