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