1
0

Build fixes

This commit is contained in:
Scott E. Graves
2017-03-21 23:22:40 -05:00
parent 5a1e09f81d
commit b277b04521
6 changed files with 5 additions and 73 deletions

View File

@@ -1,32 +0,0 @@
@echo off
set ROOT=%~dp0%
pushd %ROOT%
set PATH=%ROOT%depot_tools;%PATH%
call create_common.cmd
set CEF_USE_GN=1
set GN_DEFINES=is_win_fastlink=true fatal_linker_warnings=false
set GN_ARGUMENTS=--ide=vs2015 --sln=cef --filters=//cef/*
pushd chromium_git
call python ..\automate\automate-git.py --download-dir=%ROOT%chromium_git --depot-tools-dir=%ROOT%depot_tools --no-distrib --no-build --branch=3029 || goto :ERROR
popd
pushd chromium_git\chromium\src\cef
call cef_create_projects.bat
popd
pushd chromium_git\chromium\src
call ninja -C out\Debug_GN_x64 cef || goto :ERROR
popd
goto :END
:ERROR
pause
popd
exit 1
:END
popd

View File

@@ -1,32 +0,0 @@
@echo off
set ROOT=%~dp0%
pushd %ROOT%
set PATH=%ROOT%\depot_tools;%PATH%
call create_common.cmd
set CEF_USE_GN=1
set GN_DEFINES=fatal_linker_warnings=false
set GN_ARGUMENTS=--ide=vs2015 --sln=cef --filters=//cef/*
pushd chromium_git
call python ..\automate\automate-git.py --download-dir=%ROOT%chromium_git --depot-tools-dir=%ROOT%depot_tools --no-distrib --no-build --branch=3029 || goto :ERROR
popd
pushd chromium_git\chromium\src\cef
call cef_create_projects.bat
popd
pushd chromium_git\chromium\src
call ninja -C out\Release_GN_x64 cef || goto :ERROR
popd
goto :END
:ERROR
pause
popd
exit 1
:END
popd

View File

@@ -2,14 +2,12 @@
set ROOT=%~dp0%
pushd "%ROOT%"
set PATH=%ROOT%..\..\bin;%PATH%
REM call 3rd_party\CEF\create.cmd Debug
set PATH=%ROOT%\bin;%ROOT%;%PATH%
call 3rd_party\CEF\create.cmd Debug
mkdir build
mkdir build\debug
pushd build\debug
cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=Debug -DSIADRIVE_INSTALL_FOLDER="%ROOT%build\Debug\dist" ..\..
cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=Debug -DSIADRIVE_INSTALL_FOLDER="%ROOT%dist\Debug" ..\..
cmake --build . --config Debug && cmake --build . --target install --config Debug
popd

View File

@@ -2,14 +2,12 @@
set ROOT=%~dp0%
pushd "%ROOT%"
set PATH=%ROOT%..\..\bin;%PATH%
call 3rd_party\CEF\create.cmd Release
set PATH=%ROOT%\bin;%ROOT%;%PATH%
mkdir build
mkdir build\release
pushd build\release
cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=Release -DSIADRIVE_INSTALL_FOLDER="%ROOT%build\Release\dist" ..\..
cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=Release -DSIADRIVE_INSTALL_FOLDER="%ROOT%dist\Release" ..\..
cmake --build . --config Release && cmake --build . --config Release --target install
popd

View File

@@ -1,5 +1,5 @@
@echo off
set ROOT=%~dp0%
pushd "%ROOT%build\debug\dist\"
pushd "%ROOT%dist\Debug"
start siadrive.exe

View File

@@ -1,5 +1,5 @@
@echo off
set ROOT=%~dp0%
pushd "%ROOT%build\release\dist\"
pushd "%ROOT%dist\Release"
start siadrive.exe