From 589f5feba1e7968b7318b02f4f2bdea81937f0e1 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 20 Nov 2012 16:38:12 +0100 Subject: Now the software can be compiled from inside a cygwin terminal --- xorg-server/installer/packageall.bat | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) mode change 100644 => 100755 xorg-server/installer/packageall.bat (limited to 'xorg-server/installer') diff --git a/xorg-server/installer/packageall.bat b/xorg-server/installer/packageall.bat old mode 100644 new mode 100755 index 720c29893..2195223fe --- 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 -- cgit v1.2.3