From 26005bfd2764abf18dcb2c7aef41c319296cb4df Mon Sep 17 00:00:00 2001
From: Pavel Krajcevski <pavel@cs.unc.edu>
Date: Sat, 31 Aug 2013 16:36:02 -0400
Subject: [PATCH] Disambiguate the Image.h from PVRTCEncoder and Core

---
 PVRTCEncoder/CMakeLists.txt            | 2 +-
 PVRTCEncoder/include/PVRTCCompressor.h | 2 +-
 PVRTCEncoder/src/Block.h               | 2 +-
 PVRTCEncoder/src/Image.h               | 2 +-
 PVRTCEncoder/src/Pixel.h               | 2 +-
 PVRTCEncoder/test/CMakeLists.txt       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/PVRTCEncoder/CMakeLists.txt b/PVRTCEncoder/CMakeLists.txt
index 81386be..86d6722 100644
--- a/PVRTCEncoder/CMakeLists.txt
+++ b/PVRTCEncoder/CMakeLists.txt
@@ -49,7 +49,7 @@
 # 
 # <http://gamma.cs.unc.edu/FasTC/>
 
-INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/Core/include)
+INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR})
 
 INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/PVRTCEncoder/include)
 INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/PVRTCEncoder/include)
diff --git a/PVRTCEncoder/include/PVRTCCompressor.h b/PVRTCEncoder/include/PVRTCCompressor.h
index 51d5c71..886b777 100644
--- a/PVRTCEncoder/include/PVRTCCompressor.h
+++ b/PVRTCEncoder/include/PVRTCCompressor.h
@@ -53,7 +53,7 @@
 #ifndef PVRTCENCODER_INCLUDE_PVRTCCOMPRESSOR_H_
 #define PVRTCENCODER_INCLUDE_PVRTCCOMPRESSOR_H_
 
-#include "CompressionJob.h"
+#include "Core/include/CompressionJob.h"
 
 namespace PVRTCC {
 
diff --git a/PVRTCEncoder/src/Block.h b/PVRTCEncoder/src/Block.h
index 83dfe7f..d0d2ad8 100644
--- a/PVRTCEncoder/src/Block.h
+++ b/PVRTCEncoder/src/Block.h
@@ -53,7 +53,7 @@
 #ifndef PVRTCENCODER_SRC_BLOCK_H_
 #define PVRTCENCODER_SRC_BLOCK_H_
 
-#include "TexCompTypes.h"
+#include "Core/include/TexCompTypes.h"
 
 #include "Pixel.h"
 
diff --git a/PVRTCEncoder/src/Image.h b/PVRTCEncoder/src/Image.h
index fc57574..286ed67 100644
--- a/PVRTCEncoder/src/Image.h
+++ b/PVRTCEncoder/src/Image.h
@@ -53,7 +53,7 @@
 #ifndef PVRTCENCODER_SRC_IMAGE_H_
 #define PVRTCENCODER_SRC_IMAGE_H_
 
-#include "TexCompTypes.h"
+#include "Core/include/TexCompTypes.h"
 #include "PVRTCCompressor.h"
 
 namespace PVRTCC {
diff --git a/PVRTCEncoder/src/Pixel.h b/PVRTCEncoder/src/Pixel.h
index 7598dd6..2ffd2eb 100644
--- a/PVRTCEncoder/src/Pixel.h
+++ b/PVRTCEncoder/src/Pixel.h
@@ -53,7 +53,7 @@
 #ifndef PVRTCENCODER_SRC_PIXEL_H_
 #define PVRTCENCODER_SRC_PIXEL_H_
 
-#include "TexCompTypes.h"
+#include "Core/include/TexCompTypes.h"
 
 namespace PVRTCC {
 
diff --git a/PVRTCEncoder/test/CMakeLists.txt b/PVRTCEncoder/test/CMakeLists.txt
index 5ba2121..bf3e77b 100644
--- a/PVRTCEncoder/test/CMakeLists.txt
+++ b/PVRTCEncoder/test/CMakeLists.txt
@@ -49,7 +49,7 @@
 # 
 # <http://gamma.cs.unc.edu/FasTC/>
 
-INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/Core/include)
+INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR})
 
 INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/PVRTCEncoder/include)
 INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/PVRTCEncoder/src)