Ignore:
Timestamp:
Apr 17, 2008, 11:32:32 AM (16 years ago)
Author:
garnier
Message:

r785@wl-72126: garnier | 2008-04-17 11:30:37 +0200
une version qui marche avec les moc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/geant4/config/binmake.gmk

    r689 r776  
    242242          < $(G4LIB)/$(G4SYSTEM)/libname.map; fi)
    243243  else
    244     LDLIBS2 = $(shell \
     244    LDLIBS2 = -DNO_G4INCLUDE_EXEC $(shell \
    245245        G4TMP=$(G4TMP); export G4TMP; \
    246246        if [ \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
     
    282282else
    283283# Again, do not use := or +=.  See note on LDLIBS2 above.
    284   LDLIBS_PREFINAL = $(LDLIBS1) $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
     284  LDLIBS_PREFINAL = $(LDLIBS1) -DLDLIBS2_END $(LDLIBS2) -DLDLIBS2_END $(LDLIBS2EXTRA) $(LDLIBS3)
    285285# Version leaving out EXTRALIBS
    286286  LDLIBS_KERNEL   = $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
    287287endif
    288 LDLIBS_PREFINAL += $(LDLIBS4)
     288LDLIBS_PREFINAL += -DLDLIBS4 $(LDLIBS4) -DLDLIBS_END4
    289289LDLIBS_KERNEL   += $(LDLIBS4)
    290290
     
    308308else
    309309  # Unix
    310   LDLIBS = $(TARGETLIB) $(LDLIBS_PREFINAL)
     310  LDLIBS = $(TARGETLIB) -DLDLIBS_PREFINAL $(LDLIBS_PREFINAL) -DLDLIBS_PREFINAL_END
    311311  OUT   := -o
    312312endif
Note: See TracChangeset for help on using the changeset viewer.