From 7e2ec795d4bf197e28a67eee3c4d1f9747fe3357 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Tue, 20 Dec 2016 20:53:57 +0100 Subject: [PATCH] Removed superfluous MakeNSIS argument. --- etc/Deployment/make.bat | 2 +- etc/NSIS/setup.nsi | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/etc/Deployment/make.bat b/etc/Deployment/make.bat index aa1f1fec..d84007b5 100644 --- a/etc/Deployment/make.bat +++ b/etc/Deployment/make.bat @@ -172,7 +172,7 @@ pushd "%TMP_PATH%" "%~dp0\..\..\..\Prerequisites\GnuWin32\zip.exe" -r -9 -z "%OUT_FILE%.zip" "*.*" < "%OUT_FILE%.txt" popd -"%~dp0\..\..\..\Prerequisites\NSIS\makensis.exe" "/DLAMEXP_UPX_PATH=%PATH_UPXBIN%" "/DLAMEXP_DATE=%ISO_DATE%" "/DLAMEXP_VERSION=%VER_LAMEXP_MAJOR%.%VER_LAMEXP_MINOR_HI%%VER_LAMEXP_MINOR_LO%" "/DLAMEXP_BUILD=%VER_LAMEXP_BUILD%" "/DLAMEXP_INSTTYPE=%VER_LAMEXP_TYPE%" "/DLAMEXP_PATCH=%VER_LAMEXP_PATCH%" "/DLAMEXP_OUTPUT_FILE=%OUT_FILE%.sfx" "/DLAMEXP_SOURCE_PATH=%TMP_PATH%" "%~dp0\..\NSIS\setup.nsi" +"%~dp0\..\..\..\Prerequisites\NSIS\makensis.exe" "/DLAMEXP_DATE=%ISO_DATE%" "/DLAMEXP_VERSION=%VER_LAMEXP_MAJOR%.%VER_LAMEXP_MINOR_HI%%VER_LAMEXP_MINOR_LO%" "/DLAMEXP_BUILD=%VER_LAMEXP_BUILD%" "/DLAMEXP_INSTTYPE=%VER_LAMEXP_TYPE%" "/DLAMEXP_PATCH=%VER_LAMEXP_PATCH%" "/DLAMEXP_OUTPUT_FILE=%OUT_FILE%.sfx" "/DLAMEXP_SOURCE_PATH=%TMP_PATH%" "%~dp0\..\NSIS\setup.nsi" if %ERRORLEVEL% NEQ 0 ( "%~dp0\..\..\..\Prerequisites\CEcho\cecho.exe" red "\nFailed to build installer^!\n" pause && exit diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi index 1d668cb8..00717e09 100644 --- a/etc/NSIS/setup.nsi +++ b/etc/NSIS/setup.nsi @@ -49,9 +49,6 @@ !ifndef LAMEXP_SOURCE_PATH !error "LAMEXP_SOURCE_PATH is not defined !!!" !endif -!ifndef LAMEXP_UPX_PATH - !error "LAMEXP_UPX_PATH is not defined !!!" -!endif ;UUID !define MyRegPath "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{FBD7A67D-D700-4043-B54F-DD106D00F308}"