Merge branch 'experimental'
This commit is contained in:
37
Makefile
37
Makefile
@@ -39,41 +39,28 @@ help:
|
||||
@echo " $(MAKE) CC=emcc wasm"
|
||||
@echo "Para limpiar los archivos compilados se puede usar"
|
||||
@echo " $(MAKE) clean"
|
||||
@echo "Para ejecturar el programa sin instalarlos se puede usar:"
|
||||
@echo " $(MAKE) run-linux"
|
||||
|
||||
src/main.o: src/data/axis.h src/data/shaders.h
|
||||
|
||||
# WINDOWS
|
||||
windows: $(OBJ) glfw.dll
|
||||
$(CC) $(CFLAGS) $(OBJ) -o $(BIN) -L. -lglfw -lopengl32 -lglew32
|
||||
windows: $(OBJ)
|
||||
cd ext; $(MAKE) -f glfw.mk windows; cd -
|
||||
$(CC) $(CFLAGS) $(OBJ) -o $(BIN) -L. -lglfw -lopengl32
|
||||
|
||||
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); \
|
||||
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) DFLAGS="-D_GLFW_WAYLAND" libglfw.so
|
||||
$(CC) -o $(BIN) $(OBJ) -L. -lGLEW -lGL -lglfw -lm
|
||||
cd ext; $(MAKE) -f glfw.mk linux-wayland; cd -
|
||||
$(CC) -o $(BIN) $(OBJ) ext/libglfw.a -lGL -lm
|
||||
|
||||
linux-x11: $(OBJ)
|
||||
$(MAKE) DFLAGS="-D_GLFW_X11" libglfw.so
|
||||
$(CC) -o $(BIN) $(OBJ) -L. -lGLEW -lGL -lglfw -lm
|
||||
cd ext; $(MAKE) -f glfw.mk linux-x11; cd -
|
||||
$(CC) -o $(BIN) $(OBJ) ext/libglfw.a -lGL -lm
|
||||
|
||||
run-linux:
|
||||
LD_LIBRARY_PATH=. ./$(BIN)
|
||||
|
||||
# COCOA
|
||||
cocoa: $(OBJ)
|
||||
$(MAKE) DFLAGS="-D_GLFW_COCOA" libglfw.so
|
||||
$(CC) -framework OpenGL -o $(BIN) $(OBJ) -L. -lGLEW -lGL -lglfw
|
||||
cd ext; $(MAKE) -f glfw.mk cocoa; cd -
|
||||
$(CC) -framework OpenGL -o $(BIN) $(OBJ) ext/glfw.a -lGL -lglfw
|
||||
|
||||
wasm: $(OBJ)
|
||||
$(CC) -sUSE_WEBGL2=1 -sUSE_GLFW=3 -o $(BIN).js $(OBJ)
|
||||
@@ -83,9 +70,11 @@ libglfw.so:
|
||||
$(CC) -fPIC -shared $(DFLAGS) -D_GLFW_BUILD_DLL -Iext/glfw/deps/wayland ./ext/glfw/src/*.c -o $@
|
||||
|
||||
clean:
|
||||
rm $(OBJ) $(BIN) ext/glfw/deps/wayland/*.h
|
||||
rm $(OBJ) $(BIN)
|
||||
cd ext; $(MAKE) -f glfw.mk clean; cd -
|
||||
|
||||
|
||||
.SUFFIXES: .c .o
|
||||
|
||||
.c.o: src/main.h
|
||||
.c.o:
|
||||
$(CC) $(CFLAGS) -c -o $@ $<
|
||||
|
||||
Reference in New Issue
Block a user