Skip to content

Commit 3923894

Browse files
- 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: http://chromiumembedded.googlecode.com/svn/trunk/cef1@1165 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
1 parent 21b7566 commit 3923894

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

tools/build_projects.bat

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,12 @@ set PROJECT_EXT=.vcproj
2121
) else (
2222
call "%VS100COMNTOOLS%vsvars32.bat"
2323
set PROJECT_EXT=.vcxproj
24+
set CEF_MSBUILD_PATH=%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe
2425
)
2526

26-
if exist "%DevEnvDir%\devenv.com" (
27+
if exist "%CEF_MSBUILD_PATH%" (
28+
"%CEF_MSBUILD_PATH%" /v:m /p:Configuration=%1;Platform=Win32 /t:"%PROJECT_NAME%" ..\cef.sln
29+
) else if exist "%DevEnvDir%\devenv.com" (
2730
echo Building %1 target for %PROJECT_NAME% project...
2831
"%DevEnvDir%\devenv.com" /build %1 ..\cef.sln /project %PROJECT_NAME%%PROJECT_EXT%
2932
) else if exist "%VCINSTALLDIR%\vcpackages\vcbuild.exe" (

tools/build_projects.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ else
1010
fi
1111
if [ `uname` = "Linux" ]; then
1212
pushd ../../
13-
make BUILDTYPE=$1 -j 16
13+
make -j16 $PROJECT_NAME BUILDTYPE=$1
1414
popd
1515
else
1616
xcodebuild -project ../cef.xcodeproj -configuration $1 -target "$PROJECT_NAME"

0 commit comments

Comments
 (0)