RuiFPB/tyra-linux
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

refactored makefiles

Browse Source
This commit is contained in:
h4570
2020-12-01 19:18:40 +01:00
parent 510199164c
commit ca7846f60b
4 changed files with 72 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/Makefile
+48
View File
@@ -0,0 +1,48 @@
TYRA_DIR = ./
EE_OBJS = \
models/math/matrix.o \
models/math/plane.o \
models/math/point.o \
models/math/vector3.o \
models/mesh_frame.o \
models/mesh_material.o \
models/mesh.o \
models/sprite.o \
models/mesh_texture.o \
modules/audio.o \
modules/camera_base.o \
modules/file_service.o \
modules/gif_sender.o \
modules/light.o \
modules/pad.o \
modules/renderer.o \
modules/texture_repository.o \
modules/timer.o \
modules/vif_sender.o \
utils/math.o \
utils/string.o \
loaders/bmp_loader.o \
loaders/dff_loader.o \
loaders/md2_loader.o \
loaders/obj_loader.o \
loaders/png_loader.o \
vu1_progs/draw3D.o \
engine.o
all: $(EE_OBJS)
ar rcs $(LIB_NAME) $(EE_OBJS)
rm -f $(EE_OBJS)
# https://github.com/microsoft/wsl/issues/2468#issuecomment-374904520
#%.vsm: %.vcl # sudo service binfmt-support start
# $(EE_VCL) $< >> $@
%.o: %.vsm
$(EE_DVP) $< -o $@
clean:
rm -f $(EE_OBJS)
rm -f $(LIB_NAME)
include Makefile.pref
src/engine/Makefile.pref
+11
View File
@@ -0,0 +1,11 @@
EE_LIBS := $(EE_LIBS) -ldraw -lgraph -lmath3d -lpacket -ldma -lpacket2 -lpad -laudsrv -lc -lstdc++ -lpng -lz
EE_INCS := -I$(TYRA_DIR)/include -I$(PS2SDK)/ports/include $(EE_INCS)
EE_LDFLAGS := -L$(PS2SDK)/ports/lib -L$(TYRA_DIR) $(EE_LDFLAGS)
EE_CFLAGS := -DHAVE_LIBPNG -DHAVE_ZLIB $(EE_CFLAGS)
EE_CXXFLAGS := -DHAVE_LIBPNG -DHAVE_ZLIB $(EE_CXXFLAGS)
EE_DVP = dvp-as
EE_VCL = vcl
LIB_NAME = libtyra.a
include $(PS2SDK)/samples/Makefile.pref
include $(PS2SDK)/samples/Makefile.eeglobal
src/samples/ari/Makefile
+6 -43
View File
@@ -1,58 +1,22 @@
EE_BIN = ari.elf EE_BIN = ari.elf
TYRA_DIR = ./../../engine
EE_OBJS = \ EE_OBJS = \
../../engine/models/math/matrix.o \
../../engine/models/math/plane.o \
../../engine/models/math/point.o \
../../engine/models/math/vector3.o \
../../engine/models/mesh_frame.o \
../../engine/models/mesh_material.o \
../../engine/models/mesh.o \
../../engine/models/sprite.o \
../../engine/models/mesh_texture.o \
../../engine/modules/audio.o \
../../engine/modules/camera_base.o \
../../engine/modules/file_service.o \
../../engine/modules/gif_sender.o \
../../engine/modules/light.o \
../../engine/modules/pad.o \
../../engine/modules/renderer.o \
../../engine/modules/texture_repository.o \
../../engine/modules/timer.o \
../../engine/modules/vif_sender.o \
../../engine/utils/math.o \
../../engine/utils/string.o \
../../engine/loaders/bmp_loader.o \
../../engine/loaders/dff_loader.o \
../../engine/loaders/md2_loader.o \
../../engine/loaders/obj_loader.o \
../../engine/loaders/png_loader.o \
../../engine/vu1_progs/draw3D.o \
../../engine/engine.o \
camera.o \ camera.o \
objects/player.o \ objects/player.o \
ari.o \ ari.o \
main.o main.o
EE_LIBS = -ldraw -lgraph -lmath3d -lpacket -ldma -lpacket2 -lpad -laudsrv -lc -lstdc++ -lpng -lz EE_LIBS = -ltyra
EE_INCS := -I./../../engine/include -I$(PS2SDK)/ports/include $(EE_INCS)
EE_LDFLAGS := -L$(PS2SDK)/ports/lib $(EE_LDFLAGS)
EE_CFLAGS := -DHAVE_LIBPNG -DHAVE_ZLIB $(EE_CFLAGS)
EE_CXXFLAGS := -DHAVE_LIBPNG -DHAVE_ZLIB $(EE_CXXFLAGS)
EE_DVP = dvp-as
EE_VCL = vcl
all: $(EE_BIN) all: $(EE_BIN)
$(EE_STRIP) --strip-all $(EE_BIN) $(EE_STRIP) --strip-all $(EE_BIN)
mv $(EE_BIN) bin/$(EE_BIN) mv $(EE_BIN) bin/$(EE_BIN)
rm $(EE_OBJS) rm $(EE_OBJS)
# https://github.com/microsoft/wsl/issues/2468#issuecomment-374904520 rebuild-engine:
#%.vsm: %.vcl # sudo service binfmt-support start cd $(TYRA_DIR) && make clean && make
# $(EE_VCL) $< >> $@
%.o: %.vsm
$(EE_DVP) $< -o $@
clean: clean:
rm -f $(EE_OBJS) rm -f $(EE_OBJS)
@@ -66,5 +30,4 @@ run: $(EE_BIN)
rm $(EE_OBJS) rm $(EE_OBJS)
cd bin/ && ps2client execee host:$(EE_BIN) cd bin/ && ps2client execee host:$(EE_BIN)
include $(PS2SDK)/samples/Makefile.pref include $(TYRA_DIR)/Makefile.pref
include $(PS2SDK)/samples/Makefile.eeglobal
src/samples/floors/Makefile
+7 -44
View File
@@ -1,34 +1,8 @@
EE_BIN = floors.elf EE_BIN = floors.elf
TYRA_DIR = ./../../engine
EE_OBJS = \ EE_OBJS = \
../../engine/models/math/matrix.o \
../../engine/models/math/plane.o \
../../engine/models/math/point.o \
../../engine/models/math/vector3.o \
../../engine/models/mesh_frame.o \
../../engine/models/mesh_material.o \
../../engine/models/mesh.o \
../../engine/models/sprite.o \
../../engine/models/mesh_texture.o \
../../engine/modules/audio.o \
../../engine/modules/camera_base.o \
../../engine/modules/file_service.o \
../../engine/modules/gif_sender.o \
../../engine/modules/light.o \
../../engine/modules/pad.o \
../../engine/modules/renderer.o \
../../engine/modules/texture_repository.o \
../../engine/modules/timer.o \
../../engine/modules/vif_sender.o \
../../engine/utils/math.o \
../../engine/utils/string.o \
../../engine/loaders/bmp_loader.o \
../../engine/loaders/dff_loader.o \
../../engine/loaders/md2_loader.o \
../../engine/loaders/obj_loader.o \
../../engine/loaders/png_loader.o \
../../engine/vu1_progs/draw3D.o \
../../engine/engine.o \
managers/light_manager.o \ managers/light_manager.o \
managers/floor_manager.o \ managers/floor_manager.o \
camera.o \ camera.o \
@@ -38,28 +12,18 @@ EE_OBJS = \
floors.o \ floors.o \
main.o main.o
EE_LIBS = -ldraw -lgraph -lmath3d -lpacket -ldma -lpacket2 -lpad -laudsrv -lc -lstdc++ -lpng -lz EE_LIBS = -ltyra
EE_INCS := -I./../../engine/include -I$(PS2SDK)/ports/include $(EE_INCS)
EE_LDFLAGS := -L$(PS2SDK)/ports/lib $(EE_LDFLAGS)
EE_CFLAGS := -DHAVE_LIBPNG -DHAVE_ZLIB $(EE_CFLAGS)
EE_CXXFLAGS := -DHAVE_LIBPNG -DHAVE_ZLIB $(EE_CXXFLAGS)
EE_DVP = dvp-as
EE_VCL = vcl
all: $(EE_BIN) all: $(EE_BIN)
$(EE_STRIP) --strip-all $(EE_BIN) $(EE_STRIP) --strip-all $(EE_BIN)
mv $(EE_BIN) bin/$(EE_BIN) mv $(EE_BIN) bin/$(EE_BIN)
rm $(EE_OBJS) rm $(EE_OBJS)
%.vsm: %.vcl rebuild-engine:
$(EE_VCL) $< >> $@ cd $(TYRA_DIR) && make clean && make
%.o: %.vsm
$(EE_DVP) $< -o $@
clean: clean:
rm -f $(EE_BIN) $(EE_OBJS) rm -f $(EE_OBJS)
run: $(EE_BIN) run: $(EE_BIN)
killall -v ps2client || true killall -v ps2client || true
@@ -70,5 +34,4 @@ run: $(EE_BIN)
rm $(EE_OBJS) rm $(EE_OBJS)
cd bin/ && ps2client execee host:$(EE_BIN) cd bin/ && ps2client execee host:$(EE_BIN)
include $(PS2SDK)/samples/Makefile.pref include $(TYRA_DIR)/Makefile.pref
include $(PS2SDK)/samples/Makefile.eeglobal