TheCloud/libSDL2pp
1
0
Fork 0
mirror of https://github.com/libSDL2pp/libSDL2pp.git synced 2025-08-03 19:05:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge c5455cc97b82090d2c373a30a890af9044d1d8a4 into a53df08ff8405c9a34b4397d136f80c2c0e45df6

Browse Source
This commit is contained in:
Vraiment 2017-07-12 06:20:29 +00:00 committed by GitHub
commit 37dd10bf7d
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -17,6 +17,9 @@ sdl2pp.pc
*.sln *.sln
Debug/ Debug/
Win32/ Win32/
CMakeScripts/
*.build
*.xcodeproj
# Binaries # Binaries
*.o *.o

4
CMakeLists.txt
View File

@ -93,6 +93,10 @@ ELSE(MSVC)
#APPEND_CXX_FLAG_IF_SUPPORTED(-Wno-c++98-compat SDL2PP_WARNINGS) #APPEND_CXX_FLAG_IF_SUPPORTED(-Wno-c++98-compat SDL2PP_WARNINGS)
#APPEND_CXX_FLAG_IF_SUPPORTED(-Wno-padded SDL2PP_WARNINGS) #APPEND_CXX_FLAG_IF_SUPPORTED(-Wno-padded SDL2PP_WARNINGS)
ENDIF(MSVC) ENDIF(MSVC)
IF (CMAKE_GENERATOR STREQUAL "Xcode")
# To disable colored output on the XCode test console
ADD_DEFINITIONS(-DSDL2PP_XCODE_GENERATED)
ENDIF (CMAKE_GENERATOR STREQUAL "Xcode")
LIST(REMOVE_DUPLICATES SDL2_ALL_INCLUDE_DIRS) LIST(REMOVE_DUPLICATES SDL2_ALL_INCLUDE_DIRS)

2
tests/test_color_constexpr.cc
View File

@ -24,6 +24,4 @@ int main(int, char*[]) {
constexpr int a = c1.GetAlpha(); constexpr int a = c1.GetAlpha();
static_assert(r == 0 && g == 0 && b == 0 && a == 0, ""); static_assert(r == 0 && g == 0 && b == 0 && a == 0, "");
return 0;
} }

2
tests/test_pointrect_constexpr.cc
View File

@ -77,6 +77,4 @@ int main(int, char*[]) {
static_assert(b3 && b4 && b5 && b6, ""); static_assert(b3 && b4 && b5 && b6, "");
} }
return 0;
} }

2
tests/testing.h
View File

@ -36,7 +36,7 @@
#include <sstream> #include <sstream>
#include <functional> #include <functional>
#ifdef _WIN32 #if (defined _WIN32) || (defined SDL2PP_XCODE_GENERATED)
# define TESTING_NO_COLOR # define TESTING_NO_COLOR
#endif #endif