aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/installer/packageall.bat
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-11-20 16:38:12 +0100
committermarha <marha@users.sourceforge.net>2012-11-20 16:38:12 +0100
commit589f5feba1e7968b7318b02f4f2bdea81937f0e1 (patch)
treecb66bfd5efb59eb4b66cee9370cf30a136fc2df4 /xorg-server/installer/packageall.bat
parentfc83ab987c84518c31793515c4f99a0df8ccd1cc (diff)
downloadvcxsrv-589f5feba1e7968b7318b02f4f2bdea81937f0e1.tar.gz
vcxsrv-589f5feba1e7968b7318b02f4f2bdea81937f0e1.tar.bz2
vcxsrv-589f5feba1e7968b7318b02f4f2bdea81937f0e1.zip
Now the software can be compiled from inside a cygwin terminal
Diffstat (limited to 'xorg-server/installer/packageall.bat')
-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