Rename internal squish library to nvsquish to avoid conflicts.

4 years ago · 97723db794
parent 4d47c0d2fc
commit 97723db794
2 changed files with 3 additions and 3 deletions
--- a/src/nvtt/CMakeLists.txt
+++ b/src/nvtt/CMakeLists.txt
@ -49,7 +49,7 @@ ELSE(NVTT_SHARED)
    ADD_LIBRARY(nvtt ${NVTT_SRCS})
 ENDIF(NVTT_SHARED)

-TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvimage nvthread squish bc6h bc7 nvmath rg_etc1)
+TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvimage nvthread nvsquish bc6h bc7 nvmath rg_etc1)

 INSTALL(TARGETS nvtt 
    RUNTIME DESTINATION bin
--- a/src/nvtt/squish/CMakeLists.txt
+++ b/src/nvtt/squish/CMakeLists.txt
@ -1,4 +1,4 @@
-PROJECT(squish)
+PROJECT(nvsquish)

 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})

@ -20,4 +20,4 @@ SET(SQUISH_SRCS
 	simd_sse.h
 	simd_ve.h)

-ADD_LIBRARY(squish STATIC ${SQUISH_SRCS})
+ADD_LIBRARY(nvsquish STATIC ${SQUISH_SRCS})