Merge branch 'develop' into feature/error-handling
This commit is contained in:
@ -127,7 +127,7 @@ SOURCE_GROUP("Sources\\Impl" FILES ${IMPL_SRC_FILES})
|
||||
SOURCE_GROUP("Headers\\Impl" FILES ${IMPL_INC_FILES})
|
||||
|
||||
#Tell CMake the paths
|
||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_BINARY_DIR}/include)
|
||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include)
|
||||
|
||||
#Core
|
||||
#Build
|
||||
|
@ -0,0 +1,12 @@
|
||||
#ifndef __PolyVox_CompilerCapabilities_H__
|
||||
#define __PolyVox_CompilerCapabilities_H__
|
||||
|
||||
//#undef HAS_CXX11_CONSTEXPR
|
||||
|
||||
//#undef HAS_CXX11_STATIC_ASSERT
|
||||
|
||||
//#undef HAS_CXX11_CSTDINT_H
|
||||
|
||||
//#undef HAS_CXX11_SHARED_PTR
|
||||
|
||||
#endif
|
Reference in New Issue
Block a user