mirror of
https://github.com/starr-dusT/tzdb_to_nx
synced 2024-03-05 21:18:52 -08:00
commit
f6680093bc
9
.github/workflows/cmake.yml
vendored
9
.github/workflows/cmake.yml
vendored
@ -15,7 +15,10 @@ jobs:
|
|||||||
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
|
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
|
||||||
# You can convert this to a matrix build if you need cross-platform coverage.
|
# You can convert this to a matrix build if you need cross-platform coverage.
|
||||||
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
|
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
|
||||||
runs-on: ubuntu-latest
|
strategy:
|
||||||
|
matrix:
|
||||||
|
platform: [ubuntu-latest,macos-latest]
|
||||||
|
runs-on: ${{ matrix.platform }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
@ -36,7 +39,7 @@ jobs:
|
|||||||
- name: Package
|
- name: Package
|
||||||
run: |
|
run: |
|
||||||
mkdir -p ${{github.workspace}}/artifacts
|
mkdir -p ${{github.workspace}}/artifacts
|
||||||
cp -rv ${{ env.nx_tzdb_dir }} ${{github.workspace}}/artifacts/
|
cp -Rv ${{ env.nx_tzdb_dir }} ${{github.workspace}}/artifacts/
|
||||||
|
|
||||||
- name: Version
|
- name: Version
|
||||||
run: |
|
run: |
|
||||||
@ -45,5 +48,5 @@ jobs:
|
|||||||
- name: Upload
|
- name: Upload
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: ${{ env.nx_version }}
|
name: ${{ env.nx_version }}_${{ matrix.platform }}
|
||||||
path: artifacts/nx
|
path: artifacts/nx
|
||||||
|
10
externals/tz/CMakeLists.txt
vendored
10
externals/tz/CMakeLists.txt
vendored
@ -14,14 +14,22 @@ if (NOT EXISTS "${TZ_DIR}" OR NOT EXISTS "${TZIF_LIST_FILE}")
|
|||||||
# separate directory before building.
|
# separate directory before building.
|
||||||
file(COPY ${TZ_SOURCE_DIR}/ DESTINATION ${TZ_TMP_SOURCE_DIR})
|
file(COPY ${TZ_SOURCE_DIR}/ DESTINATION ${TZ_TMP_SOURCE_DIR})
|
||||||
|
|
||||||
|
if (APPLE)
|
||||||
|
set(TZ_MAKEFLAGS "LDLIBS=-lintl")
|
||||||
|
else()
|
||||||
|
set(TZ_MAKEFLAGS)
|
||||||
|
endif()
|
||||||
|
|
||||||
execute_process(
|
execute_process(
|
||||||
COMMAND
|
COMMAND
|
||||||
${GNU_MAKE} DESTDIR=${TZ_DIR} install
|
${GNU_MAKE} DESTDIR=${TZ_DIR} ${TZ_MAKEFLAGS} install
|
||||||
WORKING_DIRECTORY
|
WORKING_DIRECTORY
|
||||||
${TZ_TMP_SOURCE_DIR}
|
${TZ_TMP_SOURCE_DIR}
|
||||||
COMMAND_ERROR_IS_FATAL ANY
|
COMMAND_ERROR_IS_FATAL ANY
|
||||||
)
|
)
|
||||||
|
|
||||||
|
unset(TZ_MAKEFLAGS)
|
||||||
|
|
||||||
# Step taken by Arch Linux packaging, but Nintendo apparently skips it
|
# Step taken by Arch Linux packaging, but Nintendo apparently skips it
|
||||||
# execute_process(
|
# execute_process(
|
||||||
# COMMAND
|
# COMMAND
|
||||||
|
Loading…
Reference in New Issue
Block a user