Changeset 766 for trunk/geant4
- Timestamp:
- Apr 15, 2008, 3:38:47 PM (16 years ago)
- Location:
- trunk/geant4/config
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/config/G4UI_USE.gmk
r593 r766 65 65 LOAD_QT = 1 66 66 CPPFLAGS += -DG4UI_USE_QT 67 INTYLIBS += -DG4UI_USE_QT 68 else 69 INTYLIBS += -DNO_G4VIS_USE_OIQT 67 70 endif 68 71 -
trunk/geant4/config/G4VIS_USE.gmk
r761 r766 62 62 VISLIBS += -lG4OpenGL_moc 63 63 INC_QT = 1 64 LOAD_GLQT = 1 65 INTYLIBS += -DG4VIS_USE_OIQT 66 else 67 INTYLIBS += -DNO_G4VIS_USE_OIQT 64 68 endif 65 69 ifdef G4VIS_USE_OPENGLWIN32 … … 87 91 CPPFLAGS += -DG4VIS_USE_OIQT 88 92 INC_QT = 1 89 LOAD_ QT = 193 LOAD_GLQT = 1 90 94 endif 91 95 ifdef G4VIS_USE_OIWIN32 -
trunk/geant4/config/common.gmk
r761 r766 5 5 # Libraries are created according to G4SYSTEM. G.Cosmo, 11/6/96. 6 6 # Introduced G4LIBDIR and G4TMPDIR. G.Cosmo, 23/6/98. 7 # Introduced Qt moc rule, L.Garnier 15/2/08. 7 8 8 9 ifndef G4LIBDIR … … 14 15 15 16 ifneq ($(G4INTY_BUILD_QT),) 16 sources += $(moc_sources) 17 moc_inc = $(shell grep -l "Q_OBJECT" include/*.hh ) 18 moc_files := $(patsubst include/%.hh, src/%_moc.cc, $(moc_inc)) 19 sources += $(moc_files) 17 20 endif 18 21 … … 65 68 endif 66 69 70 ############################################################################### 71 # 72 # Actual moc files for Qt files 73 # 74 # moc sources and headers: used for Qt signal/slot 75 # - all headers which use signals/slots have the macro "Q_OBJECT" present 76 # in the class definitions; these all need to be processed by the 77 # "meta object compiler (moc)" which generates extra source code to 78 # implement the signal/slots, i.e., if "foo.h" contains the token "Q_OBJECT" 79 # it will be used by moc to generate the file "foo_moc.cpp" (the _moc. is 80 # just an arbitrary extension to make it easier to identify sources 81 # generated by moc). 82 83 ifneq ($(G4INTY_BUILD_QT),) 84 src/%_moc.cc: include/%.hh 85 @echo Making moc file for $< ... 86 @if [ `$(QTHOME)/bin/moc -v 2>&1 | grep "Qt 3" | wc -l ` -gt 0 ]; then \ 87 $(QTMOC) -o $@ $<;\ 88 else $(QTMOC) $(MOC_MACRO) -o $@ $<; \ 89 fi; 90 endif 67 91 68 92 ############################################################################### … … 81 105 # .PHONY targets are executed regardless of time-stamp of any file of 82 106 # same name. 83 .PHONY: all obj lib clean clean_libs includes107 .PHONY: all moc_inc obj lib clean clean_libs includes 84 108 85 109 obj: $(G4TMPDIR)/obj.last -
trunk/geant4/config/interactivity.gmk
r758 r766 33 33 endif 34 34 35 ########################### Open GL Qt ############################### 36 # Should be before X11. 37 ifdef LOAD_GLQT 38 INTYLIBS += $(GLQTLIBS) 39 endif 40 35 41 ########################### OpenGL ############################### 36 42 … … 39 45 endif 40 46 ifdef LOAD_GL 41 INTYLIBS += $(OGLLIBS) 47 INTYLIBS += -D_LOAD_GL $(OGLLIBS) -D_LOAD_GL 48 else 49 INTYLIBS += -D_NO_LOAD_GL 42 50 endif 43 51 -
trunk/geant4/config/moc.gmk
r762 r766 5 5 # Libraries are created according to G4SYSTEM. G.Cosmo, 11/6/96. 6 6 # Introduced G4LIBDIR and G4TMPDIR. G.Cosmo, 23/6/98. 7 # Introduced Qt moc rule, L.Garnier 1 5/2/08.7 # Introduced Qt moc rule, L.Garnier 16/2/08. 8 8 9 9 ifndef G4LIBDIR … … 13 13 14 14 ifneq ($(G4INTY_BUILD_QT),) 15 # dirMoc := OpenGL 16 moc_dir_name := $(patsubst G4%_moc, ../%, $(name)) 17 moc_inc := $(shell grep -l "Q_OBJECT" ../$(dirMoc)/include/*.hh) 15 moc_inc := $(shell (grep -l "Q_OBJECT" ../$(dirMoc)/include/*.hh)) 16 moc_tst := $(shell ls -al testMoc.gmk) 18 17 moc_sources := $(patsubst ../$(dirMoc)/include/%.hh, src/%_moc.cc, $(moc_inc)) 19 18 20 # moc_inc := $(shell grep -l "Q_OBJECT" $(moc_dir_name)/include/*.hh) 19 # moc_dir_name := $(patsubst G4%_moc, %, $(name)) 20 # moc_tst := $(shell ls -al ../$(moc_dir_name) >/Users/garnier/tst) 21 # moc_inc := $(shell (grep -l "Q_OBJECT" ../$(moc_dir_name)/include/*.hh)) 21 22 # moc_tst := $(shell ls -al $(moc_inc) >/Users/garnier/tst) 22 # moc_sources := $(patsubst $(moc_dir_name)/include/%.hh, src/%_moc.cc, $(moc_inc))23 # moc_sources := $(patsubst ../$(moc_dir_name)/include/%.hh, src/%_moc.cc, $(moc_inc)) 23 24 endif 24 25 … … 39 40 40 41 ifneq ($(G4INTY_BUILD_QT),) 41 src/%_moc.cc: include/%.hh42 src/%_moc.cc: ../$(dirMoc)/include/%.hh 42 43 @echo Making moc file for $< ... 43 44 @if [ `$(QTHOME)/bin/moc -v 2>&1 | grep "Qt 3" | wc -l ` -gt 0 ]; then \ … … 46 47 fi; 47 48 48 src/%.cc: src/%_moc.cc49 src/%.cc: 49 50 @echo Making toto $< ... 50 51 @if [ ! -d $(G4TMPDIR) ] ; then mkdir -p $(G4TMPDIR) ;fi -
trunk/geant4/config/sys/Darwin-g++.gmk
r758 r766 80 80 QT3LIBS := -L$(QTHOME)/lib -lqt -lqui 81 81 QT4LIBS := -F$(QTHOME)/lib -framework QtCore -framework QtGui 82 QT4LIBS += -framework -framework QtSql -framework QtXml 83 QTLIBS := $(shell test -f $(QTHOME)/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS)) 84 endif 85 86 ifndef GLQTLIBS 87 QT3LIBS := -L$(QTHOME)/lib -lqt -lqui 88 QT4LIBS := -F$(QTHOME) -framework QtCore -framework QtGui 82 89 QT4LIBS += -framework QtOpenGL -framework QtSql -framework QtXml 83 QTLIBS := $(shell test -f $(QTHOME)/ lib/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS))90 QTLIBS := $(shell test -f $(QTHOME)/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS)) 84 91 endif 85 92 … … 87 94 @libdir=`(cd $(@D);/bin/pwd)`; \ 88 95 cd $(G4TMPDIR); \ 96 echo $(INTYLIBS); \ 89 97 g++ -dynamiclib -single_module -undefined dynamic_lookup \ 90 98 -o $$libdir/$(@F) $(INTYLIBS) *.o
Note: See TracChangeset
for help on using the changeset viewer.