1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00

Some fixes for OSX compilation. Closes #450

This commit is contained in:
2014-10-12 12:59:26 -07:00
parent 4f5a941d41
commit 30410dbdd8
3 changed files with 7 additions and 8 deletions

View File

@ -388,9 +388,7 @@ _PL_FORMAT_IMPL_INT_TYPE(signed char, unsigned char)
_PL_FORMAT_IMPL_INT_TYPE(short, unsigned short)
_PL_FORMAT_IMPL_INT_TYPE(int, unsigned)
_PL_FORMAT_IMPL_INT_TYPE(long, unsigned long)
#if (SIZEOF_LONG == 4)
_PL_FORMAT_IMPL_INT_TYPE(int64_t, uint64_t)
#endif
_PL_FORMAT_IMPL_INT_TYPE(long long, unsigned long long)
PL_FORMAT_IMPL(float)
{

View File

@ -188,10 +188,8 @@ namespace plFormat_Private
PL_FORMAT_TYPE(unsigned)
PL_FORMAT_TYPE(long)
PL_FORMAT_TYPE(unsigned long)
#if (SIZEOF_LONG == 4)
PL_FORMAT_TYPE(int64_t)
PL_FORMAT_TYPE(uint64_t)
#endif
PL_FORMAT_TYPE(long long)
PL_FORMAT_TYPE(unsigned long long)
PL_FORMAT_TYPE(float)
PL_FORMAT_TYPE(double)

View File

@ -1,11 +1,14 @@
# Detect Clang compiler
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
if("${CMAKE_CXX_COMPILER_ID}" MATCHES ".*Clang")
set(CMAKE_COMPILER_IS_CLANGXX 1)
endif()
# Require C++11
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
endif()
endif()