diff --git a/Makefile b/Makefile index 495ebae..e069b99 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PIP=/c/Python27/pyinstaller-2.1 +PIP=/c/Python27/Scripts/ UPX_PATH=/c/upx391w ICON=./misc/jabia_icon.ico @@ -14,17 +14,17 @@ TEMP=./tmp all: pak ctx vtp deg cui wizard pak: - python $(PIP)/pyinstaller.py --upx-dir=$(UPX_PATH) --onefile --console --icon $(ICON1) --name pak_magick -p src/ src/pak_magick.py + python $(PIP)/pyinstaller-script.py --upx-dir=$(UPX_PATH) --onefile --console --icon $(ICON1) --name pak_magick -p src/ src/pak_magick.py ctx: - python $(PIP)/pyinstaller.py --upx-dir=$(UPX_PATH) --onefile --console --icon $(ICON2) --name ctx_magick -p src/ src/ctx_magick.py + python $(PIP)/pyinstaller-script.py --upx-dir=$(UPX_PATH) --onefile --console --icon $(ICON2) --name ctx_magick -p src/ src/ctx_magick.py vtp: - python $(PIP)/pyinstaller.py --upx-dir=$(UPX_PATH) --onefile --console --icon $(ICON3) --name vtp_magick -p src/ src/vtp_magick.py + python $(PIP)/pyinstaller-script.py --upx-dir=$(UPX_PATH) --onefile --console --icon $(ICON3) --name vtp_magick -p src/ src/vtp_magick.py deg: - python $(PIP)/pyinstaller.py --upx-dir=$(UPX_PATH) --onefile --console --icon $(ICON4) --name deg_magick -p src/ src/deg_magick.py + python $(PIP)/pyinstaller-script.py --upx-dir=$(UPX_PATH) --onefile --console --icon $(ICON4) --name deg_magick -p src/ src/deg_magick.py cui: - python $(PIP)/pyinstaller.py --upx-dir=$(UPX_PATH) --onefile --console --icon $(ICON5) --name cui_magick -p src/ src/cui_magick.py + python $(PIP)/pyinstaller-script.py --upx-dir=$(UPX_PATH) --onefile --console --icon $(ICON5) --name cui_magick -p src/ src/cui_magick.py wizard: - python $(PIP)/pyinstaller.py --upx-dir=$(UPX_PATH) --onefile --console --name jabia_wizard -p src/ src/experimental/jabia_wizard.py + python $(PIP)/pyinstaller-script.py --upx-dir=$(UPX_PATH) --onefile --console --name jabia_wizard -p src/ src/experimental/jabia_wizard.py .PHONY: test diff --git a/bia_tools.bat b/bia_tools.bat deleted file mode 100644 index d7e093d..0000000 --- a/bia_tools.bat +++ /dev/null @@ -1,16 +0,0 @@ - set PIP=C:\Python27\pyinstaller-3.1\ - set UPX_PATH=C:\upx391w - set ICON=.\misc\jabia_icon.ico - set ICON1=.\misc\pak_icon.ico - set ICON2=.\misc\ctx_icon.ico - set ICON3=.\misc\vtp_icon.ico - set ICON4=.\misc\deg_icon.ico - set ICON5=.\misc\cui_icon.ico - python %PIP%pyinstaller.py --upx-dir=%UPX_PATH% --onefile --console --icon %ICON1% --name pak_magick -p src\ src\pak_magick.py - python %PIP%pyinstaller.py --upx-dir=%UPX_PATH% --onefile --console --icon %ICON2% --name ctx_magick -p src\ src\ctx_magick.py - python %PIP%pyinstaller.py --upx-dir=%UPX_PATH% --onefile --console --icon %ICON3% --name vtp_magick -p src\ src\vtp_magick.py - python %PIP%pyinstaller.py --upx-dir=%UPX_PATH% --onefile --console --icon %ICON4% --name deg_magick -p src\ src\deg_magick.py - python %PIP%pyinstaller.py --upx-dir=%UPX_PATH% --onefile --console --icon %ICON5% --name cui_magick -p src\ src\cui_magick.py - REM python %PIP%pyinstaller.py --onefile --console --name crf2obj -p src\ src\crf2obj.py - REM python %PIP%pyinstaller.py -upx-dir=%UPX_PATH% --onefile --console --name jabia_wizard -p src\experimental src\experimental\jabia_wizard.py - REM python %PIP%pyinstaller.py --upx-dir=%UPX_PATH% --onefile --console --icon %ICON3% --name find_pkle -p src\ src\find_pkle.py diff --git a/dist/ctx_magick.exe b/dist/ctx_magick.exe index 9345d12..d76730b 100644 Binary files a/dist/ctx_magick.exe and b/dist/ctx_magick.exe differ diff --git a/dist/cui_magick.exe b/dist/cui_magick.exe index c983714..48e1bf8 100644 Binary files a/dist/cui_magick.exe and b/dist/cui_magick.exe differ diff --git a/dist/deg_magick.exe b/dist/deg_magick.exe index fc56db2..c5f6eda 100644 Binary files a/dist/deg_magick.exe and b/dist/deg_magick.exe differ diff --git a/dist/pak_magick.exe b/dist/pak_magick.exe index 068685e..46ee904 100644 Binary files a/dist/pak_magick.exe and b/dist/pak_magick.exe differ diff --git a/dist/vtp_magick.exe b/dist/vtp_magick.exe index 86eb255..cba4974 100644 Binary files a/dist/vtp_magick.exe and b/dist/vtp_magick.exe differ