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

Rename internal squish library to nvsquish to avoid conflicts.

Browse Source
This commit is contained in:
Ignacio 2020-03-23 10:02:07 -07:00
parent 4d47c0d2fc
commit 97723db794
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvtt/CMakeLists.txt
View File

@ -49,7 +49,7 @@ ELSE(NVTT_SHARED)
ADD_LIBRARY(nvtt ${NVTT_SRCS}) ADD_LIBRARY(nvtt ${NVTT_SRCS})
ENDIF(NVTT_SHARED) 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 INSTALL(TARGETS nvtt
RUNTIME DESTINATION bin RUNTIME DESTINATION bin

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

@ -1,4 +1,4 @@
PROJECT(squish) PROJECT(nvsquish)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
@ -20,4 +20,4 @@ SET(SQUISH_SRCS
simd_sse.h simd_sse.h
simd_ve.h) simd_ve.h)
ADD_LIBRARY(squish STATIC ${SQUISH_SRCS}) ADD_LIBRARY(nvsquish STATIC ${SQUISH_SRCS})