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

First batch of changes required for MacOS X build. Orignal submission from

Browse Source 
Phil Atkin, merged by Robert Osfield.
This commit is contained in:
Robert Osfield
2002-01-16 10:36:20 +00:00
parent f7e944c47f
commit 1fb8f9cb86
33 changed files with 116 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Demos/osgtext/Makefile
View File

@@ -13,8 +13,9 @@ TARGET_BIN_FILES = osgtext
#note, standard library list.
LIBS = -losgGLUT -losgText -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
MACOSXLIBS = -losgGLUT -losgText -losgUtil -losgDB -losg -lfreetype -ldl -lobjc -lstdc++
C++FLAGS += -I$(OSGHOME)/include -g
C++FLAGS += -I$(OSGHOME)/include -I.
LDFLAGS += -L$(OSGHOME)/lib -L/usr/freeware/lib32
include $(OSGHOME)/Make/makerules

6
src/Demos/osgtext/main.cpp
View File

@@ -25,7 +25,7 @@
#include <osgUtil/DriveManipulator>
#include <osgGLUT/Viewer>
#include <GL/glut.h>
#include <osgGLUT/glut>
#include <osgText/Text>
#include <vector>
@@ -45,8 +45,8 @@ using namespace osgGLUT;
#define TEXT_COL_3D osg::Vec4(.99,.3,.2,1)
std::string ttfPath("fonts/dirtydoz.ttf");
std::string ttfPath1("fonts/fudd.ttf");
std::string ttfPath("fonts/times.ttf");
std::string ttfPath1("fonts/arial.ttf");
int gFontSize=18;
int gFontSize1=24;