diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-08-22 13:31:56 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-08-23 00:05:15 +0200 |
| commit | a643a92efb9dacec0442152c77b9a57bb7590ece (patch) | |
| tree | 9ebdda7eba91e49d2ab935bd12df467a17e73805 /proto-wine | |
| parent | 8a80cba8c336eb39a69aadde8d2c44b8f9c54026 (diff) | |
cmake: go back to c++11
We don't use c++14 features yet, and GNU 5.3.0 has missing make_unique anyway.
Diffstat (limited to 'proto-wine')
| -rw-r--r-- | proto-wine/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/proto-wine/CMakeLists.txt b/proto-wine/CMakeLists.txt index 01034e30..f949d1ad 100644 --- a/proto-wine/CMakeLists.txt +++ b/proto-wine/CMakeLists.txt @@ -3,7 +3,7 @@ if(NOT WIN32) set(SDK_WINE_NO_WRAPPER FALSE CACHE BOOL "disable Wine wrapper -- use Wine only for X-Plane") if(SDK_WINE_PREFIX) opentrack_boilerplate(opentrack-proto-wine) - target_link_libraries(opentrack-proto-wine opentrack-compat opentrack-csv) + opentrack_link(opentrack-proto-wine opentrack-compat opentrack-csv) if(NOT SDK_WINE_NO_WRAPPER) set(my-rt -lrt) if(APPLE) @@ -14,7 +14,7 @@ if(NOT WIN32) add_custom_command( OUTPUT opentrack-wrapper-wine.exe.so DEPENDS ${wine-deps} - COMMAND ${SDK_WINE_PREFIX}/bin/wineg++ -g -DNOMINMAX -O2 -m32 -std=c++14 -o + COMMAND ${SDK_WINE_PREFIX}/bin/wineg++ -g -DNOMINMAX -O2 -m32 -std=c++11 -o opentrack-wrapper-wine.exe -I "${CMAKE_SOURCE_DIR}" -I "${CMAKE_BINARY_DIR}" ${wine-deps} ${my-rt}) @@ -24,4 +24,5 @@ if(NOT WIN32) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/opentrack-wrapper-wine.exe.so" DESTINATION ${opentrack-hier-pfx}) endif() endif() + opentrack_register(opentrack-proto-wine) endif() |