From ea735c2663057ed5706205ac4f5efd67ea5fe9a2 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 26 Mar 2013 21:51:59 +0000 Subject: [PATCH] - Windows: Update build_projects.bat to use MSBuild if available (issue #688). - Linux: Update build_projects.sh to include the target name in the make command. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1165 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- cef1/tools/build_projects.bat | 5 ++++- cef1/tools/build_projects.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cef1/tools/build_projects.bat b/cef1/tools/build_projects.bat index 6c0739eca..e8e2ed99f 100644 --- a/cef1/tools/build_projects.bat +++ b/cef1/tools/build_projects.bat @@ -21,9 +21,12 @@ set PROJECT_EXT=.vcproj ) else ( call "%VS100COMNTOOLS%vsvars32.bat" set PROJECT_EXT=.vcxproj +set CEF_MSBUILD_PATH=%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe ) -if exist "%DevEnvDir%\devenv.com" ( +if exist "%CEF_MSBUILD_PATH%" ( +"%CEF_MSBUILD_PATH%" /v:m /p:Configuration=%1;Platform=Win32 /t:"%PROJECT_NAME%" ..\cef.sln +) else if exist "%DevEnvDir%\devenv.com" ( echo Building %1 target for %PROJECT_NAME% project... "%DevEnvDir%\devenv.com" /build %1 ..\cef.sln /project %PROJECT_NAME%%PROJECT_EXT% ) else if exist "%VCINSTALLDIR%\vcpackages\vcbuild.exe" ( diff --git a/cef1/tools/build_projects.sh b/cef1/tools/build_projects.sh index 73dbad4fb..13eade15d 100755 --- a/cef1/tools/build_projects.sh +++ b/cef1/tools/build_projects.sh @@ -10,7 +10,7 @@ else fi if [ `uname` = "Linux" ]; then pushd ../../ - make BUILDTYPE=$1 -j 16 + make -j16 $PROJECT_NAME BUILDTYPE=$1 popd else xcodebuild -project ../cef.xcodeproj -configuration $1 -target "$PROJECT_NAME"