From d72235af976f0a07f4952aba9c275211fce2af15 Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Sun, 11 Nov 2018 23:57:05 +0100 Subject: [PATCH] change engine version to "dhewm3 SDK 1.5.x"; no -ffast-math it's only shown in the g_version CVar, but if we have this constant in the SDK make it show something sensible.. and this SDK code should be compatible with all dhewm 1.5.x releases (=> dhewm3 version will be bumped to 1.6.x if game API compatibility is broken) Also disabled (GCC/Clang-specific) -ffast-math - even with -fno-unsafe-math-optimizations I don't trust it. --- CMakeLists.txt | 6 +++--- framework/Licensee.h | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 848ff66..f0d18d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,9 +108,9 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang") set(CMAKE_C_FLAGS_DEBUG "-g -D_DEBUG -O1") set(CMAKE_C_FLAGS_DEBUGALL "-g -ggdb -D_DEBUG") set(CMAKE_C_FLAGS_PROFILE "-g -ggdb -D_DEBUG -O1 -fno-omit-frame-pointer") - set(CMAKE_C_FLAGS_RELEASE "-O2 -ffast-math -fno-unsafe-math-optimizations -fomit-frame-pointer") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -O2 -ffast-math -fno-unsafe-math-optimizations -fomit-frame-pointer") - set(CMAKE_C_FLAGS_MINSIZEREL "-Os -ffast-math -fno-unsafe-math-optimizations -fomit-frame-pointer") + set(CMAKE_C_FLAGS_RELEASE "-O2 -fno-unsafe-math-optimizations -fno-math-errno -fno-trapping-math -fomit-frame-pointer") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -ggdb -fno-unsafe-math-optimizations -fno-math-errno -fno-trapping-math -fno-omit-frame-pointer") + set(CMAKE_C_FLAGS_MINSIZEREL "-Os -fno-unsafe-math-optimizations -fno-math-errno -fno-trapping-math -fomit-frame-pointer") set(CMAKE_CXX_FLAGS_DEBUGALL ${CMAKE_C_FLAGS_DEBUGALL}) set(CMAKE_CXX_FLAGS_PROFILE ${CMAKE_C_FLAGS_PROFILE}) diff --git a/framework/Licensee.h b/framework/Licensee.h index 45b19b5..b1d646e 100644 --- a/framework/Licensee.h +++ b/framework/Licensee.h @@ -36,14 +36,13 @@ If you have questions concerning this license or the applicable additional terms #if defined(__AROS__) #define GAME_NAME "ADoom3" // appears on window titles and errors -#define ENGINE_VERSION "dhewm3 1.4.1" // printed in console #define CONFIG_FILE "adoom3.cfg" #else #define GAME_NAME "dhewm 3" // appears on window titles and errors - -#define ENGINE_VERSION "dhewm 3 1.4.1" // printed in console #endif +#define ENGINE_VERSION "dhewm3 SDK 1.5.x" // only used for g_version in game DLLs + // paths #define BASE_GAMEDIR "base"