Browse Source

Added ftrapv switch

Thomas Buck 10 years ago
parent
commit
c8dec28362
3 changed files with 3 additions and 4 deletions
  1. 2
    2
      CMakeLists.txt
  2. 1
    0
      README.md
  3. 0
    2
      src/FontTRLE.cpp

+ 2
- 2
CMakeLists.txt View File

39
     set (WARNINGS "${WARNINGS} -Wno-disabled-macro-expansion")
39
     set (WARNINGS "${WARNINGS} -Wno-disabled-macro-expansion")
40
     set (WARNINGS "${WARNINGS} -Wno-shorten-64-to-32 -Wno-sign-conversion")
40
     set (WARNINGS "${WARNINGS} -Wno-shorten-64-to-32 -Wno-sign-conversion")
41
     set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -std=c++11")
41
     set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -std=c++11")
42
-    set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -g -O0")
42
+    set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -g -O0 -ftrapv")
43
     set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -O2 -fomit-frame-pointer")
43
     set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -O2 -fomit-frame-pointer")
44
     set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -ffast-math -funroll-loops")
44
     set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -ffast-math -funroll-loops")
45
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
45
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
46
     set (WARNINGS "${WARNINGS} -Wall -Wextra -Wpedantic")
46
     set (WARNINGS "${WARNINGS} -Wall -Wextra -Wpedantic")
47
     set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -std=c++11")
47
     set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -std=c++11")
48
-    set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -g -O0")
48
+    set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -g -O0 -ftrapv")
49
     set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -O2 -fomit-frame-pointer")
49
     set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -O2 -fomit-frame-pointer")
50
     set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -ffast-math -funroll-loops")
50
     set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -ffast-math -funroll-loops")
51
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
51
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")

+ 1
- 0
README.md View File

35
 * zlib
35
 * zlib
36
 * cmake as build system
36
 * cmake as build system
37
 * libpng (optional)
37
 * libpng (optional)
38
+* C++11 compiler
38
 
39
 
39
 On Mac OS X 10.9 with [XCode](https://developer.apple.com/xcode/) and [MacPorts](http://www.macports.org) installed, the following should be enough to get all dependencies that are available as port:
40
 On Mac OS X 10.9 with [XCode](https://developer.apple.com/xcode/) and [MacPorts](http://www.macports.org) installed, the following should be enough to get all dependencies that are available as port:
40
 
41
 

+ 0
- 2
src/FontTRLE.cpp View File

22
 }
22
 }
23
 
23
 
24
 int FontTRLE::initialize() {
24
 int FontTRLE::initialize() {
25
-    //! \todo Font coloring not working when .pc has color?!?!
26
-
27
     assert(mFontInit == false);
25
     assert(mFontInit == false);
28
     assert(mFontName != NULL);
26
     assert(mFontName != NULL);
29
     assert(mFontName[0] != '\0');
27
     assert(mFontName[0] != '\0');

Loading…
Cancel
Save