X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=CMakeLists.txt;h=96d95b65ae8764c3f986ee19be4e57fb6684773c;hb=efbc6ee855217635d97671a3a2d65bc18908b840;hp=5b0d0ab163cd5ab328a10cb1e93cc2b58fdbb6bb;hpb=46cff1de1e828cb8c04a5dc5377bc07baae57858;p=lugaru.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b0d0ab..96d95b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,11 +5,9 @@ cmake_minimum_required(VERSION 2.6)
 set(SRCDIR "${CMAKE_CURRENT_SOURCE_DIR}/Source")
 set(DEPDIR "${CMAKE_CURRENT_SOURCE_DIR}/Dependencies")
 
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
-      "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel"
-      FORCE)
-endif(NOT CMAKE_BUILD_TYPE)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 --std=c++11")
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -pg --std=c++11")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -O2 -std=c++11")
 
 if(NOT LUGARU_INSTALL_PREFIX)
   if(WIN32)
@@ -32,9 +30,9 @@ endif(MINGW)
 
 if(APPLE)
 	set(CMAKE_OSX_ARCHITECTURES "i386;x86_64;ppc" CACHE STRING "Build architectures for OSX")
-	set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING 
+	set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING
 		"Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value")
-	set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk" CACHE PATH 
+	set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk" CACHE PATH
 		"The product will be built against the headers and libraries located inside the indicated SDK.")
 endif(APPLE)
 
@@ -59,6 +57,7 @@ set(LUGARU_SRCS
 	${SRCDIR}/GameTick.cpp
 	${SRCDIR}/Globals.cpp
 	${SRCDIR}/Lights.cpp
+	${SRCDIR}/Menu.cpp
 	${SRCDIR}/Models.cpp
 	${SRCDIR}/Objects.cpp
 	${SRCDIR}/pack.c
@@ -89,6 +88,7 @@ set(LUGARU_H
 	${SRCDIR}/Account.h
 	${SRCDIR}/Game.h
 	${SRCDIR}/Lights.h
+	${SRCDIR}/Menu.h
 	${SRCDIR}/Models.h
 	${SRCDIR}/Objects.h
 	${SRCDIR}/Person.h
@@ -113,9 +113,7 @@ set(LUGARU_H
 	${SRCDIR}/Settings.h
 	${SRCDIR}/Stereo.h
 	${SRCDIR}/Animation.h
-	${SRCDIR}/Animation.def
 	${SRCDIR}/Sounds.h
-	${SRCDIR}/Sounds.def
 )
 
 if(UNIX)