Make OSX makefiles match linux. Proper debug & release configurations

nvMcJohn · May 25, 2014 · 6443dc5 · 6443dc5
1 parent fe4d9f9
commit 6443dc5
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/build/CMakeCommon.txt b/build/CMakeCommon.txt
@@ -22,12 +22,15 @@ if( MSVC )
     set( CMAKE_SHARED_LINKER_FLAGS "/DEBUG" )
     set( CMAKE_MODULE_LINKER_FLAGS "/DEBUG" )
 elseif( APPLE )
-
     set( SDL_LIBRARY_DIR "${CMAKE_BINARY_DIR}/thirdparty/SDL2-2.0.1/" )
+
+    if( NOT CMAKE_BUILD_TYPE )
+      set( CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build, options are: None Debug Release" FORCE )
+    endif()
 
-    set( CMAKE_CXX_FLAGS "-std=c++0x -stdlib=libc++ -g -O0 -DPOSIX=1 -D_OSX=1 -DNDEBUG=1 -DWITH_D3D11=${apitest_WITH_D3D11}" )
-    # set( CMAKE_CXX_FLAGS_DEBUG "-O0" )
-    # set( CMAKE_CXX_FLAGS_RELEASE "-O3" )
+    set( CMAKE_CXX_FLAGS "-std=c++11 -g ${CMAKE_CXX_FLAGS} -DPOSIX=1 -D_OSX=1 -DNDEBUG=1 -DWITH_D3D11=${apitest_WITH_D3D11}" )
+    set( CMAKE_CXX_FLAGS_DEBUG "-O0 -D_DEBUG=1" )
+    set( CMAKE_CXX_FLAGS_RELEASE "-O3" )
 
     set( CMAKE_EXE_LINKER_FLAGS "-g" )
     set( CMAKE_SHARED_LINKER_FLAGS "-g" )