diff --git a/DockerfileWindows b/DockerfileWindows index 440123b..8a5df4b 100644 --- a/DockerfileWindows +++ b/DockerfileWindows @@ -4,4 +4,5 @@ WORKDIR C:/builder #Copy and launch run script COPY scripts/run_windows.bat . +COPY scripts/build_win.bat ENTRYPOINT ["run_windows.bat"] diff --git a/scripts/build_win.bat b/scripts/build_win.bat index 698a381..ef2610a 100644 --- a/scripts/build_win.bat +++ b/scripts/build_win.bat @@ -1,3 +1,5 @@ +cd C:\jcef\jcef_build + :: Perform build cmake -G "Ninja" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% .. ninja diff --git a/scripts/run_windows.bat b/scripts/run_windows.bat index 721b7b8..4f88779 100644 --- a/scripts/run_windows.bat +++ b/scripts/run_windows.bat @@ -15,8 +15,8 @@ cd jcef mkdir jcef_build && cd jcef_build :: Load vcvars -if "%TARGETARCH%"=="386" ("C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars32.bat" < build_win.bat) ^ -else ("C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat" < build_win.bat) +if "%TARGETARCH%"=="386" ("C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars32.bat" < C:\builder\build_win.bat) ^ +else ("C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat" < C:\builder\build_win.bat) GOTO :EOF