From Luigi Calori, fixed build of freetype and zlib.
This commit is contained in:
@@ -88,10 +88,10 @@ IF (BUILD_OSG_OTHER_PLUGINS)
|
||||
ADD_OSG_PLUGIN(ESRIShape)
|
||||
|
||||
IF(FREETYPE_FOUND)
|
||||
#SUBDIRS( freetype )
|
||||
SUBDIRS( freetype )
|
||||
ENDIF(FREETYPE_FOUND)
|
||||
IF(ZLIB_FOUND)
|
||||
#SUBDIRS( zlib )
|
||||
ADD_OSG_PLUGIN(zip )
|
||||
ENDIF(ZLIB_FOUND)
|
||||
|
||||
ENDIF (BUILD_OSG_OTHER_PLUGINS)
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
IF(WIN32)
|
||||
SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT")
|
||||
ENDIF(WIN32)
|
||||
INCLUDE_DIRECTORIES( ${FREETYPE_INCLUDE_DIR} )
|
||||
LINK_DIRECTORIES( ${FREETYPE_DIR}/lib )
|
||||
INCLUDE_DIRECTORIES( ${FREETYPE_INCLUDE_DIRS} )
|
||||
#LINK_DIRECTORIES( ${FREETYPE_DIR}/lib )
|
||||
ADD_OSG_PLUGIN(freetype osgText ${FREETYPE_LIBRARY})
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user