Fix build-winxp.yml

Author: xcomcoopdev

.github/workflows/build-winxp.yml

@@ -60,36 +60,32 @@ jobs:
           path: mxe
           key: ${{ runner.os }}-mxe-v7e39b555dee5e906b24a44940055dc28d4056d23-gcc11-jsoncpp-sdl_net-v7
 
-      - name: Configure + build (WinXP)
+      - name: Prepare env
         run: |
           set -euo pipefail
-
           export PATH="$GITHUB_WORKSPACE/mxe/usr/bin:$PATH"
-
-          # MXE prefix for the i686 static target
           export MXE_PREFIX="$GITHUB_WORKSPACE/mxe/usr/i686-w64-mingw32.static"
-
-          # Make sure CMake/pkg-config find MXE (not host) headers/libs
           export CMAKE_PREFIX_PATH="$MXE_PREFIX"
           export PKG_CONFIG_PATH="$MXE_PREFIX/lib/pkgconfig"
 
-          echo "=== DEBUG: where is jsoncpp header in MXE? ==="
-          ls -la "$MXE_PREFIX/include/json/json.h" || true
-          ls -la "$MXE_PREFIX/include/jsoncpp/json/json.h" || true
-          ls -la "$MXE_PREFIX/include/json/version.h" || true
-          ls -la "$GITHUB_WORKSPACE/deps/include/json/version.h" || true
-
-          echo "=== DEBUG: key libs present in MXE_PREFIX/lib ==="
-          ls -la "$MXE_PREFIX/lib" | grep -Ei "json|sdl|jpeg|png|webp|smpeg|modplug|vorbis|ogg|ws2|iphlp|winmm|dxguid" || true
-
-          # Put MXE include FIRST so <json/json.h> resolves to MXE headers (matching libjsoncpp.a)
+          # Prefer MXE headers first
           export CPPFLAGS="-I$MXE_PREFIX/include -I$MXE_PREFIX/include/SDL -I$GITHUB_WORKSPACE/deps/include/SDL_net -I$GITHUB_WORKSPACE/deps/include"
           export CFLAGS="$CPPFLAGS"
           export CXXFLAGS="$CPPFLAGS"
 
-          # Option A: do not force -l... via LDFLAGS (CMakeLists handles link order)
           unset LDFLAGS || true
 
+          echo "PATH=$PATH" >> $GITHUB_ENV
+          echo "MXE_PREFIX=$MXE_PREFIX" >> $GITHUB_ENV
+          echo "CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH" >> $GITHUB_ENV
+          echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> $GITHUB_ENV
+          echo "CPPFLAGS=$CPPFLAGS" >> $GITHUB_ENV
+          echo "CFLAGS=$CFLAGS" >> $GITHUB_ENV
+          echo "CXXFLAGS=$CXXFLAGS" >> $GITHUB_ENV
+
+      - name: Configure (WinXP)
+        run: |
+          set -euo pipefail
           rm -rf build
           mkdir -p build
           cd build
@@ -101,24 +97,45 @@ jobs:
             -DCMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH" \
             "$GITHUB_WORKSPACE"
 
+          echo "=== DEBUG: link.txt location candidates ==="
+          ls -la src/CMakeFiles/openxcom.dir/link.txt || true
+          ls -la CMakeFiles/openxcom.dir/link.txt || true
+
+      - name: Upload link.txt (after configure)
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: linktxt-config-${{ env.SAFE_REF }}
+          path: |
+            build/src/CMakeFiles/openxcom.dir/link.txt
+            build/CMakeFiles/openxcom.dir/link.txt
+          if-no-files-found: warn
+
+      - name: Build (WinXP)
+        run: |
+          set -euo pipefail
+          cd build
           make -j"$(nproc)" VERBOSE=1
 
-      - name: Upload link.txt
+      - name: Upload link.txt (after build)
+        if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: linktxt-${{ env.SAFE_REF }}
+          name: linktxt-build-${{ env.SAFE_REF }}
           path: |
             build/src/CMakeFiles/openxcom.dir/link.txt
             build/CMakeFiles/openxcom.dir/link.txt
           if-no-files-found: warn
 
       - name: Package zip
+        if: success()
         run: |
           cd build/bin
           rm -f libopenxcom.dll.a || true
           zip -r "../../openxcom-winxp-${{ env.SAFE_REF }}.zip" .
 
       - name: Upload artifact
+        if: success()
         uses: actions/upload-artifact@v4
         with:
           name: openxcom-winxp-${{ env.SAFE_REF }}