Trying to get it compiling on Mac OS X
This commit is contained in:
		
							parent
							
								
									86d06057ca
								
							
						
					
					
						commit
						637b6ceca2
					
				| 
						 | 
				
			
			@ -11,7 +11,9 @@ include(src/framework/CMakeLists.txt)
 | 
			
		|||
include(src/client/CMakeLists.txt)
 | 
			
		||||
 | 
			
		||||
# functions map for reading backtraces
 | 
			
		||||
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -Wl,-Map=${PROJECT_NAME}.map")
 | 
			
		||||
if(NOT APPLE)
 | 
			
		||||
    set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -Wl,-Map=${PROJECT_NAME}.map")
 | 
			
		||||
endif()
 | 
			
		||||
 | 
			
		||||
option(USE_PCH "Use precompiled header (speed up compile)" OFF)
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -134,7 +134,11 @@ set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/luafunctions.cpp
 | 
			
		|||
# some build options
 | 
			
		||||
option(CRASH_HANDLER "Generate crash reports" ON)
 | 
			
		||||
option(LUAJIT "Use lua jit" OFF)
 | 
			
		||||
option(USE_STATIC_LIBS "Don't use shared libraries (dlls)" ON)
 | 
			
		||||
if(NOT APPLE)
 | 
			
		||||
    option(USE_STATIC_LIBS "Don't use shared libraries (dlls)" ON)
 | 
			
		||||
else()
 | 
			
		||||
    set(USE_STATIC_LIBS OFF)
 | 
			
		||||
endif()
 | 
			
		||||
set(BUILD_COMMIT "devel" CACHE "Git commit string (intended for releases)" STRING)
 | 
			
		||||
set(BUILD_REVISION "0" CACHE "Git revision string (intended for releases)" STRING)
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -244,7 +248,7 @@ if(WIN32)
 | 
			
		|||
    set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -Wl,--large-address-aware") # strip all debug information
 | 
			
		||||
    set(SYSTEM_LIBRARIES "")
 | 
			
		||||
elseif(APPLE)
 | 
			
		||||
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
 | 
			
		||||
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -Wno-deprecated-declarations")
 | 
			
		||||
    set(framework_DEFINITIONS ${framework_DEFINITIONS} -D_REENTRANT) # enable thread safe code
 | 
			
		||||
    set(SYSTEM_LIBRARIES "")
 | 
			
		||||
else()
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -20,7 +20,7 @@
 | 
			
		|||
 * THE SOFTWARE.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#ifdef __linux
 | 
			
		||||
#ifndef WIN32
 | 
			
		||||
 | 
			
		||||
#include "crashhandler.h"
 | 
			
		||||
#include <framework/global.h>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -20,7 +20,7 @@
 | 
			
		|||
 * THE SOFTWARE.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#ifdef __linux
 | 
			
		||||
#ifndef WIN32
 | 
			
		||||
 | 
			
		||||
#include "platform.h"
 | 
			
		||||
#include <fstream>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -20,7 +20,7 @@
 | 
			
		|||
 * THE SOFTWARE.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#ifdef __linux
 | 
			
		||||
#ifndef WIN32
 | 
			
		||||
 | 
			
		||||
#include "x11window.h"
 | 
			
		||||
#include <framework/core/resourcemanager.h>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue