Changeset 776 for trunk/geant4/config

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

Location:

trunk/geant4/config

Files:

• G4VIS_USE.gmk (modified) (1 diff)
• binmake.gmk (modified) (3 diffs)
• common.gmk (modified) (4 diffs)
• interactivity.gmk (modified) (1 diff)
• moc.gmk (modified) (1 diff)
• sys/Darwin-g++.gmk (modified) (2 diffs)

trunk/geant4/config/G4VIS_USE.gmk

@@ -76 +76 @@
     CPPFLAGS += -I$(G4BASE)/visualization/OpenGL/include
   endif
-  VISLIBS  += -lG4OpenGL
+  VISLIBS  += -lXX -lG4OpenGL -lXX
   INC_GL    = 1
   LOAD_GL   = 1

trunk/geant4/config/binmake.gmk

@@ -242 +242 @@
           < $(G4LIB)/$(G4SYSTEM)/libname.map; fi)
   else
-    LDLIBS2 = $(shell \
+    LDLIBS2 = -DNO_G4INCLUDE_EXEC $(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) $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
+  LDLIBS_PREFINAL = $(LDLIBS1) -DLDLIBS2_END $(LDLIBS2) -DLDLIBS2_END $(LDLIBS2EXTRA) $(LDLIBS3)
 # Version leaving out EXTRALIBS 
   LDLIBS_KERNEL   = $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
 endif
-LDLIBS_PREFINAL += $(LDLIBS4)
+LDLIBS_PREFINAL += -DLDLIBS4 $(LDLIBS4) -DLDLIBS_END4
 LDLIBS_KERNEL   += $(LDLIBS4)
 
@@ -308 +308 @@
 else
   # Unix
-  LDLIBS = $(TARGETLIB) $(LDLIBS_PREFINAL)
+  LDLIBS = $(TARGETLIB) -DLDLIBS_PREFINAL $(LDLIBS_PREFINAL) -DLDLIBS_PREFINAL_END 
   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
@@ -14 +13 @@
 sources := $(wildcard src/*.cc)
 
-ifneq ($(G4INTY_BUILD_QT),)
-  moc_inc = $(shell grep -l "Q_OBJECT" include/*.hh )
-  moc_files := $(patsubst include/%.hh, src/%_moc.cc, $(moc_inc))
-  sources += $(moc_files)
-endif
+#ifneq ($(G4INTY_BUILD_QT),)
+  sources += $(moc_sources)
+#endif
 
 objects := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))
+moc_tst := $(shell ls -al * >/Users/garnier/tst)
+
 dependencies := $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources))
 
@@ -68 +67 @@
 endif
 
-###############################################################################
-#
-# Actual moc files for Qt files
-#
-# moc sources and headers: used for Qt signal/slot 
-# - all headers which use signals/slots have the macro "Q_OBJECT" present
-#   in the class definitions; these all need to be processed by the
-#   "meta object compiler (moc)" which generates extra source code to
-#   implement the signal/slots, i.e., if "foo.h" contains the token "Q_OBJECT"
-#   it will be used by moc to generate the file "foo_moc.cpp" (the _moc. is
-#   just an arbitrary extension to make it easier to identify sources
-#   generated by moc).
-
-ifneq ($(G4INTY_BUILD_QT),)
-src/%_moc.cc: include/%.hh
-        @echo Making moc file for $< ...
-        @if [ `$(QTHOME)/bin/moc -v 2>&1 | grep "Qt 3" | wc -l ` -gt 0 ]; then \
-        $(QTMOC) -o $@ $<;\
-        else $(QTMOC) $(MOC_MACRO) -o $@ $<; \
-        fi;
-endif
 
 ###############################################################################
@@ -105 +83 @@
 # .PHONY targets are executed regardless of time-stamp of any file of
 # same name.
-.PHONY: all moc_inc obj lib clean clean_libs includes
+.PHONY: all obj lib clean clean_libs includes
 
 obj: $(G4TMPDIR)/obj.last

trunk/geant4/config/interactivity.gmk

@@ -36 +36 @@
 # Should be before X11.
 ifdef LOAD_GLQT
-  INTYLIBS += $(GLQTLIBS)
+  INTYLIBS += -D LOAD_GLQT $(GLQTLIBS) -D END_OF_LOAD_GLQT
 endif
 

trunk/geant4/config/moc.gmk

@@ -42 +42 @@
 src/%_moc.cc: ../$(dirMoc)/include/%.hh
         @echo Making moc file for $< ...
-        @if [ `$(QTHOME)/bin/moc -v 2>&1 | grep "Qt 3" | wc -l ` -gt 0 ]; then \
+        @if [ `$(QTMOC) -v 2>&1 | grep "Qt 3" | wc -l ` -gt 0 ]; then \
         $(QTMOC) -o $@ $<;\
         else $(QTMOC) $(MOC_MACRO) -o $@ $<; \

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

@@ -79 +79 @@
   ifndef QTLIBS
     QT3LIBS    := -L$(QTHOME)/lib -lqt -lqui
-    QT4LIBS    := -F$(QTHOME)/lib -framework QtCore -framework QtGui
-    QT4LIBS    += -framework -framework QtSql -framework QtXml
+    QT4LIBS    := -D111 -F$(QTHOME)/lib -framework QtCore -framework QtGui -D111_END
+    QT4LIBS    += -framework QtSql -framework QtXml
     QTLIBS     := $(shell test -f $(QTHOME)/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS))
   endif
@@ -87 +87 @@
     QT3LIBS    := -L$(QTHOME)/lib -lqt -lqui
     QT4LIBS    := -F$(QTHOME) -framework QtCore -framework QtGui
-    QT4LIBS    += -framework QtOpenGL -framework QtSql -framework QtXml
-    QTLIBS     := $(shell test -f $(QTHOME)/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS))
+    QT4LIBS    += -D GLQTLIBS -framework QtOpenGL -framework QtSql -framework QtXml -D ENDOF_GLQTLIBS
+    GLQTLIBS     := $(shell test -f $(QTHOME)/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS))
   endif