From 1843eef976307b626cc93610f263b8e46b124a3e Mon Sep 17 00:00:00 2001
From: Luke Street <luke.street@encounterpc.com>
Date: Sat, 12 Jun 2021 00:53:51 -0400
Subject: [PATCH] ci: Windows release build fixes

---
 .github/workflows/build.yml   | 18 ------------------
 .github/workflows/release.yml | 10 +++++-----
 extern/libpng/CMakeLists.txt  |  2 +-
 3 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 377a9514e..0afdca83c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -84,12 +84,6 @@ jobs:
       - name: Print buildcache stats
         run: buildcache -s
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: metaforce-${{env.METAFORCE_VERSION}}-linux-${{matrix.preset}}-x86_64
-          path: build/install
-
   build-macos:
     name: Build macOS (AppleClang universal)
     runs-on: macos-10.15
@@ -148,12 +142,6 @@ jobs:
       - name: Print buildcache stats
         run: buildcache -s
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: metaforce-${{env.METAFORCE_VERSION}}-macos-appleclang-universal
-          path: build/install
-
   build-windows:
     name: Build Windows (${{matrix.name}} x86_64)
     runs-on: windows-2019
@@ -232,9 +220,3 @@ jobs:
 
       - name: Print buildcache stats
         run: buildcache -s
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: metaforce-${{env.METAFORCE_VERSION}}-win32-${{matrix.preset}}-x86_64
-          path: ${{env.BUILD_DIR}}/install
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a233b10d7..f8e84c562 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -242,7 +242,7 @@ jobs:
         run: buildcache -s
 
       - name: Upload debug information
-        working-directory: ${{github.workspace}}/build/install
+        working-directory: ${{github.workspace}}/out/install
         env:
           SENTRY_AUTH_TOKEN: ${{secrets.SENTRY_AUTH_TOKEN}}
           SENTRY_URL: ${{secrets.SENTRY_URL}}
@@ -255,8 +255,8 @@ jobs:
         with:
           name: metaforce-${{env.METAFORCE_VERSION}}-win32-msvc-x86_64
           path: |
-            build/install/*.exe
-            build/install/debug.7z
+            out/install/*.exe
+            out/install/debug.7z
 
   build-windows-clang:
     name: Build Windows (Clang x86_64)
@@ -332,5 +332,5 @@ jobs:
         with:
           name: metaforce-${{env.METAFORCE_VERSION}}-win32-clang-x86_64
           path: |
-            build/install/*.exe
-            build/install/debug.7z
+            out/install/*.exe
+            out/install/debug.7z
diff --git a/extern/libpng/CMakeLists.txt b/extern/libpng/CMakeLists.txt
index 90bb8a551..82ae188e5 100644
--- a/extern/libpng/CMakeLists.txt
+++ b/extern/libpng/CMakeLists.txt
@@ -12,7 +12,7 @@ elseif (NOT WIN32 AND NOT NX) # remove WIN32 when specter/freetype is gone
   set(PNG_LIBRARIES ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} CACHE STRING "PNG libraries" FORCE)
   set(PNG_INCLUDE_DIR ${PNG_INCLUDE_DIR} CACHE PATH "PNG include path" FORCE)
 endif ()
-if (NOT PNG_LIBRARIES)
+if (WIN32 OR NX OR NOT PNG_LIBRARIES)
   message(STATUS "Using HECL's built-in libpng")
   if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm(64)?" OR (APPLE AND "arm64" IN_LIST CMAKE_OSX_ARCHITECTURES))
     list(APPEND INTRINSICS