Merge pull request #2457 from LinusU/osx-small-fixes

OS X build fixes

CMakeLists.txt

@@ -96,6 +96,11 @@ else (WIN32)
 	add_executable(${PROJECT} ${ORCT2_SOURCES})
 endif (WIN32)
 
+if (APPLE)
+	FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
+	TARGET_LINK_LIBRARIES(${PROJECT} ${ICONV_LIBRARIES})
+endif (APPLE)
+
 # install into ${CMAKE_INSTALL_PREFIX}/bin/
 #install (TARGETS ${PROJECT} DESTINATION bin)
 

src/platform/platform.h

@@ -152,6 +152,11 @@ uint8 platform_get_locale_temperature_format();
 
 bool platform_check_steam_overlay_attached();
 
+// BSD and OS X has MAP_ANON instead of MAP_ANONYMOUS
+#ifndef MAP_ANONYMOUS
+	#define MAP_ANONYMOUS MAP_ANON
+#endif
+
 // Windows specific definitions
 #ifdef _WIN32
 	#ifndef WIN32_LEAN_AND_MEAN