From 6ceefdceb05cd8c96c6dede55e796995603c1032 Mon Sep 17 00:00:00 2001
From: DarthArgus <darg.us@yandex.com>
Date: Fri, 26 Aug 2016 01:55:02 +0000
Subject: [PATCH] more toying with cflags

---
 CMakeLists.txt | 50 +++++++++++++++++++++-----------------------------
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51859ff9..b52a8cb3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,12 +2,12 @@ cmake_policy(SET CMP0003 OLD) # or cmake_policy(VERSION 2.4)
 
 cmake_minimum_required(VERSION 2.8)
 
-project(swgnge C CXX)
+project(stellabellum C CXX)
 
 if(WIN32)
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/win32")
+	set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/win32")
 elseif(UNIX)
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/linux")
+	set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/linux")
 endif()
 
 set(SWG_ROOT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
@@ -29,44 +29,36 @@ find_package(PCRE REQUIRED)
 find_package(Perl REQUIRED)
 find_package(Threads)
 find_package(ZLIB REQUIRED)
-
-if(UNIX)
-	# Maybe use the nuGet version instead? possibly can do the same for many of the other libs...
-	find_package(CURL REQUIRED)
-	find_package(MULODI REQUIRED)
-endif()
+find_package(CURL REQUIRED)
 
 if(WIN32)
 	find_package(Iconv REQUIRED)
- 	#Dont-Build-PDB RELEASE build use the following (by either commenting---uncommenting the line as needed)
- 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:libc.lib /SAFESEH:NO")
+	
+	#Dont-Build-PDB RELEASE build use the following (by either commenting---uncommenting the line as needed)
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:libc.lib /SAFESEH:NO")
 
 	####################################
- 	#Do-Build-PDB RELEASE build use the following (by either commenting---uncommenting the line as needed)
+	#Do-Build-PDB RELEASE build use the following (by either commenting---uncommenting the line as needed)
 	#set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DWIN32 -Dwin32 -DUDP_LIBRARY -DDEBUG_LEVEL=0 -DPRODUCTION=1 /Oi /Ot /Oy /O2 /GF /Gy /Zi /MT -D_USE_32BIT_TIME_T=1 -D_MBCS -DPLATFORM_BASE_SINGLE_THREAD -D_CRT_SECURE_NO_WARNINGS /MP /wd4244 /wd4996 /wd4018 /wd4351 /Zc:wchar_t- /Ob1 /FC")
- 	#Dont-Build-PDB RELEASE build use the following (by either commenting---uncommenting the line as needed)
+	#Dont-Build-PDB RELEASE build use the following (by either commenting---uncommenting the line as needed)
 	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DWIN32 -Dwin32 -DUDP_LIBRARY -DDEBUG_LEVEL=0 -DPRODUCTION=1 /Oi /Ot /Oy /O2 /GF /Gy /MT -D_USE_32BIT_TIME_T=1 -D_MBCS -DPLATFORM_BASE_SINGLE_THREAD -D_CRT_SECURE_NO_WARNINGS /MP /wd4244 /wd4996 /wd4018 /wd4351 /Zc:wchar_t- /Ob1 /FC")
- 
+
 	####################################
 	#Standard DEBUG build use the following	(by either commenting---uncommenting the line as needed)
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DWIN32 -Dwin32 -D_DEBUG -DUDP_LIBRARY -DDEBUG_LEVEL=2 -DPRODUCTION=0 /MTd -D_USE_32BIT_TIME_T=1 -D_MBCS -DPLATFORM_BASE_SINGLE_THREAD -D_CRT_SECURE_NO_WARNINGS /MP /wd4244 /wd4996 /wd4018 /wd4351 /Zc:wchar_t- /Ob1 /FC")
- 
 elseif(UNIX)
 	find_package(Curses REQUIRED)
-	
+	find_package(MULODI REQUIRED)	
+
 	# linker flags
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-O1,--sort-common,--as-needed,-z,relro")
-	
-	# flto doesn't want to work
-	#if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-	#    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS},-flto")
-	#endif()
-	
+	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-O1,--sort-common,--as-needed,-z,relro")	
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+
 	# don't put anything too crazy in debug...and any common flags go into CMAKE_CXX_FLAGS 
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DDEBUG_LEVEL=2 -DPRODUCTION=0 -O0")
 	
 	# funroll loops and everything else potentially crazy for performance here
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDEBUG_LEVEL=0 -DPRODUCTION=1 -O3 -funroll-loops")
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDEBUG_LEVEL=0 -DPRODUCTION=1 -Ofast -funroll-loops")
 	
 	# TODO: The below flags will enhance security but at the cost of performance, arguably... 
 	# currently with them SWG cluster idles at ~17-18% of 24 cpus, and ata round ~14-17% without
@@ -81,12 +73,12 @@ elseif(UNIX)
 		-Wno-overloaded-virtual -Wno-missing-braces -Wno-format \
 		-Wno-write-strings -Wno-unknown-pragmas \
 		-Wno-uninitialized -Wno-reorder")
-	
-	# flto doesn't want to work
-	#if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-	#    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
+
+	# we could use libc++ with gcc too but let's roll with default there
+	#if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") 
+	#	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 	#endif()
-		
+	
 	add_definitions(-DLINUX -D_REENTRANT -Dlinux -D_USING_STL -D__STL_NO_BAD_ALLOC -D_GNU_SOURCE -D_XOPEN_SOURCE=500)
 endif()