Fixes for MacOSX build.
This commit is contained in:
parent
86620891af
commit
a08fc47313
@ -7,7 +7,7 @@ DEPFILES = $(OBJS:.o=.d)
|
|||||||
|
|
||||||
C++ = cc
|
C++ = cc
|
||||||
YFLAGS = -d
|
YFLAGS = -d
|
||||||
LCINCS += -I/usr/local/include
|
LCINCS += -I/usr/local/include -I/sw/include
|
||||||
LC++INCS += ${LCINCS}
|
LC++INCS += ${LCINCS}
|
||||||
CFLAGS = -O2 -W -Wall $(LCINCS) -D__DARWIN_OSX__
|
CFLAGS = -O2 -W -Wall $(LCINCS) -D__DARWIN_OSX__
|
||||||
C++FLAGS = ${CFLAGS}
|
C++FLAGS = ${CFLAGS}
|
||||||
@ -17,7 +17,7 @@ CPPFLAGS = ${CFLAGS}
|
|||||||
SO_EXT = dylib
|
SO_EXT = dylib
|
||||||
DL_EXT = so
|
DL_EXT = so
|
||||||
|
|
||||||
FRAMEWORKS = -framework GLUT -framework Carbon -framework OpenGL
|
FRAMEWORKS = -L/sw/lib -framework GLUT -framework Carbon -framework OpenGL
|
||||||
LDFLAGS =-all_load -L/usr/local/lib -L/usr/lib
|
LDFLAGS =-all_load -L/usr/local/lib -L/usr/lib
|
||||||
|
|
||||||
DYNAMICLIBRARYLIB =
|
DYNAMICLIBRARYLIB =
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
#include <osgDB/Registry>
|
#include <osgDB/Registry>
|
||||||
#include <osgDB/ReadFile>
|
#include <osgDB/ReadFile>
|
||||||
|
|
||||||
#include <GL/glut.h>
|
#include <osgGLUT/glut>
|
||||||
#include <osgGLUT/Viewer>
|
#include <osgGLUT/Viewer>
|
||||||
|
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
#include <osgUtil/FlightManipulator>
|
#include <osgUtil/FlightManipulator>
|
||||||
#include <osgUtil/DriveManipulator>
|
#include <osgUtil/DriveManipulator>
|
||||||
|
|
||||||
#include <GL/glut.h>
|
#include <osgGLUT/glut>
|
||||||
#include <osgGLUT/Viewer>
|
#include <osgGLUT/Viewer>
|
||||||
|
|
||||||
#include <osg/Quat>
|
#include <osg/Quat>
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
#include <osgDB/Registry>
|
#include <osgDB/Registry>
|
||||||
#include <osgDB/ReadFile>
|
#include <osgDB/ReadFile>
|
||||||
|
|
||||||
#include <GL/glut.h>
|
#include <osgGLUT/glut>
|
||||||
#include <osgGLUT/Viewer>
|
#include <osgGLUT/Viewer>
|
||||||
|
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
#include <osgUtil/FlightManipulator>
|
#include <osgUtil/FlightManipulator>
|
||||||
#include <osgUtil/DriveManipulator>
|
#include <osgUtil/DriveManipulator>
|
||||||
|
|
||||||
#include <GL/glut.h>
|
#include <osgGLUT/glut>
|
||||||
#include <osgGLUT/Viewer>
|
#include <osgGLUT/Viewer>
|
||||||
|
|
||||||
#include <osg/Quat>
|
#include <osg/Quat>
|
||||||
|
Loading…
Reference in New Issue
Block a user