petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

Fix: Building on Haiku

Browse Source
This commit is contained in:
milek7
2021-05-20 22:21:38 +00:00
committed by rubidium42
parent 7c0762da65
commit 36bcd2956a
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -241,6 +241,10 @@ target_link_libraries(openttd
Threads::Threads Threads::Threads
) )
if(HAIKU)
target_link_libraries(openttd "be" "network" "midi")
endif()
if(IPO_FOUND) if(IPO_FOUND)
set_target_properties(openttd PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE True) set_target_properties(openttd PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE True)
set_target_properties(openttd PROPERTIES INTERPROCEDURAL_OPTIMIZATION_MINSIZEREL True) set_target_properties(openttd PROPERTIES INTERPROCEDURAL_OPTIMIZATION_MINSIZEREL True)

2
cmake/CompileFlags.cmake
View File

@@ -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.") 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() endif()
if(NOT WIN32) if(NOT WIN32 AND NOT HAIKU)
# rdynamic is used to get useful stack traces from crash reports. # rdynamic is used to get useful stack traces from crash reports.
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic")
endif() endif()

2
src/music/CMakeLists.txt
View File

@@ -34,7 +34,7 @@ if(NOT OPTION_DEDICATED)
add_files( add_files(
bemidi.cpp bemidi.cpp
bemidi.h bemidi.h
CONDITION OPTION_HAIKU CONDITION HAIKU
) )
add_files( add_files(