From d0d7ed85e5b3105e74ed082ef478f2b02dab2021 Mon Sep 17 00:00:00 2001 From: h4570 Date: Tue, 25 May 2021 20:30:15 +0200 Subject: [PATCH] added pcsx2 to makefile (by wsl) Signed-off-by: h4570 --- src/samples/cube/Makefile | 9 +++++++++ src/samples/dolphin/Makefile | 9 +++++++++ src/samples/floors/Makefile | 7 +++++++ src/unit_tests/Makefile | 1 - 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/samples/cube/Makefile b/src/samples/cube/Makefile index 09720cc..f1466eb 100644 --- a/src/samples/cube/Makefile +++ b/src/samples/cube/Makefile @@ -1,6 +1,8 @@ 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 EE_OBJS = \ objects/cube.o \ @@ -18,6 +20,9 @@ all: $(EE_BIN) rebuild-engine: cd $(TYRA_DIR) && make clean && make +rebuild-dbg-engine: + cd $(TYRA_DIR) && make clean && make debug + clean: rm -f $(EE_OBJS) @@ -30,4 +35,8 @@ run: $(EE_BIN) rm $(EE_OBJS) cd bin/ && ps2client execee host:$(EE_BIN) +run-pcsx2: + taskkill.exe /f /t /im pcsx2.exe || true + $(PCSX2_PATH) --elf=$(WSL_TYRA_PATH)\\src\\samples\\cube\\bin\\cube.elf + include $(TYRA_DIR)/Makefile.pref diff --git a/src/samples/dolphin/Makefile b/src/samples/dolphin/Makefile index c0b302d..512f22b 100755 --- a/src/samples/dolphin/Makefile +++ b/src/samples/dolphin/Makefile @@ -1,6 +1,8 @@ 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 EE_OBJS = \ camera.o \ @@ -18,6 +20,9 @@ all: $(EE_BIN) rm $(EE_OBJS) rebuild-engine: + cd $(TYRA_DIR) && make clean && make EE_CXXFLAGS="-DNDEBUG $(EE_CXXFLAGS)" + +rebuild-dbg-engine: cd $(TYRA_DIR) && make clean && make clean: @@ -32,4 +37,8 @@ run: $(EE_BIN) rm $(EE_OBJS) cd bin/ && ps2client execee host:$(EE_BIN) +run-pcsx2: + taskkill.exe /f /t /im pcsx2.exe || true + $(PCSX2_PATH) --elf=$(WSL_TYRA_PATH)\\src\\samples\\dolphin\\bin\\dolphin.elf + include $(TYRA_DIR)/Makefile.pref diff --git a/src/samples/floors/Makefile b/src/samples/floors/Makefile index d49ca98..48cb10f 100644 --- a/src/samples/floors/Makefile +++ b/src/samples/floors/Makefile @@ -24,6 +24,9 @@ all: $(EE_BIN) rebuild-engine: cd $(TYRA_DIR) && make clean && make +rebuild-dbg-engine: + cd $(TYRA_DIR) && make clean && make debug + clean: rm -f $(EE_OBJS) @@ -36,4 +39,8 @@ run: $(EE_BIN) rm $(EE_OBJS) cd bin/ && ps2client execee host:$(EE_BIN) +run-pcsx2: + taskkill.exe /f /t /im pcsx2.exe || true + $(PCSX2_PATH) --elf=$(WSL_TYRA_PATH)\\src\\samples\\floors\\bin\\floors.elf + include $(TYRA_DIR)/Makefile.pref diff --git a/src/unit_tests/Makefile b/src/unit_tests/Makefile index 63ace80..9cfd8af 100644 --- a/src/unit_tests/Makefile +++ b/src/unit_tests/Makefile @@ -34,7 +34,6 @@ run-pcsx2: taskkill.exe /f /t /im pcsx2.exe || true $(PCSX2_PATH) --elf=$(WSL_TYRA_PATH)\\src\\unit_tests\\bin\\unit_tests.elf - show: cat bin/test-result.txt