Changeset 893 for trunk/config


Ignore:
Timestamp:
Nov 27, 2008, 4:56:05 PM (16 years ago)
Author:
garnier
Message:

make 3.80 added because 3.81 is bad

Location:
trunk/config
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/config/History

    r886 r893  
    1 $Id: History,v 1.334 2008/11/17 14:49:00 lgarnier Exp $
     1$Id: History,v 1.336 2008/11/26 16:48:14 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     ----------------------------------------------------------
    1818
    19 17th November 2008  Laurent Garnier
    20 - Darwin.gmk
    21  - Try to better find if GL conflicts on Darwin : Should be Ok now. I check the version of the system
     1924th November 2008  Laurent Garnier (config-V09-01-11)
     20- interactivity.gmk: changed flags for OpenGL and QT.
     21- Darwin-g++.gmk, Linux-g++.gmk, WIN32-VC.gmk: major update to Qt setup.
     22- Darwin.gmk: automatically detect GLLIBS for Leopard.
     23- moc.gmk: suppressed echo when compiling.
    2224
    232514th November 2008  Gabriele Cosmo (config-V09-01-10)
    … …  
    293123rd October 2008  Gabriele Cosmo (config-V09-01-08)
    3032- Added "persistency/ascii" sub-module in binmake.gmk.
    31 
    32 15th October 2008  Laurent Garnier
    33 - Darwin.gmk :
    34   - Try to improve Qt config for Darwin :
    35   - No more QTHOME or QTLIBS flags to be set
    36   - Qt3 multithread or not auto select libraries
    37   - Suppress some unuseful link and compil options
    38 
    39 10th October 2008  Laurent Garnier
    40 - Darwin.gmk :
    41  - Remove Xml and Sql library for Qt config
    42  - Try to better find if GL conflicts on Darwin
    43 
    44 8th October 2008  Laurent Garnier
    45 - interactivity.gmk : changing flags for OpenGL and QT
    46 - Darwin-g++.gmk,Linux-g++.gmk,WIN32-VC.gmk : Improvments in those files, and for GLQT libs
    4733
    483411th July 2008  Gabriele Cosmo (config-V09-01-07)

  • trunk/config/moc.gmk

    r850 r893  
    1 # $Id: moc.gmk,v 1.1 2008/05/05 12:48:07 lgarnier Exp $
     1# $Id: moc.gmk,v 1.2 2008/11/24 14:19:44 lgarnier Exp $
    22# ----------------------------------------------------------------
    33# Common part of GNUmakefile for libraries.  John Allison, 5/7/95.
    … …  
    5858        $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ)$(G4TMPDIR)/$(*F)_moc.o moc/$*_moc.cc
    5959else
    60         $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ)$(G4TMPDIR)/$(*F)_moc.o moc/$*_moc.cc
     60        @$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ)$(G4TMPDIR)/$(*F)_moc.o moc/$*_moc.cc
    6161endif
    6262endif

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

    r886 r893  
    7171    endif
    7272  endif
     73
     74# ---- QT Setup block -------------------------------------------------------
    7375  ifndef QTHOME
    7476    QTHOME   := $(shell test -f /Library/Frameworks/Qt3Support.framework/Qt3Support && echo  "/Library/Frameworks" || echo "/sw")
    7577  endif
    76 
    7778  ifndef QTMOC
    7879   ifeq ($(QTHOME),/Library/Frameworks)
    … …  
    115116    endif
    116117  endif
    117 
    118118  ifndef GLQTLIBS
    119119    ifeq ($(QT_VERSION),3)
    … …  
    125125    endif
    126126  endif
     127#----------------------------------------------------------------------------
    127128
    128129  define build-granular-shared-lib
    129130    @libdir=`(cd $(@D);/bin/pwd)`; \
    130131     cd $(G4TMPDIR); \
    131      g++ -dynamiclib -single_module -undefined dynamic_lookup \
     132     $(CXX) -dynamiclib -single_module -undefined dynamic_lookup \
    132133         -o $$libdir/$(@F) $(INTYLIBS) *.o
    133134  endef
    … …  
    135136    @libdir=`(cd $(@D);/bin/pwd)`; \
    136137     cd $(G4TMP)/$(G4SYSTEM); \
    137      g++ -dynamiclib -single_module -undefined dynamic_lookup \
     138     $(CXX) -dynamiclib -single_module -undefined dynamic_lookup \
    138139         -o $$libdir/$(@F) $(INTYLIBS) $(foreach dir,$(SUBLIBS),$(dir)/*.o);
    139140  endef

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

    r886 r893  
    6060    XMLIBS    := -lXm -lXpm
    6161  endif
     62
     63# ---- QT Setup block -------------------------------------------------------
    6264  ifndef QTHOME
    6365    QTHOME     := /usr
    6466  endif
    65 
    6667  ifndef QTMOC
    6768    QTMOC      := $(QTHOME)/bin/moc
    … …  
    8182    endif
    8283  endif
    83 
    84 
    8584  ifndef QTLIBPATH
    8685    QT_SEARCH_LIB1 := $(shell ls  $(QTHOME)/lib/qt$(QT_VERSION)/libq* 2>/dev/null | wc -l )
    … …  
    9392    endif
    9493  endif
    95 
    9694  ifndef QTLIBS
    9795    QTLIBS   := -L$(QTHOME)$(QTLIBPATH)
    … …  
    108106    endif
    109107  endif
    110 
    111108  ifndef GLQTLIBS
    112109    ifeq ($(QT_VERSION),3)
    … …  
    117114    endif
    118115  endif
     116#----------------------------------------------------------------------------
    119117
    120118  ifndef XAWFLAGS

  • trunk/config/sys/WIN32-VC.gmk

    r868 r893  
    5454    endif
    5555  endif
    56   ifndef QTGLLIBS
     56  ifndef GLQTLIBS
    5757    ifeq ($(QT_VERSION),QT3)
    5858      QTLIBS   := -L$(QTHOME)/lib -lqt-mt
Note: See TracChangeset for help on using the changeset viewer.