Merge: alan -> main
This commit is contained in:
5
Makefile
5
Makefile
@@ -1,6 +1,7 @@
|
||||
BIN = manigraph
|
||||
|
||||
OBJ = \
|
||||
src/surface.o \
|
||||
src/context.o \
|
||||
src/texture.o \
|
||||
src/window.o \
|
||||
@@ -47,10 +48,12 @@ 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/cube.h src/data/axis.h
|
||||
|
||||
# LINUX
|
||||
linux-x11: $(OBJ)
|
||||
$(MAKE) BKN=_GLFW_X11 libglfw.so
|
||||
$(CC) -o $(BIN) $(OBJ) -L. -lGLEW -lGL -lglfw -lm
|
||||
$(CC) -o $(BIN) $(OBJ) -L. -lGLEW -lGL -lglfw -lm
|
||||
|
||||
linux-wayland: $(OBJ)
|
||||
$(MAKE) BKN=_GLFW_WAYLAND libglfw.so
|
||||
|
||||
Reference in New Issue
Block a user