Fixed broken include paths causing compile errors on Linux.

This commit is contained in:
David Williams 2016-01-24 13:15:51 +00:00
parent 8d9fffd4c6
commit 5644f837ca
14 changed files with 25 additions and 26 deletions

View File

@ -43,6 +43,7 @@ SET(CORE_INC_FILES
PolyVox/Density.h PolyVox/Density.h
PolyVox/Exceptions.h PolyVox/Exceptions.h
PolyVox/FilePager.h PolyVox/FilePager.h
PolyVox/Logging.h
PolyVox/LowPassFilter.h PolyVox/LowPassFilter.h
PolyVox/LowPassFilter.inl PolyVox/LowPassFilter.inl
PolyVox/MarchingCubesSurfaceExtractor.h PolyVox/MarchingCubesSurfaceExtractor.h

View File

@ -25,8 +25,8 @@
#ifndef __PolyVox_Array_H__ #ifndef __PolyVox_Array_H__
#define __PolyVox_Array_H__ #define __PolyVox_Array_H__
#include <PolyVox/Impl/PlatformDefinitions.h> #include "Impl/ErrorHandling.h"
#include <PolyVox/Impl/ErrorHandling.h> #include "Impl/PlatformDefinitions.h"
#include <cstdint> #include <cstdint>

View File

@ -26,7 +26,7 @@
#define __PolyVox_Exceptions_H__ #define __PolyVox_Exceptions_H__
#include <stdexcept> // For base exception classes. #include <stdexcept> // For base exception classes.
#include <string.h> // Exception constuctors take strings. #include <string> // Exception constuctors take strings.
// These exceptions form part of the public API because client code may need to catch them. // These exceptions form part of the public API because client code may need to catch them.
// Note that our utility macros such as 'POLYVOX_THROW_IF' do not form part of the public API // Note that our utility macros such as 'POLYVOX_THROW_IF' do not form part of the public API

View File

@ -25,7 +25,7 @@
#ifndef __PolyVox_AStarPathfinderImpl_H__ #ifndef __PolyVox_AStarPathfinderImpl_H__
#define __PolyVox_AStarPathfinderImpl_H__ #define __PolyVox_AStarPathfinderImpl_H__
#include "PolyVox/Vector.h" #include "../Vector.h"
#include <algorithm> #include <algorithm>
#include <limits> //For numeric_limits #include <limits> //For numeric_limits

View File

@ -25,10 +25,10 @@
#ifndef __PolyVox_Assertions_H__ #ifndef __PolyVox_Assertions_H__
#define __PolyVox_Assertions_H__ #define __PolyVox_Assertions_H__
#include "PolyVox/Config.h" #include "../Config.h"
#include "PolyVox/Impl/LoggingImpl.h" // Asserts can log when they fire. #include "LoggingImpl.h" // Asserts can log when they fire.
#include "PolyVox/Impl/PlatformDefinitions.h" #include "PlatformDefinitions.h"
// The code below implements a custom assert function called POLYVOX_ASSERT which has a number of advantages compared // The code below implements a custom assert function called POLYVOX_ASSERT which has a number of advantages compared
// to the standard C/C++ assert(). It is inspired by http://cnicholson.net/2009/02/stupid-c-tricks-adventures-in-assert/ // to the standard C/C++ assert(). It is inspired by http://cnicholson.net/2009/02/stupid-c-tricks-adventures-in-assert/

View File

@ -26,8 +26,8 @@
#ifndef __PolyVox_ErrorHandling_H__ #ifndef __PolyVox_ErrorHandling_H__
#define __PolyVox_ErrorHandling_H__ #define __PolyVox_ErrorHandling_H__
#include "PolyVox/Impl/Assertions.h" #include "Assertions.h"
#include "PolyVox/Impl/ExceptionsImpl.h" #include "ExceptionsImpl.h"
#include "PolyVox/Impl/LoggingImpl.h" #include "LoggingImpl.h"
#endif //__PolyVox_ErrorHandling_H__ #endif //__PolyVox_ErrorHandling_H__

View File

@ -25,10 +25,10 @@
#ifndef __PolyVox_ExceptionsImpl_H__ #ifndef __PolyVox_ExceptionsImpl_H__
#define __PolyVox_ExceptionsImpl_H__ #define __PolyVox_ExceptionsImpl_H__
#include "PolyVox/Config.h" #include "../Config.h"
#include "PolyVox/Exceptions.h" #include "../Exceptions.h"
#include "PolyVox/Impl/LoggingImpl.h" // Exceptions can log when they are thrown. #include "LoggingImpl.h" // Exceptions can log when they are thrown.
#include <cstdlib> // For std::exit #include <cstdlib> // For std::exit
#include <iostream> // For std::cerr #include <iostream> // For std::cerr

View File

@ -25,7 +25,7 @@
#ifndef __PolyVox_IteratorController_H__ #ifndef __PolyVox_IteratorController_H__
#define __PolyVox_IteratorController_H__ #define __PolyVox_IteratorController_H__
#include "Region.h" #include "../Region.h"
namespace PolyVox namespace PolyVox
{ {
@ -43,6 +43,6 @@ namespace PolyVox
}; };
} }
#include "Impl/IteratorController.inl" #include "IteratorController.inl"
#endif //__PolyVox_IteratorController_H__ #endif //__PolyVox_IteratorController_H__

View File

@ -25,12 +25,11 @@
#ifndef __PolyVox_LoggingImpl_H__ #ifndef __PolyVox_LoggingImpl_H__
#define __PolyVox_LoggingImpl_H__ #define __PolyVox_LoggingImpl_H__
#include "PolyVox/Config.h" #include "../Config.h"
#include "PolyVox/Logging.h" #include "../Logging.h"
#include <sstream> #include <sstream>
namespace PolyVox namespace PolyVox
{ {
namespace Impl namespace Impl

View File

@ -25,7 +25,7 @@
#ifndef __PolyVox_MarchingCubeTables_H__ #ifndef __PolyVox_MarchingCubeTables_H__
#define __PolyVox_MarchingCubeTables_H__ #define __PolyVox_MarchingCubeTables_H__
#include "PolyVox/Impl/PlatformDefinitions.h" #include "PlatformDefinitions.h"
#include <cstdint> #include <cstdint>

View File

@ -25,9 +25,9 @@
#ifndef __PolyVox_RandomUnitVectors_H__ #ifndef __PolyVox_RandomUnitVectors_H__
#define __PolyVox_RandomUnitVectors_H__ #define __PolyVox_RandomUnitVectors_H__
#include "PolyVox/Impl/PlatformDefinitions.h" #include "PlatformDefinitions.h"
#include "PolyVox/Vector.h" #include "../Vector.h"
namespace PolyVox namespace PolyVox
{ {

View File

@ -25,9 +25,9 @@
#ifndef __PolyVox_RandomVectors_H__ #ifndef __PolyVox_RandomVectors_H__
#define __PolyVox_RandomVectors_H__ #define __PolyVox_RandomVectors_H__
#include "PolyVox/Impl/PlatformDefinitions.h" #include "PlatformDefinitions.h"
#include "PolyVox/Vector.h" #include "../Vector.h"
namespace PolyVox namespace PolyVox
{ {

View File

@ -25,9 +25,8 @@
#ifndef __PolyVox_Timer_H__ #ifndef __PolyVox_Timer_H__
#define __PolyVox_Timer_H__ #define __PolyVox_Timer_H__
#include <cstdint>
#include <chrono> #include <chrono>
#include <cstdint>
namespace PolyVox namespace PolyVox
{ {

View File

@ -25,7 +25,7 @@
#ifndef __PolyVox_Utility_H__ #ifndef __PolyVox_Utility_H__
#define __PolyVox_Utility_H__ #define __PolyVox_Utility_H__
#include "PolyVox/Impl/PlatformDefinitions.h" #include "PlatformDefinitions.h"
#include <cstdint> #include <cstdint>