From dd1a7eb05b9997ba08bce9d08817a8ec56884ac4 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Tue, 3 Sep 2013 04:45:36 +0000 Subject: - even more win64 compatible git-svn-id: http://svn.miranda-ng.org/main/trunk@5911 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- tools/installer_ng/make.bat | 27 +++++++++++++++++++-------- tools/installer_ng/readme.txt | 2 +- 2 files changed, 20 insertions(+), 9 deletions(-) (limited to 'tools/installer_ng') diff --git a/tools/installer_ng/make.bat b/tools/installer_ng/make.bat index 40c16e9428..cf401d7e12 100644 --- a/tools/installer_ng/make.bat +++ b/tools/installer_ng/make.bat @@ -16,14 +16,25 @@ wget -O InnoNG_64\Installer\vcredist_x64.exe http://download.microsoft.com/downl rem end rem Extract -"%ProgramFiles%\7-zip\7z.exe" x tmp\miranda-ng-alpha-latest.7z -y -oInnoNG_32\Files -"%ProgramFiles%\7-zip\7z.exe" x tmp\clist_blind_x32.zip -y -oInnoNG_32\Files -"%ProgramFiles%\7-zip\7z.exe" x tmp\scriver_x32.zip -y -oInnoNG_32\Files -"%ProgramFiles%\7-zip\7z.exe" x tmp\miranda-ng-alpha-latest_x64.7z -y -oInnoNG_64\Files -"%ProgramFiles%\7-zip\7z.exe" x tmp\clist_blind_x64.zip -y -oInnoNG_64\Files -"%ProgramFiles%\7-zip\7z.exe" x tmp\scriver_x64.zip -y -oInnoNG_64\Files -"%ProgramFiles%\7-zip\7z.exe" x tmp\lang*.zip -y -oInnoNG_32\Files -"%ProgramFiles%\7-zip\7z.exe" x tmp\lang*.zip -y -oInnoNG_64\Files +if defined ProgramFiles(x86) ( + "%ProgramW6432%\7-zip\7z.exe" x tmp\miranda-ng-alpha-latest.7z -y -oInnoNG_32\Files + "%ProgramW6432%\7-zip\7z.exe" x tmp\clist_blind_x32.zip -y -oInnoNG_32\Files + "%ProgramW6432%\7-zip\7z.exe" x tmp\scriver_x32.zip -y -oInnoNG_32\Files + "%ProgramW6432%\7-zip\7z.exe" x tmp\miranda-ng-alpha-latest_x64.7z -y -oInnoNG_64\Files + "%ProgramW6432%\7-zip\7z.exe" x tmp\clist_blind_x64.zip -y -oInnoNG_64\Files + "%ProgramW6432%\7-zip\7z.exe" x tmp\scriver_x64.zip -y -oInnoNG_64\Files + "%ProgramW6432%\7-zip\7z.exe" x tmp\lang*.zip -y -oInnoNG_32\Files + "%ProgramW6432%\7-zip\7z.exe" x tmp\lang*.zip -y -oInnoNG_64\Files +) else ( + "%ProgramFiles%\7-zip\7z.exe" x tmp\miranda-ng-alpha-latest.7z -y -oInnoNG_32\Files + "%ProgramFiles%\7-zip\7z.exe" x tmp\clist_blind_x32.zip -y -oInnoNG_32\Files + "%ProgramFiles%\7-zip\7z.exe" x tmp\scriver_x32.zip -y -oInnoNG_32\Files + "%ProgramFiles%\7-zip\7z.exe" x tmp\miranda-ng-alpha-latest_x64.7z -y -oInnoNG_64\Files + "%ProgramFiles%\7-zip\7z.exe" x tmp\clist_blind_x64.zip -y -oInnoNG_64\Files + "%ProgramFiles%\7-zip\7z.exe" x tmp\scriver_x64.zip -y -oInnoNG_64\Files + "%ProgramFiles%\7-zip\7z.exe" x tmp\lang*.zip -y -oInnoNG_32\Files + "%ProgramFiles%\7-zip\7z.exe" x tmp\lang*.zip -y -oInnoNG_64\Files +) rem end rem Make diff --git a/tools/installer_ng/readme.txt b/tools/installer_ng/readme.txt index eff2c4c5c3..13d0f891df 100644 --- a/tools/installer_ng/readme.txt +++ b/tools/installer_ng/readme.txt @@ -1,6 +1,6 @@ How to compile Miranda NG installer: -1. Install 7-Zip from - http://www.7-zip.org/ +1. Install 7-Zip from - http://www.7-zip.org/ (make sure that you are downloading x64 version if you have 64-bit Windows) 2. Install Inno Setup QuickStart Pack unicode from - http://www.jrsoftware.org/isdl.php 3. Run make.bat 4. Collect the compiled installer files from Output folder \ No newline at end of file -- cgit v1.2.3