diff --git a/compile_windows.bat b/compile_windows.bat index c1182b8..6933582 100755 --- a/compile_windows.bat +++ b/compile_windows.bat @@ -8,8 +8,8 @@ if ("%2"=="") ( ^ exit 1 ^ ) -#Execute build with windows Dockerfile +:: Execute build with windows Dockerfile docker build -t jcefbuild --file DockerfileWindows . -#Execute run with windows Dockerfile +:: Execute run with windows Dockerfile docker run -v jcef:c:/jcef -v out:c:/out -e TARGETARCH=%1 -e BUILD_TYPE=%2 jcefbuild diff --git a/scripts/run_windows.bat b/scripts/run_windows.bat index 326a144..b2853fb 100644 --- a/scripts/run_windows.bat +++ b/scripts/run_windows.bat @@ -15,8 +15,9 @@ cd jcef mkdir jcef_build && cd jcef_build :: Load vcvars -if "%TARGETARCH%"=="386" ("C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars32.bat") ^ -else ("C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat") +dir "C:\Program Files (x86)\Microsoft Visual Studio\2019\" +if "%TARGETARCH%"=="386" ("C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars32.bat") ^ +else ("C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\BuildTools\Build\vcvars64.bat") :: Perform build cmake -G "Ninja" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..