yuzu-emu/FasTC
1
0
Fork 0
mirror of https://github.com/yuzu-emu/FasTC.git synced 2024-11-24 07:45:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix the directories in the PVRTC compressor

Browse Source
This commit is contained in:
Pavel Krajcevski 2013-09-17 18:35:56 -04:00
parent 29bd1368e6
commit d4ca50f8ed
8 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PVRTCEncoder/CMakeLists.txt
View File

@ -49,8 +49,6 @@
# #
# <http://gamma.cs.unc.edu/FasTC/> # <http://gamma.cs.unc.edu/FasTC/>
INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR})
INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/PVRTCEncoder/include) INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/PVRTCEncoder/include)
INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/PVRTCEncoder/include) INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/PVRTCEncoder/include)

2
PVRTCEncoder/include/PVRTCCompressor.h
View File

@ -53,7 +53,7 @@
#ifndef PVRTCENCODER_INCLUDE_PVRTCCOMPRESSOR_H_ #ifndef PVRTCENCODER_INCLUDE_PVRTCCOMPRESSOR_H_
#define PVRTCENCODER_INCLUDE_PVRTCCOMPRESSOR_H_ #define PVRTCENCODER_INCLUDE_PVRTCCOMPRESSOR_H_
#include "Base/include/CompressionJob.h" #include "CompressionJob.h"
namespace PVRTCC { namespace PVRTCC {

3
PVRTCEncoder/src/Block.h
View File

@ -53,8 +53,7 @@
#ifndef PVRTCENCODER_SRC_BLOCK_H_ #ifndef PVRTCENCODER_SRC_BLOCK_H_
#define PVRTCENCODER_SRC_BLOCK_H_ #define PVRTCENCODER_SRC_BLOCK_H_
#include "Base/include/TexCompTypes.h" #include "TexCompTypes.h"
#include "Pixel.h" #include "Pixel.h"
namespace PVRTCC { namespace PVRTCC {

4
PVRTCEncoder/src/Image.cpp
View File

@ -58,8 +58,8 @@
#include "Pixel.h" #include "Pixel.h"
#include "Base/include/Image.h" #include "../../Base/include/Image.h"
#include "IO/include/ImageFile.h" #include "../../IO/include/ImageFile.h"
namespace PVRTCC { namespace PVRTCC {

2
PVRTCEncoder/src/Image.h
View File

@ -53,7 +53,7 @@
#ifndef PVRTCENCODER_SRC_IMAGE_H_ #ifndef PVRTCENCODER_SRC_IMAGE_H_
#define PVRTCENCODER_SRC_IMAGE_H_ #define PVRTCENCODER_SRC_IMAGE_H_
#include "Base/include/TexCompTypes.h" #include "TexCompTypes.h"
#include "PVRTCCompressor.h" #include "PVRTCCompressor.h"
namespace PVRTCC { namespace PVRTCC {

2
PVRTCEncoder/src/Pixel.h
View File

@ -53,7 +53,7 @@
#ifndef PVRTCENCODER_SRC_PIXEL_H_ #ifndef PVRTCENCODER_SRC_PIXEL_H_
#define PVRTCENCODER_SRC_PIXEL_H_ #define PVRTCENCODER_SRC_PIXEL_H_
#include "Base/include/TexCompTypes.h" #include "TexCompTypes.h"
namespace PVRTCC { namespace PVRTCC {

4
PVRTCEncoder/test/CMakeLists.txt
View File

@ -49,11 +49,10 @@
# #
# <http://gamma.cs.unc.edu/FasTC/> # <http://gamma.cs.unc.edu/FasTC/>
INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR})
INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/PVRTCEncoder/include) INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/PVRTCEncoder/include)
INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/PVRTCEncoder/src) INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/PVRTCEncoder/src)
INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/Base/include)
INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/GTest/include) INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/GTest/include)
SET(TESTS SET(TESTS
@ -98,6 +97,7 @@ IF(PVRTEXLIB_FOUND)
TARGET_LINK_LIBRARIES(${TEST_NAME} PVRTCEncoder) TARGET_LINK_LIBRARIES(${TEST_NAME} PVRTCEncoder)
TARGET_LINK_LIBRARIES(${TEST_NAME} gtest_main) TARGET_LINK_LIBRARIES(${TEST_NAME} gtest_main)
TARGET_LINK_LIBRARIES(${TEST_NAME} ${PVRTEXLIB_LIBRARIES} ) TARGET_LINK_LIBRARIES(${TEST_NAME} ${PVRTEXLIB_LIBRARIES} )
TARGET_LINK_LIBRARIES(${TEST_NAME} FasTCBase)
TARGET_LINK_LIBRARIES(${TEST_NAME} FasTCIO) TARGET_LINK_LIBRARIES(${TEST_NAME} FasTCIO)
TARGET_LINK_LIBRARIES(${TEST_NAME} FasTCCore) TARGET_LINK_LIBRARIES(${TEST_NAME} FasTCCore)

2
PVRTCEncoder/test/TestUtils.h
View File

@ -53,7 +53,7 @@
#ifndef PVRTCENCODER_TEST_TESTUTILS_H_ #ifndef PVRTCENCODER_TEST_TESTUTILS_H_
#define PVRTCENCODER_TEST_TESTUTILS_H_ #define PVRTCENCODER_TEST_TESTUTILS_H_
#include "Base/include/TexCompTypes.h" #include "TexCompTypes.h"
class PixelPrinter { class PixelPrinter {
private: private: