diff --git a/extern/EtcLib/CMakeLists.txt b/extern/EtcLib/CMakeLists.txt index b584b88..044b92b 100644 --- a/extern/EtcLib/CMakeLists.txt +++ b/extern/EtcLib/CMakeLists.txt @@ -21,4 +21,4 @@ file(GLOB SOURCES ${PROJECT_SOURCE_DIR}/EtcCodec/*.h ${PROJECT_SOURCE_DIR}/Etc/*.cpp ${PROJECT_SOURCE_DIR}/EtcCodec/*.cpp) -ADD_LIBRARY(EtcLib ${SOURCES}) +ADD_LIBRARY(EtcLib STATIC ${SOURCES}) diff --git a/src/bc7/CMakeLists.txt b/src/bc7/CMakeLists.txt index 2eb01c0..ab952f0 100644 --- a/src/bc7/CMakeLists.txt +++ b/src/bc7/CMakeLists.txt @@ -23,6 +23,8 @@ SET(BC7_SRCS ADD_LIBRARY(bc7 STATIC ${BC7_SRCS}) +TARGET_LINK_LIBRARIES(bc7 nvmath) + IF(NOT WIN32) IF(CMAKE_COMPILER_IS_GNUCXX) SET_TARGET_PROPERTIES(bc7 PROPERTIES COMPILE_FLAGS -fPIC) diff --git a/src/nvtt/tools/CMakeLists.txt b/src/nvtt/tools/CMakeLists.txt index 5459bd1..6161a43 100644 --- a/src/nvtt/tools/CMakeLists.txt +++ b/src/nvtt/tools/CMakeLists.txt @@ -17,7 +17,7 @@ TARGET_LINK_LIBRARIES(nvassemble nvcore nvimage nvtt bc6h nvmath) ADD_EXECUTABLE(nvzoom resize.cpp cmdline.h) TARGET_LINK_LIBRARIES(nvzoom nvcore nvimage nvtt bc6h nvmath) -SET(TOOLS nvcompress nvdecompress nvddsinfo nvassemble nvzoom) +SET(TOOLS nvcompress nvdecompress nvddsinfo nvimgdiff nvassemble nvzoom) IF(GLEW_FOUND AND GLUT_FOUND AND OPENGL_FOUND) INCLUDE_DIRECTORIES(${GLEW_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})