From da34d6ba965f7db40c1f3ee8aa2231cede573f6c Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 26 Feb 2023 17:55:16 +0100 Subject: proto/wine: try to detect CI wineg++ --- proto-wine/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'proto-wine/CMakeLists.txt') diff --git a/proto-wine/CMakeLists.txt b/proto-wine/CMakeLists.txt index 0beb50e1..e81b341c 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 "${SDK_WINE}/bin/wine") + if(EXISTS "${SDK_WINE}/lib/wine/wineg++") + set(winegxx "${SDK_WINE}/lib/wine/wineg++") + 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 "${winegxx}" -mconsole -g -DNOMINMAX -O2 -m32 -std=c++17 -fPIC -o opentrack-wrapper-wine.exe -I "${CMAKE_SOURCE_DIR}" -I "${CMAKE_BINARY_DIR}" ${wine-deps} -Wall -Wextra -Wpedantic ${my-rt}) -- cgit v1.2.3 From 2a2447373906dc7263279b21fba30a190b562192 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 28 Feb 2023 22:38:22 +0100 Subject: Revert "proto/wine: try to detect CI wineg++" This reverts commit da34d6ba965f7db40c1f3ee8aa2231cede573f6c. Reported by: ljgdasfhk (Artem Sobolev) Issue: #726 --- proto-wine/CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'proto-wine/CMakeLists.txt') diff --git a/proto-wine/CMakeLists.txt b/proto-wine/CMakeLists.txt index e81b341c..0beb50e1 100644 --- a/proto-wine/CMakeLists.txt +++ b/proto-wine/CMakeLists.txt @@ -17,14 +17,10 @@ if(NOT WIN32) endif() file(GLOB wine-deps "${CMAKE_CURRENT_SOURCE_DIR}/*.cxx") #install(FILES ${wine-deps} DESTINATION "${opentrack-src}/proto-wine") - set(winegxx "${SDK_WINE}/bin/wine") - if(EXISTS "${SDK_WINE}/lib/wine/wineg++") - set(winegxx "${SDK_WINE}/lib/wine/wineg++") - endif() add_custom_command( OUTPUT opentrack-wrapper-wine.exe.so DEPENDS ${wine-deps} - COMMAND "${winegxx}" -mconsole -g -DNOMINMAX -O2 -m32 -std=c++17 -fPIC -o + COMMAND wineg++ -mconsole -g -DNOMINMAX -O2 -m32 -std=c++17 -fPIC -o opentrack-wrapper-wine.exe -I "${CMAKE_SOURCE_DIR}" -I "${CMAKE_BINARY_DIR}" ${wine-deps} -Wall -Wextra -Wpedantic ${my-rt}) -- cgit v1.2.3 From 526e0fc9205b4bddcc93ddbe95f274d1c051ca7d Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 28 Feb 2023 23:12:30 +0100 Subject: ci: almost there --- proto-wine/CMakeLists.txt | 6 +++++- sdk-paths-runner@GNU-Linux.cmake | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'proto-wine/CMakeLists.txt') 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}") -- cgit v1.2.3 From cf1d653a6b90bd90b855c23890f327b778ef4ab8 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 28 Feb 2023 23:15:34 +0100 Subject: ci: maybe this time? --- proto-wine/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'proto-wine/CMakeLists.txt') diff --git a/proto-wine/CMakeLists.txt b/proto-wine/CMakeLists.txt index 1bb47b33..ff4932cc 100644 --- a/proto-wine/CMakeLists.txt +++ b/proto-wine/CMakeLists.txt @@ -18,7 +18,7 @@ if(NOT WIN32) 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 "") + if (NOT OPENTRACK_WINE_ARCH STREQUAL "") set(winegxx-multilib "${OPENTRACK_WINE_ARCH}") endif() add_custom_command( -- cgit v1.2.3