Changeset 780 for trunk/geant4
- Timestamp:
- Apr 21, 2008, 5:15:00 PM (16 years ago)
- Location:
- trunk/geant4/config
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/config/moc.gmk
r777 r780 13 13 14 14 ifneq ($(G4INTY_BUILD_QT),) 15 # moc_inc := $(shell (grep -l "Q_OBJECT" ../OpenGL/include/*.hh))16 # moc_sources := $(patsubst ../OpenGL/include/%.hh, moc/%_moc.cc, $(moc_inc))17 # moc_tst := $(shell ls -al $(moc_sources) >/Users/garnier/tst)18 15 19 16 moc_dir_name := OpenGL 20 17 moc_inc := $(shell (grep -l "Q_OBJECT" ../$(moc_dir_name)/include/*.hh)) 21 18 moc_sources := $(patsubst ../$(moc_dir_name)/include/%.hh, moc/%_moc.cc, $(moc_inc)) 22 moc_objects := $(patsubst moc/% .cc,$(G4TMPDIR)/%.o,$(moc_sources))23 moc_dependencies := $(patsubst moc/% .cc,$(G4TMPDIR)/%.d,$(moc_sources))19 moc_objects := $(patsubst moc/%_moc.cc,$(G4TMPDIR)/%_moc.o,$(moc_sources)) 20 moc_dependencies := $(patsubst moc/%_moc.cc,$(G4TMPDIR)/%_moc.d,$(moc_sources)) 24 21 endif 25 22 … … 40 37 41 38 ifneq ($(G4INTY_BUILD_QT),) 42 $(G4TMPDIR)/% .d: moc/%.cc39 $(G4TMPDIR)/%_moc.d: moc/%_moc.cc 43 40 @echo Making dependency for moc file $< ... 44 41 @if [ ! -d $(G4TMPDIR) ] ; then mkdir -p $(G4TMPDIR) ;fi … … 58 55 @echo Making moc file for $< ... END 59 56 60 $(G4TMPDIR)/% .o: moc/%_moc.cc57 $(G4TMPDIR)/%_moc.o: moc/%_moc.cc 61 58 @echo Compiling $*.cc ... 62 59 ifdef CPPVERBOSE -
trunk/geant4/config/sys/Darwin-g++.gmk
r776 r780 94 94 @libdir=`(cd $(@D);/bin/pwd)`; \ 95 95 cd $(G4TMPDIR); \ 96 echo $(INTYLIBS); \97 96 g++ -dynamiclib -single_module -undefined dynamic_lookup \ 98 97 -o $$libdir/$(@F) $(INTYLIBS) *.o
Note: See TracChangeset
for help on using the changeset viewer.