[X2Go-Commits] [vcxsrv] 01/05: Initial work to get VcXsrv to build with MSVC2012 xp compatibility, and for my build environment with cygwin bash.
git-admin at x2go.org
git-admin at x2go.org
Mon Mar 9 05:12:03 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to tag 1.14.3.1
in repository vcxsrv.
commit 3691880b30d149d27b9116f48069cf6e33bb6ff9
Author: Mike DePaulo <mikedep333 at gmail.com>
Date: Sat Apr 5 10:57:08 2014 -0400
Initial work to get VcXsrv to build with MSVC2012 xp compatibility, and for my build environment with cygwin bash.
---
buildall.sh | 2 +-
freetype/freetype.vcxproj | 8 ++++----
setvcenv.sh | 22 ++++++++++++++--------
xorg-server/installer/packageall.bat | 12 ++++++------
4 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/buildall.sh b/buildall.sh
index fd79763..3fc7765 100755
--- a/buildall.sh
+++ b/buildall.sh
@@ -65,7 +65,7 @@ check-error 'Error compiling mhmake for release'
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 .`
+export MHMAKECONF=`cygpath -wa .`
tools/mhmake/release/mhmake $PARBUILD -C xorg-server MAKESERVER=1 DEBUG=1
check-error 'Error compiling vcxsrv for debug'
diff --git a/freetype/freetype.vcxproj b/freetype/freetype.vcxproj
index 86d867a..9a2db05 100755
--- a/freetype/freetype.vcxproj
+++ b/freetype/freetype.vcxproj
@@ -43,7 +43,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v110_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -55,7 +55,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v110_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -67,7 +67,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v110_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -79,7 +79,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v110_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
diff --git a/setvcenv.sh b/setvcenv.sh
index a016d89..5bc769a 100644
--- a/setvcenv.sh
+++ b/setvcenv.sh
@@ -1,9 +1,15 @@
-export MHMAKECONF=`cygpath -da .`
+export MHMAKECONF=`cygpath -wa .`
-export VCINSTALLDIR="c:\Program Files\Microsoft Visual Studio 10.0\VC\\"
-export VS100COMNTOOLS="C:\Program Files\Microsoft Visual Studio 10.0\Common7\Tools\\"
-export VSINSTALLDIR="C:\Program Files\Microsoft Visual Studio 10.0\\"
-export WindowsSdkDir="C:\Program Files\Microsoft SDKs\Windows\v7.0A\\"
-export LIB="c:\Program Files\Microsoft Visual Studio 10.0\VC\lib;c:\Program Files\Microsoft SDKs\Windows\v7.0A\lib"
-export INCLUDE="c:\Program Files\Microsoft Visual Studio 10.0\VC\include;c:\Program Files\Microsoft SDKs\Windows\v7.0A\Include"
-export PATH="/vcxsrv:/cygdrive/c/Program Files/Microsoft Visual Studio 10.0/VC/bin:/cygdrive/c/Program Files/Microsoft Visual Studio 10.0/Common7/IDE:/cygdrive/c/Program Files/Microsoft SDKs/Windows/v7.0A/bin:$PATH"
+
+export VisualStudioVersion="11.0"
+
+export VCINSTALLDIR="c:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\\"
+export VS100COMNTOOLS="C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\Tools\\"
+export VS110COMNTOOLS="C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\Tools\\"
+export VSINSTALLDIR="C:\Program Files (x86)\Microsoft Visual Studio 11.0\\"
+export WindowsSdkDir="C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0\\"
+export WindowsSdkDir_35="C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\\"
+export WindowsSdkDir_old="C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\\"
+export LIB="c:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\lib;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\lib"
+export INCLUDE="c:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include"
+export PATH="/vcxsrv:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 11.0/Common7/IDE:/cygdrive/c/Program Files/Microsoft SDKs/Windows/v7.1A/bin:/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319:/cygdrive/c/Program Files (x86)/Windows Kits/8.0/bin/x86/:$PATH"
diff --git a/xorg-server/installer/packageall.bat b/xorg-server/installer/packageall.bat
index d8b2450..e5e765d 100755
--- a/xorg-server/installer/packageall.bat
+++ b/xorg-server/installer/packageall.bat
@@ -8,9 +8,9 @@ copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x86\Microsof
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
- "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv-debug.nsi
+if exist "C:\Program Files (x86)\NSIS\makensis.exe" (
+ "C:\Program Files (x86)\NSIS\makensis.exe" vcxsrv.nsi
+ "C:\Program Files (x86)\NSIS\makensis.exe" vcxsrv-debug.nsi
) else (
"C:\Program Files\NSIS\makensis.exe" vcxsrv.nsi
"C:\Program Files\NSIS\makensis.exe" vcxsrv-debug.nsi
@@ -24,9 +24,9 @@ copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x64\Microsof
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
- "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv-64-debug.nsi
+if exist "C:\Program Files (x86)\NSIS\makensis.exe" (
+ "C:\Program Files (x86)\NSIS\makensis.exe" vcxsrv-64.nsi
+ "C:\Program Files (x86)\NSIS\makensis.exe" vcxsrv-64-debug.nsi
) else (
"C:\Program Files\NSIS\makensis.exe" vcxsrv-64.nsi
"C:\Program Files\NSIS\makensis.exe" vcxsrv-64-debug.nsi
--
Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git
More information about the x2go-commits
mailing list