diff --git a/Makefile b/Makefile index 2c10756..a1d5430 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,9 @@ BUILD_DIR := build -BUILD_DIR_32 := $(BUILD_DIR)/build32 -BUILD_DIR_64 := $(BUILD_DIR)/build64 DIST_DIR := dist BUILD_DRIVE := M: -MICE_32 := "$(BUILD_DIR_32)/src\mice.exe" -MICE_64 := "$(BUILD_DIR_64)/src\mice.exe" +MICE := "$(BUILD_DIR)/src\mice.exe" # VCVARS_32 := "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\Build\\vcvars32.bat" # VCVARS_64 := "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\Build\\vcvars64.bat" @@ -18,22 +15,14 @@ VCVARS_64 := "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\ .ONESHELL: .PHONY: all -all: mice86 dist +all: mice dist -mice86: +mice: -@subst $(BUILD_DRIVE) . @cd /D $(BUILD_DRIVE) \ & $(VCVARS_32) \ - & meson setup --cross cross-32.ini $(BUILD_DRIVE)\$(BUILD_DIR_32) \ - & meson compile -C $(BUILD_DRIVE)\$(BUILD_DIR_32) - @subst $(BUILD_DRIVE) /D - -mice64: - -@subst $(BUILD_DRIVE) . - @cd $(BUILD_DRIVE) \ - & $(VCVARS_64) \ - & meson setup --cross cross-64.ini $(BUILD_DRIVE)\$(BUILD_DIR_64) \ - & meson compile -C $(BUILD_DRIVE)\$(BUILD_DIR_64) + & meson setup --cross cross-32.ini $(BUILD_DRIVE)\$(BUILD_DIR) \ + & meson compile -C $(BUILD_DRIVE)\$(BUILD_DIR) @subst $(BUILD_DRIVE) /D .PHONY: clean @@ -51,29 +40,27 @@ dist: @-mkdir $(DIST_DIR)\Execute\Z > NUL 2>&1 @-mkdir $(DIST_DIR)\Execute\S > NUL 2>&1 - @copy /Y "$(BUILD_DIR_32)/src/micetools/micekeychip\micekeychip.exe" "$(DIST_DIR)/micekeychip.exe" - @copy /Y "$(BUILD_DIR_32)/src/micetools/micemaster\micemaster.exe" "$(DIST_DIR)/micemaster.exe" - @copy /Y "$(BUILD_DIR_32)/src/micetools/lib/libpcp\libpcp.lib" "$(DIST_DIR)/libpcp.lib" + @copy /Y "$(BUILD_DIR)/src/micetools/micekeychip\micekeychip.exe" "$(DIST_DIR)/micekeychip.exe" + @copy /Y "$(BUILD_DIR)/src/micetools/micemaster\micemaster.exe" "$(DIST_DIR)/micemaster.exe" + @copy /Y "$(BUILD_DIR)/src/micetools/lib/libpcp\libpcp.lib" "$(DIST_DIR)/libpcp.lib" - @copy /Y "$(BUILD_DIR_32)/src/micetools/launcher\mice.exe" "$(DIST_DIR)/mice86.exe" -# @copy /Y "$(BUILD_DIR_32)/src/micetools/launcher\mice.pdb" "$(DIST_DIR)/mice86.pdb" - @copy /Y "$(BUILD_DIR_32)/src/micetools/dll\mice.pdb" "$(DIST_DIR)/mice86.pdb" - @copy /Y "$(BUILD_DIR_32)/src/micetools/dll\mice.dll" "$(DIST_DIR)/mice86.dll" -# @copy /Y "$(BUILD_DIR_64)/src/micetools/launcher\mice.exe" "$(DIST_DIR)/mice64.exe" -# @copy /Y "$(BUILD_DIR_64)/src/micetools/dll\mice.dll" "$(DIST_DIR)/mice64.dll" + @copy /Y "$(BUILD_DIR)/src/micetools/launcher\mice.exe" "$(DIST_DIR)/mice.exe" +# @copy /Y "$(BUILD_DIR)/src/micetools/launcher\mice.pdb" "$(DIST_DIR)/mice.pdb" + @copy /Y "$(BUILD_DIR)/src/micetools/dll\mice.pdb" "$(DIST_DIR)/mice.pdb" + @copy /Y "$(BUILD_DIR)/src/micetools/dll\mice.dll" "$(DIST_DIR)/mice.dll" - @copy /Y "$(BUILD_DIR_32)/src/micetools/miceboot\miceprestartup.exe" "$(DIST_DIR)/Execute/miceprestartup.exe" - @copy /Y "$(BUILD_DIR_32)/src/micetools/miceboot\micestartup.exe" "$(DIST_DIR)/Execute/micestartup.exe" - @copy /Y "$(BUILD_DIR_32)/src/micetools/miceboot\TrueCrypt.exe" "$(DIST_DIR)/Execute/TrueCrypt.exe" - @copy /Y "$(BUILD_DIR_32)/src/micetools/miceboot\mxmaster.exe" "$(DIST_DIR)/Execute/S/mxmaster.exe" + @copy /Y "$(BUILD_DIR)/src/micetools/miceboot\miceprestartup.exe" "$(DIST_DIR)/Execute/miceprestartup.exe" + @copy /Y "$(BUILD_DIR)/src/micetools/miceboot\micestartup.exe" "$(DIST_DIR)/Execute/micestartup.exe" + @copy /Y "$(BUILD_DIR)/src/micetools/miceboot\TrueCrypt.exe" "$(DIST_DIR)/Execute/TrueCrypt.exe" + @copy /Y "$(BUILD_DIR)/src/micetools/miceboot\mxmaster.exe" "$(DIST_DIR)/Execute/S/mxmaster.exe" -# @copy /Y "$(BUILD_DIR_32)/src/micetools/micepatch\micepatch.exe" "$(DIST_DIR)/util/micepatch.exe" - @copy /Y "$(BUILD_DIR_32)/src/micetools/util\micedump.exe" "$(DIST_DIR)/util/micedump.exe" - @copy /Y "$(BUILD_DIR_32)/src/micetools/util\micetinker.exe" "$(DIST_DIR)/util/micetinker.exe" - @copy /Y "$(BUILD_DIR_32)/src/micetools/util\micemonitor.exe" "$(DIST_DIR)/util/micemonitor.exe" - @copy /Y "$(BUILD_DIR_32)/src/micetools/util\exio_test.exe" "$(DIST_DIR)/util/exio_test.exe" - @copy /Y "$(BUILD_DIR_32)/src/micetools/util\dongleDecrypt.exe" "$(DIST_DIR)/util/dongleDecrypt.exe" - @copy /Y "$(BUILD_DIR_32)/src/micetools/util\testBin.exe" "$(DIST_DIR)/util/testBin.exe" +# @copy /Y "$(BUILD_DIR)/src/micetools/micepatch\micepatch.exe" "$(DIST_DIR)/util/micepatch.exe" + @copy /Y "$(BUILD_DIR)/src/micetools/util\micedump.exe" "$(DIST_DIR)/util/micedump.exe" + @copy /Y "$(BUILD_DIR)/src/micetools/util\micetinker.exe" "$(DIST_DIR)/util/micetinker.exe" + @copy /Y "$(BUILD_DIR)/src/micetools/util\micemonitor.exe" "$(DIST_DIR)/util/micemonitor.exe" + @copy /Y "$(BUILD_DIR)/src/micetools/util\exio_test.exe" "$(DIST_DIR)/util/exio_test.exe" + @copy /Y "$(BUILD_DIR)/src/micetools/util\dongleDecrypt.exe" "$(DIST_DIR)/util/dongleDecrypt.exe" + @copy /Y "$(BUILD_DIR)/src/micetools/util\testBin.exe" "$(DIST_DIR)/util/testBin.exe" @copy /Y "src/micetools/miceboot\TrueCrypt.cmd" "$(DIST_DIR)/Execute/TrueCrypt.cmd" diff --git a/cross-64.ini b/cross-64.ini deleted file mode 100644 index 63ba9c9..0000000 --- a/cross-64.ini +++ /dev/null @@ -1,10 +0,0 @@ -[binaries] -c = 'cl' -cpp = 'cl' -strip = 'cl' - -[host_machine] -system = 'windows' -cpu_family = 'x86_64' -cpu = 'x86_64' -endian = 'little' diff --git a/src/micetools/launcher/mice.rc b/src/micetools/launcher/mice.rc index 3851c6f..adffb67 100644 --- a/src/micetools/launcher/mice.rc +++ b/src/micetools/launcher/mice.rc @@ -1,3 +1,3 @@ #include -0 ICON "../../assets/mice.ico" +0 ICON "../assets/mice.ico" diff --git a/src/micetools/micekeychip/micekeychip.rc b/src/micetools/micekeychip/micekeychip.rc index 92a9204..9424796 100644 --- a/src/micetools/micekeychip/micekeychip.rc +++ b/src/micetools/micekeychip/micekeychip.rc @@ -1,3 +1,3 @@ #include -0 ICON "../../assets/micekeychip.ico" +0 ICON "../assets/micekeychip.ico" diff --git a/src/micetools/micemaster/micemaster.rc b/src/micetools/micemaster/micemaster.rc index 92a9204..9424796 100644 --- a/src/micetools/micemaster/micemaster.rc +++ b/src/micetools/micemaster/micemaster.rc @@ -1,3 +1,3 @@ #include -0 ICON "../../assets/micekeychip.ico" +0 ICON "../assets/micekeychip.ico" diff --git a/src/micetools/micepatch/micepatch.rc b/src/micetools/micepatch/micepatch.rc index 9313b53..fcf11e4 100644 --- a/src/micetools/micepatch/micepatch.rc +++ b/src/micetools/micepatch/micepatch.rc @@ -1,3 +1,3 @@ #include -0 ICON "../../assets/micepatch.ico" +0 ICON "../assets/micepatch.ico"