Increased version to 1.14.3 and now compile with Visual Studio 2012 Express Edition

6 files changed, 51 insertions, 33 deletions

diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc
index 08a206d88..38d142fd1 100644
--- a/xorg-server/hw/xwin/XWin.rc
+++ b/xorg-server/hw/xwin/XWin.rc
@@ -47,7 +47,7 @@ BEGIN
   LTEXT			"VcXsrv X Server ", IDC_STATIC, 36, 8, 220, 8
   LTEXT			"http://vcxsrv.sourceforge.net", IDC_STATIC, 36, 18, 220, 8
   LTEXT			"marha@users.sourceforge.net", IDC_STATIC, 36, 28, 220, 8
-  LTEXT			"Version 1.14.2.1 (26 July 2013)", IDC_STATIC, 36, 38, 220, 8
+  LTEXT			"Version 1.14.3 (19 Sep 2013)", IDC_STATIC, 36, 38, 220, 8
   DEFPUSHBUTTON		"OK", IDOK, 105, 75, 50, 15
 END
 
diff --git a/xorg-server/installer/packageall.bat b/xorg-server/installer/packageall.bat
index edf1ba4eb..d8b245029 100755
--- a/xorg-server/installer/packageall.bat
+++ b/xorg-server/installer/packageall.bat
@@ -3,10 +3,10 @@ if exist vcxsrv*.installer.exe del vcxsrv*.installer.exe
 

 if "%1"=="nox86" goto skipx86

 

-copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\x86\Microsoft.VC100.CRT\msvcp100.dll"

-copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\x86\Microsoft.VC100.CRT\msvcr100.dll"

-copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC100.DebugCRT\msvcp100d.dll"

-copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC100.DebugCRT\msvcr100d.dll"

+copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x86\Microsoft.VC110.CRT\msvcp110.dll"

+copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x86\Microsoft.VC110.CRT\msvcr110.dll"

+copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC110.DebugCRT\msvcp110d.dll"

+copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC110.DebugCRT\msvcr110d.dll"

 

 if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" (

   "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv.nsi

@@ -19,10 +19,10 @@ if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" (
 :skipx86

 if "%1"=="nox64" goto skipx64

 

-copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\x64\Microsoft.VC100.CRT\msvcp100.dll"

-copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\x64\Microsoft.VC100.CRT\msvcr100.dll"

-copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC100.DebugCRT\msvcp100d.dll"

-copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC100.DebugCRT\msvcr100d.dll"

+copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x64\Microsoft.VC110.CRT\msvcp110.dll"

+copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x64\Microsoft.VC110.CRT\msvcr110.dll"

+copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC110.DebugCRT\msvcp110d.dll"

+copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC110.DebugCRT\msvcr110d.dll"

 

 if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" (

   "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv-64.nsi

@@ -34,7 +34,7 @@ if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" (
 

 :skipx64

 

-del msvcr100.dll

-del msvcr100d.dll

-del msvcp100.dll

-del msvcp100d.dll

+del msvcr110.dll

+del msvcr110d.dll

+del msvcp110.dll

+del msvcp110d.dll

diff --git a/xorg-server/installer/vcxsrv-64-debug.nsi b/xorg-server/installer/vcxsrv-64-debug.nsi
index 3afad4dcd..470d9c6b8 100644
--- a/xorg-server/installer/vcxsrv-64-debug.nsi
+++ b/xorg-server/installer/vcxsrv-64-debug.nsi
@@ -21,7 +21,7 @@
 Name "VcXsrv"

 

 ; The file to write

-OutFile "vcxsrv-64-debug.1.14.2.1.installer.exe"

+OutFile "vcxsrv-64-debug.1.14.3.installer.exe"

 

 ; The default installation directory

 InstallDir $PROGRAMFILES64\VcXsrv

@@ -61,6 +61,11 @@ Section "VcXsrv debug exe and dlls"
   ; Set output path to the installation directory.

   SetOutPath $INSTDIR

 

+  IfFileExists "$INSTDIR\msvcr100d.dll" 0 +2

+    Delete "$INSTDIR\msvcr100d.dll"

+  IfFileExists "$INSTDIR\msvcp100d.dll" 0 +2

+    Delete "$INSTDIR\msvcp100d.dll"

+

   ; Put files there

   File "..\obj64\servdebug\vcxsrv.exe"

   File "..\..\xkbcomp\obj64\debug\xkbcomp.exe"

@@ -81,8 +86,8 @@ Section "VcXsrv debug exe and dlls"
   File "..\..\libX11\obj64\debug\libX11.dll"

   File "..\..\libXext\src\obj64\debug\libXext.dll"

   File "..\..\libXmu\src\obj64\debug\libXmu.dll"

-  File "msvcr100d.dll"

-  File "msvcp100d.dll"

+  File "msvcr110d.dll"

+  File "msvcp110d.dll"

 

   WriteRegStr HKLM SOFTWARE\VcXsrv "Install_Dir_64" $INSTDIR

 SectionEnd

diff --git a/xorg-server/installer/vcxsrv-64.nsi b/xorg-server/installer/vcxsrv-64.nsi
index a7fa14a82..9c04e3ef8 100644
--- a/xorg-server/installer/vcxsrv-64.nsi
+++ b/xorg-server/installer/vcxsrv-64.nsi
@@ -21,7 +21,7 @@
 Name "VcXsrv"

 

 ; The file to write

-OutFile "vcxsrv-64.1.14.2.1.installer.exe"

+OutFile "vcxsrv-64.1.14.3.installer.exe"

 

 ; The default installation directory

 InstallDir $programfiles64\VcXsrv

@@ -65,6 +65,10 @@ Section "VcXsrv (required)"
   ; Remove old opengl32.dll file if it extits

   IfFileExists "$INSTDIR\opengl32.dll" 0 +2

     Delete "$INSTDIR\opengl32.dll"

+  IfFileExists "$INSTDIR\msvcr100.dll" 0 +2

+    Delete "$INSTDIR\msvcr100.dll"

+  IfFileExists "$INSTDIR\msvcp100.dll" 0 +2

+    Delete "$INSTDIR\msvcp100.dll"

 

   ; Put files there

   File "..\obj64\servrelease\vcxsrv.exe"

@@ -101,8 +105,8 @@ Section "VcXsrv (required)"
   File "..\..\libX11\obj64\release\libX11.dll"

   File "..\..\libXext\src\obj64\release\libXext.dll"

   File "..\..\libXmu\src\obj64\release\libXmu.dll"

-  File "msvcr100.dll"

-  File "msvcp100.dll"

+  File "msvcr110.dll"

+  File "msvcp110.dll"

   SetOutPath $INSTDIR\xkbdata

   File /r "..\xkbdata\*.*"

   SetOutPath $INSTDIR\locale

@@ -226,10 +230,10 @@ Section "Uninstall"
   Delete "$INSTDIR\libxml2.dll"

   Delete "$INSTDIR\zlib1.dll"

   Delete "$INSTDIR\iconv.dll"

-  Delete "$INSTDIR\msvcr100.dll"

-  Delete "$INSTDIR\msvcp100.dll"

-  Delete "$INSTDIR\msvcr100d.dll"

-  Delete "$INSTDIR\msvcp100d.dll"

+  Delete "$INSTDIR\msvcr110.dll"

+  Delete "$INSTDIR\msvcp110.dll"

+  Delete "$INSTDIR\msvcr110d.dll"

+  Delete "$INSTDIR\msvcp110d.dll"

 

   RMDir /r "$INSTDIR\fonts"

   RMDir /r "$INSTDIR\xkbdata"

diff --git a/xorg-server/installer/vcxsrv-debug.nsi b/xorg-server/installer/vcxsrv-debug.nsi
index edde82641..8a3ea204a 100644
--- a/xorg-server/installer/vcxsrv-debug.nsi
+++ b/xorg-server/installer/vcxsrv-debug.nsi
@@ -21,7 +21,7 @@
 Name "VcXsrv"

 

 ; The file to write

-OutFile "vcxsrv-debug.1.14.2.1.installer.exe"

+OutFile "vcxsrv-debug.1.14.3.installer.exe"

 

 ; The default installation directory

 InstallDir $PROGRAMFILES32\VcXsrv

@@ -61,6 +61,11 @@ Section "VcXsrv debug exe and dlls"
   ; Set output path to the installation directory.

   SetOutPath $INSTDIR

 

+  IfFileExists "$INSTDIR\msvcr100d.dll" 0 +2

+    Delete "$INSTDIR\msvcr100d.dll"

+  IfFileExists "$INSTDIR\msvcp100d.dll" 0 +2

+    Delete "$INSTDIR\msvcp100d.dll"

+

   ; Put files there

   File "..\obj\servdebug\vcxsrv.exe"

   File "..\..\xkbcomp\obj\debug\xkbcomp.exe"

@@ -81,8 +86,8 @@ Section "VcXsrv debug exe and dlls"
   File "..\..\libX11\obj\debug\libX11.dll"

   File "..\..\libXext\src\obj\debug\libXext.dll"

   File "..\..\libXmu\src\obj\debug\libXmu.dll"

-  File "msvcr100d.dll"

-  File "msvcp100d.dll"

+  File "msvcr110d.dll"

+  File "msvcp110d.dll"

 

   WriteRegStr HKLM SOFTWARE\VcXsrv "Install_Dir" "$INSTDIR"

 SectionEnd

diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index f96d4d1dc..f7e02a9ce 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -21,7 +21,7 @@
 Name "VcXsrv"

 

 ; The file to write

-OutFile "vcxsrv.1.14.2.1.installer.exe"

+OutFile "vcxsrv.1.14.3.installer.exe"

 

 ; The default installation directory

 InstallDir $PROGRAMFILES32\VcXsrv

@@ -65,6 +65,10 @@ Section "VcXsrv (required)"
   ; Remove old opengl32.dll file if it extits

   IfFileExists "$INSTDIR\opengl32.dll" 0 +2

     Delete "$INSTDIR\opengl32.dll"

+  IfFileExists "$INSTDIR\msvcr100.dll" 0 +2

+    Delete "$INSTDIR\msvcr100.dll"

+  IfFileExists "$INSTDIR\msvcp100.dll" 0 +2

+    Delete "$INSTDIR\msvcp100.dll"

 

   ; Put files there

   File "..\obj\servrelease\vcxsrv.exe"

@@ -101,8 +105,8 @@ Section "VcXsrv (required)"
   File "..\..\libX11\obj\release\libX11.dll"

   File "..\..\libXext\src\obj\release\libXext.dll"

   File "..\..\libXmu\src\obj\release\libXmu.dll"

-  File "msvcr100.dll"

-  File "msvcp100.dll"

+  File "msvcr110.dll"

+  File "msvcp110.dll"

   SetOutPath $INSTDIR\xkbdata

   File /r "..\xkbdata\*.*"

   SetOutPath $INSTDIR\locale

@@ -226,10 +230,10 @@ Section "Uninstall"
   Delete "$INSTDIR\libxml2.dll"

   Delete "$INSTDIR\zlib1.dll"

   Delete "$INSTDIR\iconv.dll"

-  Delete "$INSTDIR\msvcr100.dll"

-  Delete "$INSTDIR\msvcp100.dll"

-  Delete "$INSTDIR\msvcr100d.dll"

-  Delete "$INSTDIR\msvcp100d.dll"

+  Delete "$INSTDIR\msvcr110.dll"

+  Delete "$INSTDIR\msvcp110.dll"

+  Delete "$INSTDIR\msvcr110d.dll"

+  Delete "$INSTDIR\msvcp110d.dll"

 

   RMDir /r "$INSTDIR\fonts"

   RMDir /r "$INSTDIR\xkbdata"