summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2013-09-03 18:17:42 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2013-09-03 18:17:42 +0000
commit5ae20d4da68c98c2a0d851b4b45da9181e61781c (patch)
tree836d0d9bb80ee4d4b02b4cdbc0ae52f2cb61751e /tools
parent6fbc007bf18b0bedd5c351c177a122bd497168d9 (diff)
- Installer: switched to Inno command line compiler
git-svn-id: http://svn.miranda-ng.org/main/trunk@5921 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'tools')
-rw-r--r--tools/installer_ng/InnoNG_32/MirandaNG.iss2
-rw-r--r--tools/installer_ng/InnoNG_64/MirandaNG.iss2
-rw-r--r--tools/installer_ng/make.bat10
3 files changed, 7 insertions, 7 deletions
diff --git a/tools/installer_ng/InnoNG_32/MirandaNG.iss b/tools/installer_ng/InnoNG_32/MirandaNG.iss
index a4a76ab6cb..5009e62b7c 100644
--- a/tools/installer_ng/InnoNG_32/MirandaNG.iss
+++ b/tools/installer_ng/InnoNG_32/MirandaNG.iss
@@ -18,7 +18,7 @@ CreateUninstallRegKey=IsDefault()
Compression=lzma2/max
SolidCompression=yes
PrivilegesRequired=poweruser
-OutputDir=..\Output
+OutputDir=..\
OutputBaseFilename=miranda-ng-alpha-latest
WizardImageFile=Installer\WizModernImage-IS.bmp
WizardSmallImageFile=Installer\SetupMNGSmall.bmp
diff --git a/tools/installer_ng/InnoNG_64/MirandaNG.iss b/tools/installer_ng/InnoNG_64/MirandaNG.iss
index 7c3afcc5ce..e5e5e3a4c0 100644
--- a/tools/installer_ng/InnoNG_64/MirandaNG.iss
+++ b/tools/installer_ng/InnoNG_64/MirandaNG.iss
@@ -19,7 +19,7 @@ CreateUninstallRegKey=IsDefault()
Compression=lzma2/max
SolidCompression=yes
PrivilegesRequired=poweruser
-OutputDir=..\Output
+OutputDir=..\
OutputBaseFilename=miranda-ng-alpha-latest_x64
WizardImageFile=Installer\WizModernImage-IS.bmp
WizardSmallImageFile=Installer\SetupMNGSmall.bmp
diff --git a/tools/installer_ng/make.bat b/tools/installer_ng/make.bat
index 5dd403e6bf..83a05222ab 100644
--- a/tools/installer_ng/make.bat
+++ b/tools/installer_ng/make.bat
@@ -51,10 +51,10 @@ rem end
rem Make
if defined ProgramFiles(x86) (
- "%ProgramFiles(x86)%\Inno Setup 5\Compil32.exe" /cc "InnoNG_32\MirandaNG.iss"
- "%ProgramFiles(x86)%\Inno Setup 5\Compil32.exe" /cc "InnoNG_64\MirandaNG.iss"
+ "%ProgramFiles(x86)%\Inno Setup 5\ISCC.exe" /O"Output" "InnoNG_32\MirandaNG.iss"
+ "%ProgramFiles(x86)%\Inno Setup 5\ISCC.exe" /O"Output" "InnoNG_64\MirandaNG.iss"
) else (
- "%ProgramFiles%\Inno Setup 5\Compil32.exe" /cc "InnoNG_32\MirandaNG.iss"
- "%ProgramFiles%\Inno Setup 5\Compil32.exe" /cc "InnoNG_64\MirandaNG.iss"
-)
+ "%ProgramFiles%\Inno Setup 5\ISCC.exe" /O"Output" "InnoNG_32\MirandaNG.iss"
+ "%ProgramFiles%\Inno Setup 5\ISCC.exe" /O"Output" "InnoNG_64\MirandaNG.iss"
+)
rem end \ No newline at end of file