diff options
| author | milek7 <me@milek7.pl> | 2021-05-20 22:21:38 +0000 |
|---|---|---|
| committer | rubidium42 <rubidium42@users.noreply.github.com> | 2021-05-24 08:56:18 +0200 |
| commit | 36bcd2956a0354d4d051f4c6cef95698b3ab7327 (patch) | |
| tree | 71321c874d98df252381e0770e51a36117d797b9 | |
| parent | 7c0762da65e1a568d686505ea5caad729cc659d5 (diff) | |
| download | openttd-36bcd2956a0354d4d051f4c6cef95698b3ab7327.tar.xz | |
Fix: Building on Haiku
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | cmake/CompileFlags.cmake | 2 | ||||
| -rw-r--r-- | src/music/CMakeLists.txt | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6957c85c2..c8c6f040e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -241,6 +241,10 @@ target_link_libraries(openttd Threads::Threads ) +if(HAIKU) + target_link_libraries(openttd "be" "network" "midi") +endif() + if(IPO_FOUND) set_target_properties(openttd PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE True) set_target_properties(openttd PROPERTIES INTERPROCEDURAL_OPTIMIZATION_MINSIZEREL True) diff --git a/cmake/CompileFlags.cmake b/cmake/CompileFlags.cmake index 2f7528fe3..659a9ca72 100644 --- a/cmake/CompileFlags.cmake +++ b/cmake/CompileFlags.cmake @@ -158,7 +158,7 @@ macro(compile_flags) message(FATAL_ERROR "No warning flags are set for this compiler yet; please consider creating a Pull Request to add support for this compiler.") endif() - if(NOT WIN32) + if(NOT WIN32 AND NOT HAIKU) # rdynamic is used to get useful stack traces from crash reports. set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic") endif() diff --git a/src/music/CMakeLists.txt b/src/music/CMakeLists.txt index b20f8aaf7..8f87a9c93 100644 --- a/src/music/CMakeLists.txt +++ b/src/music/CMakeLists.txt @@ -34,7 +34,7 @@ if(NOT OPTION_DEDICATED) add_files( bemidi.cpp bemidi.h - CONDITION OPTION_HAIKU + CONDITION HAIKU ) add_files( |