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

Made USE_AGL=yes the default under OSX.

Browse Source
This commit is contained in:
Robert Osfield
2005-05-06 14:07:02 +00:00
parent cdab058b32
commit ccafa6b125
1 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Make/makedefs
View File

@@ -457,19 +457,36 @@ ifeq ($(OS),Darwin)
C++ = $(CXX)
endif
#### Default to AGL? Will try it temporary while waiting for feedback
USE_AGL ?= yes
FINC += -F/System/Library/Frameworks
ifeq ($(USE_CGL),1)
DEF += -D__USE_OSX_CGL_IMPLEMENTATION__
INC += $(FINC)
LDFLAGS += $(FINC)
X_INC =
X_LIBS =
ifeq ($(USE_AGL),yes)
DEF += -D__USE_OSX_AGL_IMPLEMENTATION__
INC += $(FINC)
LDFLAGS += $(FINC)
X_INC =
X_LIBS =
else
INC += $(FINC) -I$(SDKPATH)/usr/X11R6/include
LDFLAGS += $(FINC) -L$(SDKPATH)/usr/include -L$(SDKPATH)/usr/X11R6/lib -L/sw/lib
X_INC = -I$(SDKPATH)/usr/X11R6/include
X_LIBS = -lX11
ifeq ($(USE_CGL),yes)
DEF += -D__USE_OSX_CGL_IMPLEMENTATION__
INC += $(FINC)
LDFLAGS += $(FINC)
X_INC =
X_LIBS =
else
INC += $(FINC) -I$(SDKPATH)/usr/X11R6/include
LDFLAGS += $(FINC) -L$(SDKPATH)/usr/include -L$(SDKPATH)/usr/X11R6/lib -L/sw/lib
X_INC = -I$(SDKPATH)/usr/X11R6/include
X_LIBS = -lX11
endif
endif
DEF += -Wall