From 6b148d1d4c532374e4d7de8d5f1f53d4ff445241 Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Fri, 11 Jul 2014 02:46:10 +1000
Subject: [PATCH] CMake: Improve to support build type. Default to release.

---
 CMakeLists.txt                      |  9 +++++++++
 rpcs3/CMakeLists.txt                | 29 +++++++++++++++--------------
 rpcs3/Emu/Audio/AL/OpenALThread.cpp |  2 --
 rpcs3/Emu/Memory/Memory.cpp         |  2 --
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bfb3c82402..3abe8d579a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,5 +2,14 @@ cmake_minimum_required(VERSION 2.8)
 
 set(ASMJIT_STATIC TRUE)
 
+if (NOT CMAKE_BUILD_TYPE)
+	message(STATUS "No build type selected, default to Release")
+	set(CMAKE_BUILD_TYPE "Release")
+endif()
+
+if(NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
+	message( FATAL_ERROR "RPCS3 can only be compiled on 64-bit platforms." )
+endif()
+
 add_subdirectory( asmjit )
 add_subdirectory( rpcs3 )
diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt
index ae72e0f56b..be1a49418e 100644
--- a/rpcs3/CMakeLists.txt
+++ b/rpcs3/CMakeLists.txt
@@ -7,22 +7,28 @@ project(rpcs3)
 
 if (CMAKE_COMPILER_IS_GNUCXX)
 	if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7.0)
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-	else()
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+		message(FATAL_ERROR "GCC ${CMAKE_CXX_COMPILER_VERSION} is too old.")
 	endif()
-	add_definitions(-DwxGUI)
 	#add_definitions(-D__WXGTK__)
 	#add_definitions(-Wfatal-errors)
 	add_definitions(-w) # TODO: remove me
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
 	add_definitions(-fpermissive) # TODO: remove me
-	add_definitions(-g)	# Debugging!!
-	add_definitions(-msse2)
 elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+	# TODO: stdlib?
+endif()
+
+if (NOT MSVC)
 	add_definitions(-DwxGUI)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fexceptions")
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -D_DEBUG")
+	set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O1 -D_NDEBUG")
+	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O1 -g -D_NDEBUG")
+	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -D_DEBUG")
+	set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
+	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O1 -D_NDEBUG")
+	set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O1 -g -D_NDEBUG")
+	add_definitions(-msse2)
 endif()
 
 If( NOT RPCS3_SRC_DIR)
@@ -48,11 +54,6 @@ find_package(OpenAL REQUIRED)
 
 include("${wxWidgets_USE_FILE}")
 
-if(NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
-	message( FATAL_ERROR "RPCS3 can only be compiled on 64-bit platforms." )
-endif()
-
-
 if(APPLE)
 	set(PLATFORM_ARCH "macosx/x86_64")
 elseif(WIN32)
diff --git a/rpcs3/Emu/Audio/AL/OpenALThread.cpp b/rpcs3/Emu/Audio/AL/OpenALThread.cpp
index 705df90f71..9ed92f04e3 100644
--- a/rpcs3/Emu/Audio/AL/OpenALThread.cpp
+++ b/rpcs3/Emu/Audio/AL/OpenALThread.cpp
@@ -1,7 +1,5 @@
 #include "stdafx.h"
 #include "Utilities/Log.h"
-#include "Emu/Memory/Memory.h"
-#include "Emu/System.h"
 #include "rpcs3/Ini.h"
 
 #include "OpenALThread.h"
diff --git a/rpcs3/Emu/Memory/Memory.cpp b/rpcs3/Emu/Memory/Memory.cpp
index 9f70616622..719e8a7579 100644
--- a/rpcs3/Emu/Memory/Memory.cpp
+++ b/rpcs3/Emu/Memory/Memory.cpp
@@ -3,8 +3,6 @@
 
 #include "Utilities/Log.h"
 #include "Memory.h"
-#include "MemoryBlock.h"
-#include "Emu/System.h"
 
 MemoryBase Memory;