Ticket #28276: 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
@@ -46 +47 @@
 GPP:=g++ 
 CPPreal:=cpp
 
-
-
 # ---------------------- compiler version detection
 
 # supported compiler versions:
@@ -203 +202 @@
 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/X11/include -I$(OSX_SDK)/usr/include/krb5 -I$(OSX_FW)/GLUT.framework/Headers -I$(PREFIX)/include
 endif
 
 ifdef DARWIN
-        XLIBS := -L/usr/OpenMotif/lib -lXm -L$(XHOME)/lib -lpng -lXt -lX11 -lXext -lXp -lc -lXmu -lXi
+    #Explicit use of png12 because ARB breaks with png14 (http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt)
+        XLIBS := -L$(PREFIX)/lib -lXm -lpng12 -lz -L$(XHOME)/lib -lXt -lX11 -lXext -lXp -lc -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 +226 @@
 
 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 +243 @@
 
 #---------------------- tiff lib:
 
-ifdef DARWIN
-        TIFFLIBS := -L/usr/local/lib -ltiff -L$(OSX_FW_IMAGEIO) -lTIFF  
-else
-        TIFFLIBS := -ltiff
-endif
+TIFFLIBS := -ltiff
 
 #---------------------- basic libs:
 
@@ -319 +310 @@
 
 CTAGS := etags
 ifdef DARWIN
-        XMKMF := /usr/X11/bin/xmkmf
+        XMKMF := $(PREFIX)/bin/xmkmf
 else
         XMKMF := /usr/bin/X11/xmkmf
 endif