diff options
| author | Denis Steckelmacher <steckdenis@yahoo.fr> | 2011-08-17 21:34:00 +0200 |
|---|---|---|
| committer | Denis Steckelmacher <steckdenis@yahoo.fr> | 2011-08-17 21:34:00 +0200 |
| commit | 6ddd30c4540984a703d161c398b7ff6fa6f39165 (patch) | |
| tree | ac1efdf209169f64ea35cf56a67cd4735debb23d | |
| parent | 7c2e288d61cf8d3f25a4063685a4c7f43d89e0d8 (diff) | |
Fix compilation with GCC 4.6
| -rw-r--r-- | src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/api/api_platform.cpp | 2 | ||||
| -rw-r--r-- | src/core/cpu/device.cpp | 2 | ||||
| -rw-r--r-- | src/core/cpu/kernel.h | 2 | ||||
| -rw-r--r-- | src/core/events.h | 2 | ||||
| -rw-r--r-- | src/core/program.cpp | 4 |
6 files changed, 7 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c1693ab..232e964 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,8 +3,7 @@ include_directories (${Coal_SOURCE_DIR}/include ${LLVM_INCLUDE_DIR} ${GALLIUM_INCLUDE_DIRS} ${CLANG_INCLUDE_DIRS} - ${CMAKE_CURRENT_BINARY_DIR}/core/ - ${CMAKE_CURRENT_BINARY_DIR}/runtime/ + ${CMAKE_CURRENT_BINARY_DIR} ) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") diff --git a/src/api/api_platform.cpp b/src/api/api_platform.cpp index 4efac6f..79a6509 100644 --- a/src/api/api_platform.cpp +++ b/src/api/api_platform.cpp @@ -1,6 +1,6 @@ #include "CL/cl.h" #include <cstring> -#include <config.h> +#include <core/config.h> static const char platform_profile[] = "FULL_PROFILE"; static const char platform_version[] = "OpenCL 1.1 MESA " COAL_VERSION; diff --git a/src/core/cpu/device.cpp b/src/core/cpu/device.cpp index 4c30f03..0b7a19e 100644 --- a/src/core/cpu/device.cpp +++ b/src/core/cpu/device.cpp @@ -5,7 +5,7 @@ #include "worker.h" #include "builtins.h" -#include "config.h" +#include <core/config.h> #include "../propertylist.h" #include "../commandqueue.h" #include "../events.h" diff --git a/src/core/cpu/kernel.h b/src/core/cpu/kernel.h index f28ca87..49798b8 100644 --- a/src/core/cpu/kernel.h +++ b/src/core/cpu/kernel.h @@ -2,7 +2,7 @@ #define __CPU_KERNEL_H__ #include "../deviceinterface.h" -#include "config.h" +#include <core/config.h> #include <llvm/ExecutionEngine/GenericValue.h> #include <vector> diff --git a/src/core/events.h b/src/core/events.h index 1f4bc4a..ea9c8da 100644 --- a/src/core/events.h +++ b/src/core/events.h @@ -2,7 +2,7 @@ #define __EVENTS_H__ #include "commandqueue.h" -#include "config.h" +#include <core/config.h> #include <vector> diff --git a/src/core/program.cpp b/src/core/program.cpp index 241750c..baaa1f8 100644 --- a/src/core/program.cpp +++ b/src/core/program.cpp @@ -29,8 +29,8 @@ #include <llvm/Analysis/Passes.h> #include <llvm/Transforms/IPO.h> -#include <stdlib.h.embed.h> -#include <stdlib.c.bc.embed.h> +#include <runtime/stdlib.h.embed.h> +#include <runtime/stdlib.c.bc.embed.h> using namespace Coal; |