From Mathieu Narache, build fixes for IRIX64

This commit is contained in:
Robert Osfield
2007-03-13 12:25:30 +00:00
parent 386f3a091e
commit b079c9eb3a
4 changed files with 8 additions and 3 deletions

View File

@@ -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})

View File

@@ -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)