git sometimes merges things i don't want it to

swg-source/src

Fork 0

mirror of https://github.com/SWG-Source/src.git synced 2026-08-01 01:16:03 -04:00

Browse Source

This commit is contained in:

DarthArgus

2016-12-21 08:33:54 +00:00

parent c241284168

commit d99657b518

1 changed files with 1 additions and 0 deletions

									
										CMakeLists.txt
									
		+1
		
												View File
												
				@@ -89,6 +89,7 @@ elseif(UNIX)

							-finline-hint-functions -fno-unroll-loops")

						set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb")

						set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -flto -fwhole-program-vtables")

					elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")

						# O3 and Ofast include one or more flags that cause java to crash when using gcc6

						set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-signed-zeros -freciprocal-math -fno-unroll-loops -fno-tree-loop-optimize")