Ticket #30342: patch-ARB-makefile.diff

Makefile

@@ -31 +31 @@
 #                       configurable in config.makefile
 #
 # -----------------------------------------------------
+
 # Read configuration 
 include config.makefile
 
 ifeq ($(LD_LIBRARY_PATH),'')
-LD_LIBRARY_PATH:=${ARBHOME}/lib
+        LD_LIBRARY_PATH:=${ARBHOME}/lib
 endif
 
 FORCEMASK = umask 002
 
 # ---------------------- [unconditionally used options]
 
-GCC:=gcc
-GPP:=g++ 
-CPPreal:=cpp
-
-
+#GCC:=gcc      <Now set in the Portfile>
+#GPP:=g++      <Now set in the Portfile>
+#CPPreal:=cpp  <Now set in the Portfile>
 
 # ---------------------- compiler version detection
 
@@ -71 +70 @@
 #---------------------- define special directories for non standard builds
 
 ifdef DARWIN
-OSX_SDK:=/Developer/SDKs/MacOSX10.5.sdk
+OSX_SDK:=
 OSX_FW:=/System/Library/Frameworks
 OSX_FW_OPENGL:=$(OSX_FW)/OpenGL.framework/Versions/A/Libraries
 OSX_FW_IMAGEIO:=$(OSX_FW)/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources
@@ -186 +185 @@
 dflags += -D$(MACH) # define machine
 
 ifdef DARWIN
-        cflags += -no-cpp-precomp 
         shared_cflags += -fno-common
 else
         dflags +=  $(shell getconf LFS_CFLAGS)
@@ -199 +197 @@
 
 #---------------------- X11 location
 
-XHOME:=/usr/X11R6
+XHOME:=$(PREFIX)
 XINCLUDES:=-I$(XHOME)/include
 
 ifdef DARWIN
-        XINCLUDES := -I/sw/include -I$(OSX_SDK)/usr/X11/include -I$(OSX_SDK)/usr/include/krb5 -I/usr/OpenMotif/include #Snow Leopard couldn't find OpenMotif
+        XINCLUDES += -I$(OSX_FW)/OpenGL.framework/Headers -I$(OSX_SDK)/usr/include/krb5 -I$(OSX_FW)/GLUT.framework/Headers
 endif
 
 ifdef DARWIN
-        XLIBS := -L/usr/OpenMotif/lib -lXm -L$(XHOME)/lib -lpng -lXt -lX11 -lXext -lXp -lc -lXmu -lXi
+        XLIBS := -L$(XHOME)/lib -lXm -lpng -lz -lXt -lX11 -lXext -lXp -lXmu -lXi
         XLIBS += -lGLU -lGL -Wl,-dylib_file,$(OSX_FW_OPENGL)/libGL.dylib:$(OSX_FW_OPENGL)/libGL.dylib
 else
         XLIBS:=-L$(XHOME)/$(CROSS_LIB) -lXm -lXpm -lXp -lXt -lXext -lX11
@@ -226 +224 @@
 
 GL_PNGLIBS := -L$(ARBHOME)/GL/glpng -lglpng_arb -lpng
 
- ifdef DARWIN
-        GLEWLIB := -L/usr/lib -lGLEW -L$(OSX_SDK)/usr/X11/lib -lGLw
-        GLUTLIB := -L$(XHOME)/lib -lglut
- else 
-        GLEWLIB := -lGLEW -lGLw
-        GLUTLIB := -lglut
- endif
-
+GLEWLIB := -lGLEW -lGLw
+GLUTLIB := -lglut
+ 
 GL_LIBS := $(GL_LIB) $(GLEWLIB) $(GLUTLIB) $(GL_PNGLIBS)
 
 #XLIBS += $(GL_LIB)
@@ -248 +241 @@
 
 #---------------------- tiff lib:
 
-ifdef DARWIN
-        TIFFLIBS := -L/usr/local/lib -ltiff -L$(OSX_FW_IMAGEIO) -lTIFF  
-else
-        TIFFLIBS := -ltiff
-endif
+TIFFLIBS := -ltiff
 
 #---------------------- basic libs:
 
@@ -318 +307 @@
 # other used tools
 
 CTAGS := etags
-ifdef DARWIN
-        XMKMF := /usr/X11/bin/xmkmf
-else
-        XMKMF := /usr/bin/X11/xmkmf
-endif
+XMKMF := $(PREFIX)/bin/xmkmf
 MAKEDEPEND_PLAIN = makedepend
 
 MAKEDEPEND = $(FORCEMASK);$(MAKEDEPEND_PLAIN)