diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2023-02-28 23:12:30 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2023-02-28 23:12:30 +0100 |
| commit | 526e0fc9205b4bddcc93ddbe95f274d1c051ca7d (patch) | |
| tree | 11cb9a6dba0413c2f5d14ca7211a0716f11e8436 | |
| parent | 1d21ed45e5d4e9382393ffdf8f6b6373b3a45f88 (diff) | |
ci: almost there
| -rw-r--r-- | proto-wine/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | sdk-paths-runner@GNU-Linux.cmake | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/proto-wine/CMakeLists.txt b/proto-wine/CMakeLists.txt index 0beb50e1..1bb47b33 100644 --- a/proto-wine/CMakeLists.txt +++ b/proto-wine/CMakeLists.txt @@ -17,10 +17,14 @@ if(NOT WIN32) endif() file(GLOB wine-deps "${CMAKE_CURRENT_SOURCE_DIR}/*.cxx") #install(FILES ${wine-deps} DESTINATION "${opentrack-src}/proto-wine") + set(winegxx-multilib "-m32") + if (OPENTRACK_WINE_ARCH NOT STREQUAL "") + set(winegxx-multilib "${OPENTRACK_WINE_ARCH}") + endif() add_custom_command( OUTPUT opentrack-wrapper-wine.exe.so DEPENDS ${wine-deps} - COMMAND wineg++ -mconsole -g -DNOMINMAX -O2 -m32 -std=c++17 -fPIC -o + COMMAND wineg++ -mconsole -g -DNOMINMAX -O2 ${winegxx-multilib} -std=c++17 -fPIC -o opentrack-wrapper-wine.exe -I "${CMAKE_SOURCE_DIR}" -I "${CMAKE_BINARY_DIR}" ${wine-deps} -Wall -Wextra -Wpedantic ${my-rt}) diff --git a/sdk-paths-runner@GNU-Linux.cmake b/sdk-paths-runner@GNU-Linux.cmake index df5c6f35..03c87ce4 100644 --- a/sdk-paths-runner@GNU-Linux.cmake +++ b/sdk-paths-runner@GNU-Linux.cmake @@ -1,2 +1,3 @@ set(SDK_WINE ON CACHE BOOL "" FORCE) +set(OPENTRACK_WINE_ARCH -m64 CACHE STRING "" FORCE) set(ENV{PATH} "/usr/lib/wine:$ENV{PATH}") |