fix/WIP: Windows build failing due to mutex include

boku-ilen · Aug 20, 2024 · 1f7ff75 · 1f7ff75
1 parent 50b2df9
commit 1f7ff75
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -42,16 +42,6 @@ jobs:
         if: steps.cache-bindings.outputs.cache-hit != 'true'
         run: git submodule update --init --recursive
 
-      - name: Install Python and SCons
-        run: |
-          sudo apt-get update && sudo apt-get install python3 python3-pip g++-mingw-w64-x86-64
-          sudo pip3 install scons
-      
-      - name: Generate Godot-CPP bindings
-        if: steps.cache-bindings.outputs.cache-hit != 'true'
-        run: scons platform=windows generate_bindings=yes
-        working-directory: godot-cpp
-
       - name: Create the build container
         run: docker build -f DockerfileMinGW -t gdal-mingw .
 

diff --git a/DockerfileMinGW b/DockerfileMinGW
@@ -11,6 +11,6 @@ RUN dnf install -y python-distro
 COPY ./ /geodot
 
 WORKDIR /geodot
-ENTRYPOINT scons platform=windows osgeo_path=/usr/x86_64-w64-mingw32/sys-root/mingw
+ENTRYPOINT cd godot-cpp && scons platform=windows generate_bindings=yes && cd .. && scons platform=windows osgeo_path=/usr/x86_64-w64-mingw32/sys-root/mingw
 
 # Then: docker cp a96d86493418:/geodot Downloads/geodot