AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'develop' of https://bitbucket.org/volumesoffun/polyvox into develop

Browse Source
This commit is contained in:
David Williams
2012-12-29 14:07:11 +00:00
parent 607febb673 de26bb4b9c
commit ed614802fe
8 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/PolyVoxCore/CMakeLists.txt
View File

@@ -20,12 +20,12 @@
# 3. This notice may not be removed or altered from any source
# distribution.
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT(PolyVoxCore)
#Set up the C++11 feature header file based on the CheckCXX11Features script
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/PolyVoxCore/Impl/CompilerCapabilities.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/PolyVoxCore/Impl/CompilerCapabilities.h)
if(NOT MSVC)
#Set up the C++11 feature header file based on the CheckCXX11Features script
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/PolyVoxCore/Impl/CompilerCapabilities.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/PolyVoxCore/Impl/CompilerCapabilities.h)
endif()
#Projects source files
SET(CORE_SRC_FILES

8
library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h
View File

@@ -1,3 +1,11 @@
/*
* This file provides the default compiler capabilities for for Visual Studio.
* On other compilers CMake will detect which features are available and create
* a file like this.
*
* To Enable these features in Visual Studio, define the variables in this file.
*/
#ifndef __PolyVox_CompilerCapabilities_H__
#define __PolyVox_CompilerCapabilities_H__

5
library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h.in
View File

@@ -1,3 +1,8 @@
/*
* This file is an input file for the CMake build system. It is processed and
* placed in the build directory by CMake.
*/
#ifndef __PolyVox_CompilerCapabilities_H__
#define __PolyVox_CompilerCapabilities_H__