Integrate cfcohen changes to fix linker problems with gcc.

pull/233/head
Ignacio 8 years ago
parent 87ca69bd14
commit 268e6abd65

@ -47,7 +47,7 @@ ELSE(NVTT_SHARED)
ADD_LIBRARY(nvtt ${NVTT_SRCS})
ENDIF(NVTT_SHARED)
TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvmath nvimage nvthread squish bc6h bc7)
TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvimage nvthread squish bc6h bc7 nvmath)
INSTALL(TARGETS nvtt
RUNTIME DESTINATION bin

@ -22,7 +22,7 @@ SET(TOOLS nvcompress nvdecompress nvddsinfo nvassemble nvzoom)
IF(GLEW_FOUND AND GLUT_FOUND AND OPENGL_FOUND)
INCLUDE_DIRECTORIES(${GLEW_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
ADD_EXECUTABLE(nvddsview ddsview.cpp cmdline.h)
TARGET_LINK_LIBRARIES(nvddsview nvcore nvmath nvimage ${GLEW_LIBRARY} ${GLUT_LIBRARY} ${OPENGL_LIBRARY})
TARGET_LINK_LIBRARIES(nvddsview nvcore nvimage ${GLEW_LIBRARY} ${GLUT_LIBRARY} ${OPENGL_LIBRARY})
SET(TOOLS ${TOOLS} nvddsview)
ENDIF(GLEW_FOUND AND GLUT_FOUND AND OPENGL_FOUND)

Loading…
Cancel
Save