Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-22 16:24:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #792 from pietrygamat/CMAKE_SYSTEM_NAME-windows-arm

Browse Source 
Fix CMAKE_SYSTEM_NAME variable in windows-arm* toolchains to correctly indicate target platform
This commit is contained in:
Bensuperpc 2023-08-09 17:24:19 +02:00 committed by GitHub
commit 85db3452be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/main.yml vendored
View File

@ -860,17 +860,17 @@ jobs:
image: "windows-armv7", image: "windows-armv7",
stockfish: "no", stockfish: "no",
stockfish_arg: "ARCH=armv7-neon COMP=clang", stockfish_arg: "ARCH=armv7-neon COMP=clang",
ninja: "no", ninja: "yes",
ninja_arg: "", ninja_arg: "",
openssl: "no", openssl: "no",
openssl_arg: "mingw no-asm", openssl_arg: "mingw no-asm",
C: "no", C: "no",
C_arg: "", C_arg: "",
C-Plus-Plus: "yes", C-Plus-Plus: "no",
C-Plus-Plus_arg: "", C-Plus-Plus_arg: "",
fmt: "yes", fmt: "yes",
fmt_arg: "", fmt_arg: "",
raylib: "no", raylib: "yes",
raylib_arg: "", raylib_arg: "",
cpython: "no", cpython: "no",
cpython_arg: "", cpython_arg: "",
@ -879,17 +879,17 @@ jobs:
image: "windows-arm64", image: "windows-arm64",
stockfish: "no", stockfish: "no",
stockfish_arg: "ARCH=armv8 COMP=clang", stockfish_arg: "ARCH=armv8 COMP=clang",
ninja: "no", ninja: "yes",
ninja_arg: "", ninja_arg: "",
openssl: "no", openssl: "no",
openssl_arg: "mingw64 no-asm", openssl_arg: "mingw64 no-asm",
C: "no", C: "no",
C_arg: "", C_arg: "",
C-Plus-Plus: "yes", C-Plus-Plus: "no",
C-Plus-Plus_arg: "", C-Plus-Plus_arg: "",
fmt: "yes", fmt: "yes",
fmt_arg: "", fmt_arg: "",
raylib: "no", raylib: "yes",
raylib_arg: "", raylib_arg: "",
cpython: "no", cpython: "no",
cpython_arg: "", cpython_arg: "",

2
Makefile
View File

@ -63,6 +63,8 @@ windows-static-x64-posix.test_ARGS = --exe-suffix ".exe"
windows-shared-x86.test_ARGS = --exe-suffix ".exe" windows-shared-x86.test_ARGS = --exe-suffix ".exe"
windows-shared-x64.test_ARGS = --exe-suffix ".exe" windows-shared-x64.test_ARGS = --exe-suffix ".exe"
windows-shared-x64-posix.test_ARGS = --exe-suffix ".exe" windows-shared-x64-posix.test_ARGS = --exe-suffix ".exe"
windows-armv7.test_ARGS = --exe-suffix ".exe"
windows-arm64.test_ARGS = --exe-suffix ".exe"
bare-armv7emhf-nano_newlib.test_ARGS = --linker-flags="--specs=nosys.specs" bare-armv7emhf-nano_newlib.test_ARGS = --linker-flags="--specs=nosys.specs"
# On CircleCI, do not attempt to delete container # On CircleCI, do not attempt to delete container

2
windows-arm64/Toolchain.cmake
View File

@ -1,4 +1,4 @@
set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_NAME Windows)
set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_VERSION 1)
set(CMAKE_SYSTEM_PROCESSOR aarch64) set(CMAKE_SYSTEM_PROCESSOR aarch64)

2
windows-armv7/Toolchain.cmake
View File

@ -1,4 +1,4 @@
set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_NAME Windows)
set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_VERSION 1)
set(CMAKE_SYSTEM_PROCESSOR arm) set(CMAKE_SYSTEM_PROCESSOR arm)