ci: Windows release build fixes

This commit is contained in:
Luke Street 2021-06-12 00:53:51 -04:00
parent 5356cd688a
commit 1843eef976
3 changed files with 6 additions and 24 deletions

View File

@ -84,12 +84,6 @@ jobs:
- name: Print buildcache stats - name: Print buildcache stats
run: buildcache -s 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: build-macos:
name: Build macOS (AppleClang universal) name: Build macOS (AppleClang universal)
runs-on: macos-10.15 runs-on: macos-10.15
@ -148,12 +142,6 @@ jobs:
- name: Print buildcache stats - name: Print buildcache stats
run: buildcache -s 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: build-windows:
name: Build Windows (${{matrix.name}} x86_64) name: Build Windows (${{matrix.name}} x86_64)
runs-on: windows-2019 runs-on: windows-2019
@ -232,9 +220,3 @@ jobs:
- name: Print buildcache stats - name: Print buildcache stats
run: buildcache -s 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

View File

@ -242,7 +242,7 @@ jobs:
run: buildcache -s run: buildcache -s
- name: Upload debug information - name: Upload debug information
working-directory: ${{github.workspace}}/build/install working-directory: ${{github.workspace}}/out/install
env: env:
SENTRY_AUTH_TOKEN: ${{secrets.SENTRY_AUTH_TOKEN}} SENTRY_AUTH_TOKEN: ${{secrets.SENTRY_AUTH_TOKEN}}
SENTRY_URL: ${{secrets.SENTRY_URL}} SENTRY_URL: ${{secrets.SENTRY_URL}}
@ -255,8 +255,8 @@ jobs:
with: with:
name: metaforce-${{env.METAFORCE_VERSION}}-win32-msvc-x86_64 name: metaforce-${{env.METAFORCE_VERSION}}-win32-msvc-x86_64
path: | path: |
build/install/*.exe out/install/*.exe
build/install/debug.7z out/install/debug.7z
build-windows-clang: build-windows-clang:
name: Build Windows (Clang x86_64) name: Build Windows (Clang x86_64)
@ -332,5 +332,5 @@ jobs:
with: with:
name: metaforce-${{env.METAFORCE_VERSION}}-win32-clang-x86_64 name: metaforce-${{env.METAFORCE_VERSION}}-win32-clang-x86_64
path: | path: |
build/install/*.exe out/install/*.exe
build/install/debug.7z out/install/debug.7z

View File

@ -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_LIBRARIES ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} CACHE STRING "PNG libraries" FORCE)
set(PNG_INCLUDE_DIR ${PNG_INCLUDE_DIR} CACHE PATH "PNG include path" FORCE) set(PNG_INCLUDE_DIR ${PNG_INCLUDE_DIR} CACHE PATH "PNG include path" FORCE)
endif () endif ()
if (NOT PNG_LIBRARIES) if (WIN32 OR NX OR NOT PNG_LIBRARIES)
message(STATUS "Using HECL's built-in libpng") message(STATUS "Using HECL's built-in libpng")
if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm(64)?" OR (APPLE AND "arm64" IN_LIST CMAKE_OSX_ARCHITECTURES)) if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm(64)?" OR (APPLE AND "arm64" IN_LIST CMAKE_OSX_ARCHITECTURES))
list(APPEND INTRINSICS list(APPEND INTRINSICS