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

modified makefiles

Browse Source 
Signed-off-by: h4570 <sandro.sobczynski@gmail.com>
This commit is contained in:
h4570
2021-05-28 19:31:23 +02:00
parent dd8499abad
commit 70ea8e47ba
5 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/Makefile.pref
+3 -4
View File
@@ -1,8 +1,7 @@
EE_LIBS := $(EE_LIBS) -ldraw -lcdvd -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 -D_XCDVD -DHAVE_ZLIB $(EE_CFLAGS)
EE_CXXFLAGS := -DHAVE_LIBPNG -D_XCDVD -DHAVE_ZLIB $(EE_CXXFLAGS)
EE_INCS := -I$(TYRA)/src/engine/include -I$(PS2SDK)/ports/include $(EE_INCS)
EE_LDFLAGS := -L$(PS2SDK)/ports/lib -L$(TYRA)/src/engine $(EE_LDFLAGS)
EE_CXXFLAGS := -DHAVE_LIBJPEG -DHAVE_LIBTIFF -DHAVE_LIBPNG -DHAVE_ZLIB -D_XCDVD $(EE_CXXFLAGS)
EE_DVP = dvp-as
EE_VCL = vcl
EE_VCLPP = vclpp
src/samples/cube/Makefile
+11 -10
View File
@@ -1,16 +1,17 @@
EE_BIN = cube.elf
TYRA_DIR = ./../../engine
PCSX2_PATH = /mnt/c/Program\ Files\ \(x86\)/PCSX2/pcsx2.exe
WSL_TYRA_PATH = \\\\wsl$$\\PS2-DEV\\repos\\tyra
# Project settings
DIR_NAME = cube
EE_LIBS = -ltyra
EE_OBJS = \
objects/cube.o \
camera.o \
cubes.o \
main.o
EE_LIBS = -ltyra
# ----------------
# Other
EE_BIN = $(DIR_NAME).elf
all: $(EE_BIN)
$(EE_STRIP) --strip-all $(EE_BIN)
@@ -18,10 +19,10 @@ all: $(EE_BIN)
rm $(EE_OBJS)
rebuild-engine:
cd $(TYRA_DIR) && make clean && make
cd $(TYRA)/src/engine && make clean && make EE_CXXFLAGS="-DNDEBUG $(EE_CXXFLAGS)"
rebuild-dbg-engine:
cd $(TYRA_DIR) && make clean && make debug
cd $(TYRA)/src/engine && make clean && make
clean:
rm -f $(EE_OBJS)
@@ -37,6 +38,6 @@ run: $(EE_BIN)
run-pcsx2:
taskkill.exe /f /t /im pcsx2.exe || true
$(PCSX2_PATH) --elf=$(WSL_TYRA_PATH)\\src\\samples\\cube\\bin\\cube.elf
$(WSL_LINUX_PCSX2)/pcsx2.exe --elf=$(WSL_MAKE_WINDOWS)\\repos\\tyra\\src\\samples\\$(DIR_NAME)\\bin\\$(EE_BIN)
include $(TYRA_DIR)/Makefile.pref
include $(TYRA)/src/engine/Makefile.pref
src/samples/dolphin/Makefile
Executable → Regular
+11 -10
View File
@@ -1,9 +1,7 @@
EE_BIN = dolphin.elf
TYRA_DIR = ./../../engine
PCSX2_PATH = /mnt/c/Program\ Files\ \(x86\)/PCSX2/pcsx2.exe
WSL_TYRA_PATH = \\\\wsl$$\\PS2-DEV\\repos\\tyra
# Project settings
DIR_NAME = dolphin
EE_LIBS = -ltyra
EE_OBJS = \
camera.o \
objects/player.o \
@@ -12,7 +10,10 @@ EE_OBJS = \
dolphin.o \
main.o
EE_LIBS = -ltyra
# ----------------
# Other
EE_BIN = $(DIR_NAME).elf
all: $(EE_BIN)
$(EE_STRIP) --strip-all $(EE_BIN)
@@ -20,10 +21,10 @@ all: $(EE_BIN)
rm $(EE_OBJS)
rebuild-engine:
cd $(TYRA_DIR) && make clean && make EE_CXXFLAGS="-DNDEBUG $(EE_CXXFLAGS)"
cd $(TYRA)/src/engine && make clean && make EE_CXXFLAGS="-DNDEBUG $(EE_CXXFLAGS)"
rebuild-dbg-engine:
cd $(TYRA_DIR) && make clean && make
cd $(TYRA)/src/engine && make clean && make
clean:
rm -f $(EE_OBJS)
@@ -39,6 +40,6 @@ run: $(EE_BIN)
run-pcsx2:
taskkill.exe /f /t /im pcsx2.exe || true
$(PCSX2_PATH) --elf=$(WSL_TYRA_PATH)\\src\\samples\\dolphin\\bin\\dolphin.elf
$(WSL_LINUX_PCSX2)/pcsx2.exe --elf=$(WSL_MAKE_WINDOWS)\\repos\\tyra\\src\\samples\\$(DIR_NAME)\\bin\\$(EE_BIN)
include $(TYRA_DIR)/Makefile.pref
include $(TYRA)/src/engine/Makefile.pref
src/samples/floors/Makefile
+11 -8
View File
@@ -1,7 +1,7 @@
EE_BIN = floors.elf
TYRA_DIR = ./../../engine
# Project settings
DIR_NAME = floors
EE_LIBS = -ltyra
EE_OBJS = \
managers/light_manager.o \
managers/floor_manager.o \
@@ -14,7 +14,10 @@ EE_OBJS = \
floors.o \
main.o
EE_LIBS = -ltyra
# ----------------
# Other
EE_BIN = $(DIR_NAME).elf
all: $(EE_BIN)
$(EE_STRIP) --strip-all $(EE_BIN)
@@ -22,10 +25,10 @@ all: $(EE_BIN)
rm $(EE_OBJS)
rebuild-engine:
cd $(TYRA_DIR) && make clean && make
cd $(TYRA)/src/engine && make clean && make EE_CXXFLAGS="-DNDEBUG $(EE_CXXFLAGS)"
rebuild-dbg-engine:
cd $(TYRA_DIR) && make clean && make debug
cd $(TYRA)/src/engine && make clean && make
clean:
rm -f $(EE_OBJS)
@@ -41,6 +44,6 @@ run: $(EE_BIN)
run-pcsx2:
taskkill.exe /f /t /im pcsx2.exe || true
$(PCSX2_PATH) --elf=$(WSL_TYRA_PATH)\\src\\samples\\floors\\bin\\floors.elf
$(WSL_LINUX_PCSX2)/pcsx2.exe --elf=$(WSL_MAKE_WINDOWS)\\repos\\tyra\\src\\samples\\$(DIR_NAME)\\bin\\$(EE_BIN)
include $(TYRA_DIR)/Makefile.pref
include $(TYRA)/src/engine/Makefile.pref
src/unit_tests/Makefile
+7 -10
View File
@@ -1,22 +1,19 @@
EE_BIN = unit_tests.elf
TYRA_DIR = ./../engine
PCSX2_PATH = /mnt/c/Program\ Files\ \(x86\)/PCSX2/pcsx2.exe
WSL_TYRA_PATH = \\\\wsl$$\\PS2-DEV\\repos\\tyra
EE_LIBS = -ltyra
EE_OBJS = \
tests/utils/math.o \
main.o
EE_LIBS = -ltyra
all: $(EE_BIN)
$(EE_STRIP) --strip-all $(EE_BIN)
mv $(EE_BIN) bin/$(EE_BIN)
rm $(EE_OBJS)
rebuild-engine:
cd $(TYRA_DIR) && make clean && make
cd $(TYRA)/src/engine && make clean && make EE_CXXFLAGS="-DNDEBUG $(EE_CXXFLAGS)"
rebuild-dbg-engine:
cd $(TYRA)/src/engine && make clean && make
clean:
rm -f $(EE_OBJS)
@@ -32,9 +29,9 @@ run: $(EE_BIN)
run-pcsx2:
taskkill.exe /f /t /im pcsx2.exe || true
$(PCSX2_PATH) --elf=$(WSL_TYRA_PATH)\\src\\unit_tests\\bin\\unit_tests.elf
$(WSL_LINUX_PCSX2)/pcsx2.exe --elf=$(WSL_MAKE_WINDOWS)\\repos\\tyra\\src\\unit_tests\\bin\\unit_tests.elf
show:
cat bin/test-result.txt
include $(TYRA_DIR)/Makefile.pref
include $(TYRA)/src/engine/Makefile.pref