aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/installer
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/installer')
-rwxr-xr-x[-rw-r--r--]xorg-server/installer/packageall.bat10
1 files changed, 8 insertions, 2 deletions
diff --git a/xorg-server/installer/packageall.bat b/xorg-server/installer/packageall.bat
index 720c29893..2195223fe 100644..100755
--- a/xorg-server/installer/packageall.bat
+++ b/xorg-server/installer/packageall.bat
@@ -5,8 +5,14 @@ copy %systemroot%\system32\msvcr100.dll
copy %systemroot%\system32\msvcp100.dll
copy %systemroot%\system32\msvcr100d.dll
copy %systemroot%\system32\msvcp100d.dll
-"C:\Program Files\NSIS\makensis.exe" vcxsrv.nsi
-"C:\Program Files\NSIS\makensis.exe" vcxsrv-debug.nsi
+
+if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" (
+ "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv.nsi
+ "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv-debug.nsi
+) else (
+ "C:\Program Files\NSIS\makensis.exe" vcxsrv.nsi
+ "C:\Program Files\NSIS\makensis.exe" vcxsrv-debug.nsi
+)
del msvcr100.dll
del msvcr100d.dll
del msvcp100.dll