drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added an (advanced) CMake option to build the whole squish library (with an adequate warning to tell this is not the 'official' way).

Browse Source
This commit is contained in:
Sukender 2016-09-16 10:23:32 +02:00
parent 752f78b56a
commit 02e3438c34
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -5,6 +5,9 @@ ENABLE_TESTING()
SET(NV_CMAKE_DIR "${NV_SOURCE_DIR}/cmake") SET(NV_CMAKE_DIR "${NV_SOURCE_DIR}/cmake")
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${NV_CMAKE_DIR}") SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${NV_CMAKE_DIR}")
OPTION(SQUISH_FULL_LIBRARY "Makes the whole squish library compiled, instead of just what's needed in NVTT. Please be aware that this build path is not officially maintained." OFF)
MARK_AS_ADVANCED(SQUISH_FULL_LIBRARY)
# GCC check (needs -std:c++11 flag) # GCC check (needs -std:c++11 flag)
if(CMAKE_COMPILER_IS_GNUCC) if(CMAKE_COMPILER_IS_GNUCC)
ADD_DEFINITIONS("-std=c++11") ADD_DEFINITIONS("-std=c++11")

17
src/nvtt/squish/CMakeLists.txt
View File

@ -20,6 +20,23 @@ SET(SQUISH_SRCS
simd_sse.h simd_sse.h
simd_ve.h) simd_ve.h)
# Additionnal squish source files which are not included in NVTT by default
IF(SQUISH_FULL_LIBRARY)
SET(SQUISH_SRCS ${SQUISH_SRCS}
alpha.h
alpha.cpp
clusterfit.h
clusterfit.cpp
rangefit.h
rangefit.cpp
singlechannelfit.h
singlechannelfit.cpp
singlecolourfit.h
singlecolourfit.cpp
squish.cpp
)
ENDIF(SQUISH_FULL)
ADD_LIBRARY(squish STATIC ${SQUISH_SRCS}) ADD_LIBRARY(squish STATIC ${SQUISH_SRCS})
IF(NOT WIN32) IF(NOT WIN32)