diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-09-03 04:45:36 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-09-03 04:45:36 +0000 |
| commit | dd1a7eb05b9997ba08bce9d08817a8ec56884ac4 (patch) | |
| tree | f47bc0ee44708514ed05b03838e13efe4ffdf05a | |
| parent | 61acb52e0da259928875a286104d35bfef584e56 (diff) | |
- even more win64 compatible
git-svn-id: http://svn.miranda-ng.org/main/trunk@5911 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | tools/installer_ng/make.bat | 27 | ||||
| -rw-r--r-- | tools/installer_ng/readme.txt | 2 |
2 files changed, 20 insertions, 9 deletions
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 |