From 5e05fa58c3da92b71dd24c09bca4ba22334942f1 Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Mon, 3 Dec 2012 14:21:45 +0100 Subject: [PATCH] Added Doom 3 GCC compile options. --- neo/CMakeLists.txt | 18 +++++++++--------- neo/cmake-eclipse-mingw-32bit.bat | 6 ------ neo/cmake-eclipse-mingw-debug.bat | 6 ++++++ neo/idlib/sys/sys_includes.h | 6 ++++++ 4 files changed, 21 insertions(+), 15 deletions(-) delete mode 100644 neo/cmake-eclipse-mingw-32bit.bat create mode 100644 neo/cmake-eclipse-mingw-debug.bat diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt index 55409660..83dff706 100644 --- a/neo/CMakeLists.txt +++ b/neo/CMakeLists.txt @@ -28,16 +28,16 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang") add_definitions(-DUSE_XINPUT) endif() - 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 "-O3 -ffast-math -fno-unsafe-math-optimizations -fomit-frame-pointer") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -O3 -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_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -O1 -Wno-unknown-pragmas -fno-strict-aliasing -Wno-unused-variable -Wno-unused-but-set-variable -Wno-switch") + #set(CMAKE_C_FLAGS_DEBUGALL "${CMAKE_C_FLAGS_DEBUGALL} -g -ggdb -D_DEBUG -Wno-unknown-pragmas -fno-strict-aliasing -Wno-unused-variable -Wno-unused-but-set-variable -Wno-switch") + #set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_PROFILE} -g -ggdb -D_DEBUG -O1 -fno-omit-frame-pointer -Wunknown-pragmas -fno-strict-aliasing -Wno-unused-variable -Wno-unused-but-set-variable -Wno-switch") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math -fno-unsafe-math-optimizations -fomit-frame-pointer -Wno-unknown-pragmas -fno-strict-aliasing -Wno-unused-variable -Wno-unused-but-set-variable -Wno-switch") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -O3 -ffast-math -fno-unsafe-math-optimizations -fomit-frame-pointer -Wno-unknown-pragmas -fno-strict-aliasing -Wno-unused-variable -Wno-unused-but-set-variable -Wno-switch") + set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -ffast-math -fno-unsafe-math-optimizations -fomit-frame-pointer -Wno-unknown-pragmas -fno-strict-aliasing -Wno-unused-variable -Wno-unused-but-set-variable -Wno-switch") + set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) - set(CMAKE_CXX_FLAGS_DEBUGALL ${CMAKE_C_FLAGS_DEBUGALL}) - set(CMAKE_CXX_FLAGS_PROFILE ${CMAKE_C_FLAGS_PROFILE}) + #set(CMAKE_CXX_FLAGS_DEBUGALL ${CMAKE_C_FLAGS_DEBUGALL}) + #set(CMAKE_CXX_FLAGS_PROFILE ${CMAKE_C_FLAGS_PROFILE}) set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) set(CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO}) set(CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL}) diff --git a/neo/cmake-eclipse-mingw-32bit.bat b/neo/cmake-eclipse-mingw-32bit.bat deleted file mode 100644 index 710e8cc1..00000000 --- a/neo/cmake-eclipse-mingw-32bit.bat +++ /dev/null @@ -1,6 +0,0 @@ -cd .. -del /s /q build -mkdir build -cd build -cmake -G "Eclipse CDT4 - MinGW Makefiles" ../neo -pause \ No newline at end of file diff --git a/neo/cmake-eclipse-mingw-debug.bat b/neo/cmake-eclipse-mingw-debug.bat new file mode 100644 index 00000000..0e44ca2d --- /dev/null +++ b/neo/cmake-eclipse-mingw-debug.bat @@ -0,0 +1,6 @@ +cd .. +del /s /q build +mkdir build +cd build +cmake -G "Eclipse CDT4 - MinGW Makefiles" -DCMAKE_BUILD_TYPE=Debug ../neo +pause \ No newline at end of file diff --git a/neo/idlib/sys/sys_includes.h b/neo/idlib/sys/sys_includes.h index 7ad2e584..a494b1ae 100644 --- a/neo/idlib/sys/sys_includes.h +++ b/neo/idlib/sys/sys_includes.h @@ -65,6 +65,12 @@ If you have questions concerning this license or the applicable additional terms #ifndef MAPVK_VSC_TO_VK_EX #define MAPVK_VSC_TO_VK_EX 3 #endif + +// RB: no available with MinGW +#ifndef __analysis_assume +#define __analysis_assume( x ) +#endif + // RB end #endif