From b3b6a40d9ebe0ceeb1ce34f4de8acf57dc07fca0 Mon Sep 17 00:00:00 2001 From: Didier 'OdyX' Raboud Date: Wed, 23 Oct 2013 14:22:20 +0200 Subject: MacOSX: Add initial support in CMake build infra --- src/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 40373a3..c01fe0f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -31,6 +31,9 @@ elseif(PLATFORM_WINDOWS) elseif(PLATFORM_LINUX) # for clock_gettime set(PLATFORM_LIBS "-lrt -lX11") +elseif(PLATFORM_MACOSX) + find_library(LIBINTL_LIBRARY NAMES intl libintl ) + set(PLATFORM_LIBS ${LIBINTL_LIBRARY} ${X11_X11_LIB}) endif() -- cgit v1.2.3-1-g7c22 From ee90f02bc4f45ff0b68099e47245869236bcbbfd Mon Sep 17 00:00:00 2001 From: Didier 'OdyX' Raboud Date: Tue, 29 Oct 2013 14:30:58 +0100 Subject: Add an icon and executable information to the colobot.exe when build in MXE --- src/CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c01fe0f..2fab853 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -50,6 +50,12 @@ if(OPENAL_SOUND) ) endif() +set(RES_FILES "") + +if(PLATFORM_WINDOWS) + set(RES_FILES "../desktop/colobot.rc") +endif() + # Platform-dependent implementation of system.h if(PLATFORM_WINDOWS) set(SYSTEM_CPP_MODULE "system_windows.cpp") @@ -182,6 +188,7 @@ ui/studio.cpp ui/target.cpp ui/window.cpp ${OPENAL_SRC} +${RES_FILES} ) -- cgit v1.2.3-1-g7c22