Update build tools

calendulish · Jun 27, 2022 · 953f552 · 953f552
1 parent 90f7975
commit 953f552
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 132 deletions.
diff --git a/Makefile b/Makefile
@@ -1,22 +1,20 @@
 MKPATH = constructor
 AHK2EXE = Ahk2Exe.exe
-PACKER = upx.exe
 
 ifeq ($(PROCESSOR_ARCHITECTURE), x86)
 	AHKRES = resources32.bin
 else
 	AHKRES = resources64.bin
 endif
 
-RM = /bin/rm.exe
+RM = /bin/rm
 
 object = mintty-dropdown
 
 all: mintty-dropdown
 
 mintty-dropdown: $(object).ahk
-	$(MKPATH)/$(AHK2EXE) /in $^ /bin $(MKPATH)/$(AHKRES)
-	$(MKPATH)/$(PACKER) $(object).exe
+	$(MKPATH)/$(AHK2EXE) /in $^ /base $(MKPATH)/$(AHKRES) /compress 2 /silent verbose
 
 clean: $(object)
 	$(RM) -f $^.exe

diff --git a/Makefile.cmd b/Makefile.cmd
@@ -2,7 +2,6 @@
 
 set MKPATH=constructor
 set AHK2EXE=Ahk2Exe.exe
-set PACKER=upx.exe
 
 if defined ProgramFiles(x86) (
     set AHKRES=resources64.bin
@@ -22,10 +21,8 @@ echo Successfully compiled
 goto:EOF
 
 :mintty-dropdown
-    echo %MKPATH%\%AHK2EXE% /in %object%.ahk /bin %MKPATH%\%AHKRES%
-    %MKPATH%\%AHK2EXE% /in %object%.ahk /bin %MKPATH%\%AHKRES%
-    echo %MKPATH%\%PACKER% %object%.exe
-    %MKPATH%\%PACKER% %object%.exe
+    echo %MKPATH%\%AHK2EXE% /in %object%.ahk /base %MKPATH%\%AHKRES%
+    %MKPATH%\%AHK2EXE% /in %object%.ahk /base %MKPATH%\%AHKRES% /compress 2 /silent verbose
 goto:EOF
 
 :clean

diff --git a/constructor/Ahk2Exe.exe b/constructor/Ahk2Exe.exe
diff --git a/constructor/resources32.bin b/constructor/resources32.bin
diff --git a/constructor/resources64.bin b/constructor/resources64.bin
diff --git a/constructor/upx.LICENSE b/constructor/upx.LICENSE
diff --git a/constructor/upx.exe b/constructor/upx.exe