From Mathieu Narache, build fixes for IRIX64
This commit is contained in:
@@ -2,6 +2,6 @@ IF(MSVC)
|
||||
SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT")
|
||||
ENDIF(MSVC)
|
||||
INCLUDE_DIRECTORIES( ${JPEG_INCLUDE_DIR} )
|
||||
LINK_DIRECTORIES( ${JPEG_DIR}/lib )
|
||||
#LINK_DIRECTORIES( ${JPEG_DIR}/lib )
|
||||
ADD_OSG_PLUGIN(jpeg ${JPEG_LIBRARY})
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
IF(NOT MINGW)
|
||||
INCLUDE_DIRECTORIES( ${TIFF_INCLUDE_DIR} )
|
||||
LINK_DIRECTORIES( ${TIFF_DIR}/lib )
|
||||
#LINK_DIRECTORIES( ${TIFF_DIR}/lib )
|
||||
ADD_OSG_PLUGIN(tiff ${TIFF_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARY})
|
||||
IF(MSVC)
|
||||
SET_TARGET_PROPERTIES(osgdb_tiff PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:MSVCRT")
|
||||
ENDIF(MSVC)
|
||||
ENDIF(NOT MINGW)
|
||||
ENDIF(NOT MINGW)
|
||||
|
||||
Reference in New Issue
Block a user