Changeset 787 for trunk/geant4/config

Timestamp:

Apr 22, 2008, 6:00:54 PM (16 years ago)

Author:

garnier

Message:

r806@wl-72126: garnier | 2008-04-22 18:00:13 +0200
mise a jour

Location:

trunk/geant4/config

Files:

• G4UI_USE.gmk (modified) (1 diff)
• binmake.gmk (modified) (3 diffs)
• common.gmk (modified) (2 diffs)
• interactivity.gmk (modified) (2 diffs)

trunk/geant4/config/G4UI_USE.gmk

@@ -66 +66 @@
   CPPFLAGS += -DG4UI_USE_QT
   INTYLIBS += -DG4UI_USE_QT
-else
-  INTYLIBS += -DNO_G4VIS_USE_OIQT
 endif
 

trunk/geant4/config/binmake.gmk

@@ -242 +242 @@
           < $(G4LIB)/$(G4SYSTEM)/libname.map; fi)
   else
-    LDLIBS2 = -DNO_G4INCLUDE_EXEC $(shell \
+    LDLIBS2 = $(shell \
         G4TMP=$(G4TMP); export G4TMP; \
         if [ \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
@@ -282 +282 @@
 else
 # Again, do not use := or +=.  See note on LDLIBS2 above.
-  LDLIBS_PREFINAL = $(LDLIBS1) -DLDLIBS2_END $(LDLIBS2) -DLDLIBS2_END $(LDLIBS2EXTRA) $(LDLIBS3)
+  LDLIBS_PREFINAL = $(LDLIBS1) $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
 # Version leaving out EXTRALIBS 
   LDLIBS_KERNEL   = $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
 endif
-LDLIBS_PREFINAL += -DLDLIBS4 $(LDLIBS4) -DLDLIBS_END4
+LDLIBS_PREFINAL += $(LDLIBS4)
 LDLIBS_KERNEL   += $(LDLIBS4)
 
@@ -308 +308 @@
 else
   # Unix
-  LDLIBS = $(TARGETLIB) -DLDLIBS_PREFINAL $(LDLIBS_PREFINAL) -DLDLIBS_PREFINAL_END 
+  LDLIBS = $(TARGETLIB) $(LDLIBS_PREFINAL)
   OUT   := -o 
 endif

trunk/geant4/config/common.gmk

@@ -5 +5 @@
 # Libraries are created according to G4SYSTEM. G.Cosmo, 11/6/96.
 # Introduced G4LIBDIR and G4TMPDIR. G.Cosmo, 23/6/98.
+# Introduced Qt moc rule, L.Garnier 15/2/08.
 
 ifndef G4LIBDIR
@@ -49 +50 @@
 $(G4LIBDIR)/lib$(name).$(SHEXT): $(G4TMPDIR)/obj.last
         @if [ ! -d $(G4LIBDIR) ] ; then mkdir $(G4LIBDIR) ;fi
-        @echo Creating shared library $@ ... $(objects)
+        @echo Creating shared library $@ ...
         @$(RM) $@
 #      use architecture specific macro defined in sys/$(G4SYSTEM).gmk

trunk/geant4/config/interactivity.gmk

@@ -36 +36 @@
 # Should be before X11.
 ifdef LOAD_GLQT
-  INTYLIBS += -D LOAD_GLQT $(GLQTLIBS) -D END_OF_LOAD_GLQT
+  INTYLIBS += $(GLQTLIBS)
 endif
 
@@ -45 +45 @@
 endif
 ifdef LOAD_GL
-  INTYLIBS += -D_LOAD_GL $(OGLLIBS) -D_LOAD_GL
-else
-  INTYLIBS += -D_NO_LOAD_GL
+  INTYLIBS += $(OGLLIBS)
 endif