Merge fixes from 2.0 branch.
This commit is contained in:
parent
19342d8adf
commit
94357626f7
@ -1,13 +1,8 @@
|
|||||||
PROJECT(squish)
|
PROJECT(squish)
|
||||||
ENABLE_TESTING()
|
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
|
|
||||||
SET(SQUISH_SRCS
|
SET(SQUISH_SRCS
|
||||||
# alpha.cpp
|
|
||||||
# alpha.h
|
|
||||||
# clusterfit.cpp
|
|
||||||
# clusterfit.h
|
|
||||||
fastclusterfit.cpp
|
fastclusterfit.cpp
|
||||||
fastclusterfit.h
|
fastclusterfit.h
|
||||||
weightedclusterfit.cpp
|
weightedclusterfit.cpp
|
||||||
@ -21,32 +16,13 @@ SET(SQUISH_SRCS
|
|||||||
config.h
|
config.h
|
||||||
maths.cpp
|
maths.cpp
|
||||||
maths.h
|
maths.h
|
||||||
# rangefit.cpp
|
|
||||||
# rangefit.h
|
|
||||||
# singlecolourfit.cpp
|
|
||||||
# singlecolourfit.h
|
|
||||||
# singlecolourlookup.inl
|
|
||||||
# squish.cpp
|
|
||||||
# squish.h
|
|
||||||
simd.h
|
simd.h
|
||||||
simd_sse.h
|
simd_sse.h
|
||||||
simd_ve.h)
|
simd_ve.h)
|
||||||
|
|
||||||
ADD_LIBRARY(squish STATIC ${SQUISH_SRCS})
|
ADD_LIBRARY(squish STATIC ${SQUISH_SRCS})
|
||||||
|
|
||||||
# libpng
|
IF(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
#FIND_PACKAGE(PNG)
|
SET_TARGET_PROPERTIES(squish PROPERTIES COMPILE_FLAGS -fPIC)
|
||||||
|
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
#IF(PNG_FOUND)
|
|
||||||
# INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
|
|
||||||
# ADD_EXECUTABLE(squishpng extra/squishpng.cpp)
|
|
||||||
# TARGET_LINK_LIBRARIES(squishpng squish ${PNG_LIBRARY})
|
|
||||||
#ENDIF(PNG_FOUND)
|
|
||||||
|
|
||||||
##ADD_EXECUTABLE(squishgen extra/squishgen.cpp)
|
|
||||||
|
|
||||||
#ADD_EXECUTABLE(squishtest extra/squishtest.cpp)
|
|
||||||
#TARGET_LINK_LIBRARIES(squishtest squish)
|
|
||||||
|
|
||||||
#ADD_TEST(SQUISHTEST squishtest)
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user