FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverted fixes for Mingw as they break OSX build

Browse Source
This commit is contained in:
Robert Osfield 2010-01-22 16:13:28 +00:00
parent 7ab759c97f
commit 16e48d1724
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgPlugins/freetype/CMakeLists.txt
View File

@ -2,7 +2,7 @@ IF(WIN32)
SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT")
ENDIF()
INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2}/freetype ${FREETYPE_INCLUDE_DIR_freetype2})
INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS} )
IF(APPLE)
SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")

4
src/osgPlugins/freetype/FreeTypeFont3D.cpp
View File

@ -29,8 +29,8 @@
#include <ft2build.h>
#include FT_FREETYPE_H
#include <ftoutln.h>
#include <ftbbox.h>
#include <freetype/ftoutln.h>
#include <freetype/ftbbox.h>

2
src/osgPlugins/freetype/FreeTypeLibrary.cpp
View File

@ -17,7 +17,7 @@
//#define PRINT_OUT_FONT_DETAILS
#ifdef PRINT_OUT_FONT_DETAILS
#include <ftsnames.h>
#include <freetype/ftsnames.h>
#endif
#include FT_TRUETYPE_IDS_H