aboutsummaryrefslogtreecommitdiff
path: root/buildall.sh
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-09-19 08:37:56 +0200
committermarha <marha@users.sourceforge.net>2013-09-19 08:37:56 +0200
commit1e8490bdbb42bb358a2d58526c0e21bc665989e4 (patch)
treeba9c607f3535d0ed5b70462f398d4bee89f00ddc /buildall.sh
parent1531508ab9f3e354128ce17889784b703e99a480 (diff)
downloadvcxsrv-1e8490bdbb42bb358a2d58526c0e21bc665989e4.tar.gz
vcxsrv-1e8490bdbb42bb358a2d58526c0e21bc665989e4.tar.bz2
vcxsrv-1e8490bdbb42bb358a2d58526c0e21bc665989e4.zip
Increased version to 1.14.3 and now compile with Visual Studio 2012 Express Edition
Diffstat (limited to 'buildall.sh')
-rwxr-xr-xbuildall.sh22
1 files changed, 11 insertions, 11 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 .`