Ignore:
Timestamp:
Jan 5, 2011, 12:20:17 PM (13 years ago)
Author:
garnier
Message:

update

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/config/sys/Darwin-g++.gmk

    r1337 r1349  
    11#
    22# ------ MacOS-X ------
    3 #                                 MacOS 10.3 gcc-3.3
    4 #                                 MacOS 10.4 gcc-4.0
    5 #                                 MacOS 10.5 gcc-4.0
     3#                                 MacOS 10.6 gcc-4.2
    64#
    75# Original author: Helmut Burkhardt - CERN
    … …  
    6563  ifndef OGLHOME
    6664    OGLHOME  := /usr/X11R6
     65#   OGLHOME  := /System/Library/Frameworks/OpenGL.framework
    6766  endif
    6867  ifndef OGLFLAGS
    6968    OGLFLAGS  := -I$(OGLHOME)/include
     69#   OGLFLAGS := -I$(OGLHOME)/Headers
    7070  endif
    7171  ifndef OGLLIBS
    72     ifeq ($(shell uname -r | sed 's/\([0-9]*\).[0-9]*.[0-9]*/\1/'),9)
    73       # the following lines are for building on MacOSX 10.5 "Leopard"
    74       OGLLIBS   := $(shell test -f /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib && echo "-L/usr/X11R6/lib -lGLU -lGL -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
     72    QTGLPATH  := $(shell test -f /System/Library/Frameworks/OpenGL.framework/OpenGL && echo "/System/Library/Frameworks/OpenGL.framework")
     73    ifeq ($(QTGLPATH),/System/Library/Frameworks/OpenGL.framework)
     74      DARWIN_VERSION = $(shell uname -r | sed 's/\([0-9]*\).[0-9]*.[0-9]*/\1/')
     75      ifeq ($(DARWIN_VERSION),9)
     76        # the following lines are for building on MacOSX 10.5 "Leopard"
     77        OGLLIBS := -Wl,$(QTGLPATH)/Versions/A/Libraries/libGL.dylib -L$(OGLHOME)/lib -lGLU -lGL
     78      else
     79        ifeq ($(DARWIN_VERSION),10)
     80          # the following lines are for building on MacOSX > 10.5
     81          OGLLIBS := -F/System/Library/Frameworks -framework OpenGL -framework AGL
     82          ifeq ($(G4VIS_USE_OPENGLX),1)
     83            OGLLIBS += -L$(OGLHOME)/lib -lGLU -lGL
     84          endif
     85        endif
     86      endif
    7587    else
    76 #      OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
    77       OGLLIBS   := -F/System/Library/Frameworks/ -framework OpenGL -framework AGL
     88      OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
    7889    endif
    7990  endif
    8091
    8192# ---- QT Setup block -------------------------------------------------------
     93
    8294  ifndef QTHOME
    83     QTHOME   := $(shell test -f /Library/Frameworks/Qt3Support.framework/Qt3Support && echo  "/Library/Frameworks" || echo "/sw")
     95    QTHOME := /Library/Frameworks
    8496  endif
    8597  ifndef QTMOC
    86    ifeq ($(QTHOME),/Library/Frameworks)
    87      QTMOC      := /usr/bin/moc
    88    else
    89      QTMOC      := $(QTHOME)/bin/moc
    90    endif
    91   endif
    92 
    93   QT_VERSION := $(shell $(QTMOC) 2>&1 -v | sed 's/.* .Qt \([0-9]\)\..*/\1/' )
    94 
    95   ifndef QTFLAGS
    96     ifeq ($(QT_VERSION),4)
    97       QTFLAGS   := -I $(QTHOME)/QtCore.framework/Headers
    98       QTFLAGS   += -I $(QTHOME)/QtGui.framework/Headers
    99       QTFLAGS   += -I $(QTHOME)/QtOpenGL.framework/Headers
    100       QTFLAGS   += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
     98    ifeq ($(QTHOME),/Library/Frameworks)
     99      QTMOC      := /usr/bin/moc
    101100    else
    102       QTFLAGS   := -I $(QTHOME)/include/Qt -I$(QTHOME)/include
     101      QTMOC      := $(QTHOME)/bin/moc
    103102    endif
    104103  endif
     104  ifndef QTFLAGS
     105    QTFLAGS   := -I $(QTHOME)/QtCore.framework/Headers
     106    QTFLAGS   += -I $(QTHOME)/QtGui.framework/Headers
     107    QTFLAGS   += -I $(QTHOME)/QtOpenGL.framework/Headers
     108    QTFLAGS   += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
     109  endif
    105110  ifndef QTLIBPATH
    106     ifeq ($(QT_VERSION),3)
    107       QTLIBPATH   := $(shell test -d $(QTHOME)/lib/qt3/lib && echo "$(QTHOME)/lib/qt3/lib" || echo "$(QTHOME)/lib" )
     111    ifeq ($(QTHOME),/Library/Frameworks)
     112      QTLIBPATH  := -F$(QTHOME)
    108113    else
    109       QTLIBPATH  := -F$(QTHOME)/lib -F$(QTHOME)
     114      QTLIBPATH  := -F$(QTHOME)/lib
    110115    endif
    111116  endif
    112117  ifndef QTLIBS
    113     ifeq ($(QT_VERSION),3)
    114       QTLIBS   := -L$(QTLIBPATH)
    115       QT3_MT  := $(shell ls  $(QTLIBPATH)/libqt-mt.* 2>/dev/null | wc -l )
    116       ifneq ($(QT3_MT),0)
    117         QTLIBS  += -lqt-mt
    118       else
    119         QTLIBS  += -lqt
    120       endif
    121       QTLIBS   += -lqui
    122     else
    123       QTLIBS    := $(QTLIBPATH) -framework QtCore -framework QtGui
    124     endif
     118    QTLIBS    := $(QTLIBPATH) -framework QtCore -framework QtGui
    125119  endif
    126120  ifndef GLQTLIBS
    127     ifeq ($(QT_VERSION),3)
    128         # already done in QTLIBS
    129         #      GLQTLIBS    := $(QTLIBS)
    130     else
    131       GLQTLIBS    := $(QTLIBPATH) -framework QtCore -framework QtGui
    132       GLQTLIBS    += -framework QtOpenGL
    133     endif
     121    GLQTLIBS    := $(QTLIBPATH) -framework QtCore -framework QtGui
     122    GLQTLIBS    += -framework QtOpenGL
    134123  endif
     124
    135125#----------------------------------------------------------------------------
    136126
Note: See TracChangeset for help on using the changeset viewer.