From 8ce5101b3c6f18fe3a2d23c6e47e09951c45f3bd Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Wed, 2 May 2018 18:00:48 +0000 Subject: [PATCH] fixups for newer clang and cmake --- CMakeLists.txt | 2 +- engine/client/application/Miff/CMakeLists.txt | 4 ++++ engine/client/application/Miff/src/CMakeLists.txt | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 70b77b19..bca84556 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,7 +90,7 @@ elseif (UNIX) if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast \ -fno-signed-zeros -freciprocal-math -ffp-contract=fast \ - -fno-threadsafe-statics -fslp-vectorize-aggressive -fslp-vectorize \ + -fno-threadsafe-statics -fslp-vectorize \ -fno-stack-protector -fstrict-enums -fstrict-vtable-pointers \ -fno-coverage-mapping -fno-spell-checking -fshort-enums -finline-functions \ -finline-hint-functions -fno-unroll-loops") diff --git a/engine/client/application/Miff/CMakeLists.txt b/engine/client/application/Miff/CMakeLists.txt index b13ae681..3b85646d 100644 --- a/engine/client/application/Miff/CMakeLists.txt +++ b/engine/client/application/Miff/CMakeLists.txt @@ -3,4 +3,8 @@ cmake_minimum_required(VERSION 2.8) project(Miff) +# todo: if you're running a windows build, comment this out +# windows sucks, I don't care +set(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,norelro,-O3,--sort-common,--as-needed,--no-relax,-z,combreloc,-z,global,--no-omagic") + add_subdirectory(src) diff --git a/engine/client/application/Miff/src/CMakeLists.txt b/engine/client/application/Miff/src/CMakeLists.txt index 116f41af..7b8a43c8 100644 --- a/engine/client/application/Miff/src/CMakeLists.txt +++ b/engine/client/application/Miff/src/CMakeLists.txt @@ -1,4 +1,3 @@ - if(WIN32) set(PLATFORM_SOURCES win32/InputFileHandler.cpp