diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..148363c --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +out + diff --git a/DockerfileWindows32 b/DockerfileWindows32 deleted file mode 100644 index 3038aa2..0000000 --- a/DockerfileWindows32 +++ /dev/null @@ -1,7 +0,0 @@ -FROM friwidev/jcefdocker:windows32-latest - -WORKDIR C:/builder - -#Copy and launch run script -COPY scripts/run_windows.bat . -ENTRYPOINT ["run_windows.bat"] diff --git a/compile_windows.bat b/compile_windows.bat index 39980d6..6933582 100755 --- a/compile_windows.bat +++ b/compile_windows.bat @@ -8,11 +8,8 @@ if ("%2"=="") ( ^ exit 1 ^ ) -if "%1"=="386" (set bit=32) ^ -else (set bit=64) - :: Execute build with windows Dockerfile -docker build -t jcefbuild%bit% --file DockerfileWindows%bit% . +docker build -t jcefbuild --file DockerfileWindows . :: Execute run with windows Dockerfile -docker run -v jcef:c:/jcef -v out:c:/out -e TARGETARCH=%1 -e BUILD_TYPE=%2 jcefbuild%bit% +docker run -v jcef:c:/jcef -v out:c:/out -e TARGETARCH=%1 -e BUILD_TYPE=%2 jcefbuild