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

Merge pull request #274 from StefanBruens/fix_build_errors

Browse Source 
Fix some build errors
This commit is contained in:
Ignacio 2018-02-05 18:30:58 -08:00 committed by GitHub
commit 2075d740c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extern/EtcLib/CMakeLists.txt vendored
View File

@ -21,4 +21,4 @@ file(GLOB SOURCES
${PROJECT_SOURCE_DIR}/EtcCodec/*.h ${PROJECT_SOURCE_DIR}/EtcCodec/*.h
${PROJECT_SOURCE_DIR}/Etc/*.cpp ${PROJECT_SOURCE_DIR}/Etc/*.cpp
${PROJECT_SOURCE_DIR}/EtcCodec/*.cpp) ${PROJECT_SOURCE_DIR}/EtcCodec/*.cpp)
ADD_LIBRARY(EtcLib ${SOURCES}) ADD_LIBRARY(EtcLib STATIC ${SOURCES})

2
src/bc7/CMakeLists.txt
View File

@ -23,6 +23,8 @@ SET(BC7_SRCS
ADD_LIBRARY(bc7 STATIC ${BC7_SRCS}) ADD_LIBRARY(bc7 STATIC ${BC7_SRCS})
TARGET_LINK_LIBRARIES(bc7 nvmath)
IF(NOT WIN32) IF(NOT WIN32)
IF(CMAKE_COMPILER_IS_GNUCXX) IF(CMAKE_COMPILER_IS_GNUCXX)
SET_TARGET_PROPERTIES(bc7 PROPERTIES COMPILE_FLAGS -fPIC) SET_TARGET_PROPERTIES(bc7 PROPERTIES COMPILE_FLAGS -fPIC)

2
src/nvtt/tools/CMakeLists.txt
View File

@ -17,7 +17,7 @@ TARGET_LINK_LIBRARIES(nvassemble nvcore nvimage nvtt bc6h nvmath)
ADD_EXECUTABLE(nvzoom resize.cpp cmdline.h) ADD_EXECUTABLE(nvzoom resize.cpp cmdline.h)
TARGET_LINK_LIBRARIES(nvzoom nvcore nvimage nvtt bc6h nvmath) 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) IF(GLEW_FOUND AND GLUT_FOUND AND OPENGL_FOUND)
INCLUDE_DIRECTORIES(${GLEW_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${GLEW_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})