From 4340a0a1e4d6f098f0e28abfc26848753f8c3bfe Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 6 Aug 2004 09:35:08 +0000 Subject: [PATCH] From Bob Kuehne, adding of SDKPATH to OSX build --- Make/makedefs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Make/makedefs b/Make/makedefs index d121ef5c2..7acf596c9 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -430,8 +430,9 @@ ifeq ($(OS),Darwin) else C++ = $(CXX) endif - INC += -I/usr/X11R6/include - LDFLAGS += -L/usr/X11R6/lib -L/sw/lib + FINC += -F$(SDKPATH)/System/Library/Frameworks + INC += $(FINC) -I$(SDKPATH)/usr/include -I$(SDKPATH)/usr/X11R6/include + LDFLAGS += $(FINC) -L$(SDKPATH)/usr/include -L$(SDKPATH)/usr/X11R6/lib -L/sw/lib DEF += -Wall OPTF = -O2 DBGF = -g -DOSG_COMPILE_UNIT_TESTS @@ -445,7 +446,7 @@ ifeq ($(OS),Darwin) OSG_LIBS = -losgGA -losgDB -losgUtil -losg CARBON_LIB = -framework Carbon GL_LIBS = -framework OpenGL $(CARBON_LIB) - X_INC = -I/usr/X11R6/include + X_INC = -I$(SDKPATH)/usr/X11R6/include X_LIBS = -lX11 SOCKET_LIBS = OTHER_LIBS = -lm -lstdc++ -lobjc -lOpenThreads