diff options
| -rw-r--r-- | .github/workflows/cmake.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | proto-wine/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | proto-wine/ftnoir_protocol_wine.cpp | 2 | ||||
| -rw-r--r-- | sdk-paths-runneradmin@GNU-Linux.cmake | 1 |
5 files changed, 9 insertions, 4 deletions
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index ce47a3db..c24e9c99 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -36,7 +36,7 @@ jobs: - uses: seanmiddleditch/gha-setup-ninja@master - name: Install Linux Dependencies - run: sudo apt update && sudo apt install libprocps-dev libopencv-dev libopencv-dev + run: sudo apt update && sudo apt install libprocps-dev libopencv-dev libopencv-dev wine64-tools if: matrix.os == 'ubuntu-latest' - name: Cache Qt diff --git a/CMakeLists.txt b/CMakeLists.txt index 337d8072..8c6613bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,8 +29,8 @@ set(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES ON) list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/") include(opentrack-policy NO_POLICY_SCOPE) -project(opentrack) cmake_minimum_required(VERSION 3.13 FATAL_ERROR) +project(opentrack) # must be prior to CMakeDetermineCXXCompiler due to rpath if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR NOT CMAKE_INSTALL_PREFIX) 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}) diff --git a/proto-wine/ftnoir_protocol_wine.cpp b/proto-wine/ftnoir_protocol_wine.cpp index 7b82b76f..75526c54 100644 --- a/proto-wine/ftnoir_protocol_wine.cpp +++ b/proto-wine/ftnoir_protocol_wine.cpp @@ -44,7 +44,7 @@ void wine::pose(const double *headpose, const double*) #ifndef OTR_WINE_NO_WRAPPER if (shm->gameid != gameid) { - qDebug() << "proto/wine: looking up gameData"; + //qDebug() << "proto/wine: looking up gameData"; QString gamename; QMutexLocker foo(&game_name_mutex); /* only EZCA for FSX requires dummy process, and FSX doesn't work on Linux */ diff --git a/sdk-paths-runneradmin@GNU-Linux.cmake b/sdk-paths-runneradmin@GNU-Linux.cmake new file mode 100644 index 00000000..89c39be6 --- /dev/null +++ b/sdk-paths-runneradmin@GNU-Linux.cmake @@ -0,0 +1 @@ +set(SDK_WINE /usr) |