Ticket #32054: patch-ARB-makefile.diff

File patch-ARB-makefile.diff, 2.8 KB (added by matt.cottrell@…, 13 years ago)
  • Makefile

    old new  
    3131#                       configurable in config.makefile
    3232#
    3333# -----------------------------------------------------
     34
    3435# Read configuration
    3536include config.makefile
    3637
    3738ifeq ($(LD_LIBRARY_PATH),'')
    38 LD_LIBRARY_PATH:=${ARBHOME}/lib
     39        LD_LIBRARY_PATH:=${ARBHOME}/lib
    3940endif
    4041
    4142FORCEMASK = umask 002
    4243
    4344# ---------------------- [unconditionally used options]
    4445
    45 GCC:=gcc
    46 GPP:=g++
    47 CPPreal:=cpp
    48 
    49 
     46#GCC:=gcc      <Now set in the Portfile>
     47#GPP:=g++      <Now set in the Portfile>
     48#CPPreal:=cpp  <Now set in the Portfile>
    5049
    5150# ---------------------- compiler version detection
    5251
     
    7170#---------------------- define special directories for non standard builds
    7271
    7372ifdef DARWIN
    74 OSX_SDK:=/Developer/SDKs/MacOSX10.5.sdk
     73OSX_SDK:=
    7574OSX_FW:=/System/Library/Frameworks
    7675OSX_FW_OPENGL:=$(OSX_FW)/OpenGL.framework/Versions/A/Libraries
    7776OSX_FW_IMAGEIO:=$(OSX_FW)/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources
     
    186185dflags += -D$(MACH) # define machine
    187186
    188187ifdef DARWIN
    189         cflags += -no-cpp-precomp
    190188        shared_cflags += -fno-common
    191189else
    192190        dflags +=  $(shell getconf LFS_CFLAGS)
     
    199197
    200198#---------------------- X11 location
    201199
    202 XHOME:=/usr/X11R6
     200XHOME:=$(PREFIX)
    203201XINCLUDES:=-I$(XHOME)/include
    204202
    205203ifdef DARWIN
    206         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
     204        XINCLUDES += -I$(OSX_FW)/OpenGL.framework/Headers -I$(OSX_SDK)/usr/include/krb5 -I$(OSX_FW)/GLUT.framework/Headers
    207205endif
    208206
    209207ifdef DARWIN
    210         XLIBS := -L/usr/OpenMotif/lib -lXm -L$(XHOME)/lib -lpng -lXt -lX11 -lXext -lc -lXmu -lXi
     208        XLIBS := -L$(XHOME)/lib -lXm -lpng -lz -lXt -lX11 -lXext -lXp -lXmu -lXi
    211209        XLIBS += -lGLU -lGL -Wl,-dylib_file,$(OSX_FW_OPENGL)/libGL.dylib:$(OSX_FW_OPENGL)/libGL.dylib
    212210else
    213211        XLIBS:=-L$(XHOME)/$(CROSS_LIB) -lXm -lXpm -lXp -lXt -lXext -lX11
     
    226224
    227225GL_PNGLIBS := -L$(ARBHOME)/GL/glpng -lglpng_arb -lpng
    228226
    229  ifdef DARWIN
    230         GLEWLIB := -L/usr/lib -lGLEW -L$(OSX_SDK)/usr/X11/lib -lGLw
    231         GLUTLIB := -L$(XHOME)/lib -lglut
    232  else
    233         GLEWLIB := -lGLEW -lGLw
    234         GLUTLIB := -lglut
    235  endif
    236 
     227GLEWLIB := -lGLEW -lGLw
     228GLUTLIB := -lglut
     229 
    237230GL_LIBS := $(GL_LIB) $(GLEWLIB) $(GLUTLIB) $(GL_PNGLIBS)
    238231
    239232#XLIBS += $(GL_LIB)
     
    248241
    249242#---------------------- tiff lib:
    250243
    251 ifdef DARWIN
    252         TIFFLIBS := -L/usr/local/lib -ltiff -L$(OSX_FW_IMAGEIO) -lTIFF 
    253 else
    254         TIFFLIBS := -ltiff
    255 endif
     244TIFFLIBS := -ltiff
    256245
    257246#---------------------- basic libs:
    258247
     
    318307# other used tools
    319308
    320309CTAGS := etags
    321 ifdef DARWIN
    322         XMKMF := /usr/X11/bin/xmkmf
    323 else
    324         XMKMF := /usr/bin/X11/xmkmf
    325 endif
     310XMKMF := $(PREFIX)/bin/xmkmf
    326311MAKEDEPEND_PLAIN = makedepend
    327312
    328313MAKEDEPEND = $(FORCEMASK);$(MAKEDEPEND_PLAIN)