git repos / blockattack-game

commit d20eb8bb

Poul Sander · 2022-04-14 20:28
d20eb8bbdb85aed9d21874bf15d9ff2a8af567fb patch · browse files
parent 289b307c8057e89c6f1c86e2c9b38666a51da561

Add support for non-embedded libintl. On Linux platforms and MXE this is usually embedded in libc but for other platforms like OSX this is not the case. This has been tested on an Intel based Mac.

Changed files

M CMakeLists.txt before
diff --git a/CMakeLists.txt b/CMakeLists.txt index 03bd60b..8a6848f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -55,6 +55,10 @@ if (NOT WIN32 AND NOT STANDALONE)
endif()
endif()
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ set(MACOSX TRUE)
+endif()
+
#Compiler options
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -std=c++11")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG} -g -DDEBUG")
@@ -74,6 +78,9 @@ include_directories(${SDL2MIXER_INCLUDE_DIRS})
include_directories(${SDL2IMAGE_INCLUDE_DIRS})
include_directories(${SDL2TTF_INCLUDE_DIRS})
+find_package(Intl REQUIRED)
+include_directories(${Intl_INCLUDE_DIRS})
+
find_package(Boost COMPONENTS program_options REQUIRED)
#Find all sources but one
@@ -106,6 +113,9 @@ target_link_libraries( blockattack ${SDL2_LIBRARIES})
target_link_libraries( blockattack fmt)
target_link_libraries( blockattack platform_folders)
target_link_libraries( blockattack physfs)
+if (MACOSX)
+ target_link_libraries( blockattack intl)
+endif()
target_link_libraries( blockattack ${SDL2MIXER_LIBRARIES} ${SDL2IMAGE_LIBRARIES} ${SDL2TTF_LIBRARIES})
target_link_libraries( blockattack ${Boost_LIBRARIES} )
set_target_properties( blockattack PROPERTIES RUNTIME_OUTPUT_DIRECTORY Game)