From 1e8490bdbb42bb358a2d58526c0e21bc665989e4 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 19 Sep 2013 08:37:56 +0200 Subject: Increased version to 1.14.3 and now compile with Visual Studio 2012 Express Edition --- buildall.sh | 22 ++++++++++---------- freetype/freetype.vcxproj | 8 ++++++++ include/dix-config.h | 2 +- .../glsl_apps_compile/glsl_apps_compile.vcxproj | 4 ++++ mesalib/windows/VC8/mesa/makefile | 13 +++--------- mesalib/windows/VC8/mesa/mesa/mesa.vcxproj | 4 ++++ .../windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj | 4 ++++ xorg-server/hw/xwin/XWin.rc | 2 +- xorg-server/installer/packageall.bat | 24 +++++++++++----------- xorg-server/installer/vcxsrv-64-debug.nsi | 11 +++++++--- xorg-server/installer/vcxsrv-64.nsi | 18 +++++++++------- xorg-server/installer/vcxsrv-debug.nsi | 11 +++++++--- xorg-server/installer/vcxsrv.nsi | 18 +++++++++------- 13 files changed, 86 insertions(+), 55 deletions(-) diff --git a/buildall.sh b/buildall.sh index 54347f427..fd7976383 100755 --- a/buildall.sh +++ b/buildall.sh @@ -10,25 +10,25 @@ function check-error { which nasm > /dev/null 2>&1 check-error 'Please install nasm' -which devenv.com > /dev/null 2>&1 +which MSBuild.exe > /dev/null 2>&1 check-error 'Please install/set environment for visual studio 2010' # echo script lines from now one #set -v if [[ "$IS64" == "" ]]; then -FREETYPERELCONF="Release Multithreaded|Win32" -FREETYPEDBGCONF="Debug Multithreaded|Win32" +MSBuild.exe freetype/freetypevc10.sln /t:Build /p:Configuration="Release Multithreaded" /p:Platform=Win32 +check-error 'Error compiling freetype' +MSBuild.exe freetype/freetypevc10.sln /t:Build /p:Configuration="Debug Multithreaded" /p:Platform=Win32 +check-error 'Error compiling freetype' else -FREETYPERELCONF="Release Multithreaded|x64" -FREETYPEDBGCONF="Debug Multithreaded|x64" +MSBuild.exe freetype/freetypevc10.sln /t:Build /p:Configuration="Release Multithreaded" /p:Platform=x64 +check-error 'Error compiling freetype' +MSBuild.exe freetype/freetypevc10.sln /t:Build /p:Configuration="Debug Multithreaded" /p:Platform=x64 +check-error 'Error compiling freetype' fi -devenv.com freetype/freetypevc10.sln /build "$FREETYPERELCONF" -check-error 'Error compiling freetype' -devenv.com freetype/freetypevc10.sln /build "$FREETYPEDBGCONF" -check-error 'Error compiling freetype' cd openssl @@ -59,10 +59,10 @@ check-error 'Error compiling pthreads for debug' cd .. -devenv.com tools/mhmake/mhmakevc10.sln /build "Release|Win32" +MSBuild.exe tools/mhmake/mhmakevc10.sln /t:Build /p:Configuration=Release /p:Platform=Win32 check-error 'Error compiling mhmake for release' -devenv.com tools/mhmake/mhmakevc10.sln /build "Debug|Win32" +MSBuild.exe tools/mhmake/mhmakevc10.sln /t:Build /p:Configuration=Debug /p:Platform=Win32 check-error 'Error compiling mhmake for debug' export MHMAKECONF=`cygpath -da .` diff --git a/freetype/freetype.vcxproj b/freetype/freetype.vcxproj index b81a8ad2e..86d867ac6 100755 --- a/freetype/freetype.vcxproj +++ b/freetype/freetype.vcxproj @@ -43,41 +43,49 @@ StaticLibrary false MultiByte + v110 StaticLibrary false MultiByte + v110 StaticLibrary false MultiByte + v110 StaticLibrary false MultiByte + v110 StaticLibrary false MultiByte + v110 StaticLibrary false MultiByte + v110 StaticLibrary false MultiByte + v110 StaticLibrary false MultiByte + v110 diff --git a/include/dix-config.h b/include/dix-config.h index cdde905f8..a05707d38 100644 --- a/include/dix-config.h +++ b/include/dix-config.h @@ -357,7 +357,7 @@ #undef XORG_RELEASE /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 10000000) + ((14) * 100000) + ((2) * 1000) + 1) +#define XORG_VERSION_CURRENT (((1) * 10000000) + ((14) * 100000) + ((3) * 1000) + 0) /* Xorg release date */ #define XORG_DATE "10 Sept 2009" diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj index 0a5698b9d..c1da6f80b 100644 --- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj +++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj @@ -28,19 +28,23 @@ Application MultiByte true + v110 Application MultiByte true + v110 Application MultiByte + v110 Application MultiByte + v110 diff --git a/mesalib/windows/VC8/mesa/makefile b/mesalib/windows/VC8/mesa/makefile index adef514ed..3134b51ae 100644 --- a/mesalib/windows/VC8/mesa/makefile +++ b/mesalib/windows/VC8/mesa/makefile @@ -1,20 +1,13 @@ -ifdef VS2008 -MHMAKESLNFILE=mesa.sln -BUILDCMD=vcbuild $(MHMAKESLNFILE) -else MHMAKESLNFILE=mesavc10.sln -BUILDCMD=devenv.com $(MHMAKESLNFILE) /build -endif +BUILDCMD=MSBuild.exe $(MHMAKESLNFILE) /t:Build ifdef IS64 -DBGBUILDCMD=$(BUILDCMD) "Debug|x64" -RELBUILDCMD=$(BUILDCMD) "Release|x64" TARGETDIR=x64 else -DBGBUILDCMD=$(BUILDCMD) "Debug|Win32" -RELBUILDCMD=$(BUILDCMD) "Release|Win32" TARGETDIR=Win32 endif +DBGBUILDCMD=$(BUILDCMD) /p:Configuration=Debug /p:Platform=$(TARGETDIR) +RELBUILDCMD=$(BUILDCMD) /p:Configuration=Release /p:Platform=$(TARGETDIR) DEPS:=$(wildcard ..\..\..\src\mesa\swrast\*.c) \ diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj index 397074388..9c121e7fe 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj @@ -27,21 +27,25 @@ StaticLibrary false MultiByte + v110 StaticLibrary false MultiByte + v110 StaticLibrary false MultiByte + v110 StaticLibrary false MultiByte + v110 diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj index 6ee615773..016777d62 100644 --- a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj +++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj @@ -27,21 +27,25 @@ DynamicLibrary false MultiByte + v110 DynamicLibrary false MultiByte + v110 DynamicLibrary false MultiByte + v110 DynamicLibrary false MultiByte + v110 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" -- cgit v1.2.3