Changeset 777 for trunk/geant4
- Timestamp:
- Apr 21, 2008, 11:30:16 AM (16 years ago)
- Location:
- trunk/geant4
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/config/G4VIS_USE.gmk
r776 r777 60 60 G4VIS_USE_OPENGL = 1 61 61 CPPFLAGS += -DG4VIS_USE_OPENGLQT 62 VISLIBS += -lG4OpenGL_moc 62 VISLIBS += -lG4OpenGL 63 INC_GL = 1 63 64 INC_QT = 1 64 65 LOAD_GLQT = 1 65 INTYLIBS += -DG4VIS_USE_OIQT66 else67 INTYLIBS += -DNO_G4VIS_USE_OIQT68 66 endif 69 67 ifdef G4VIS_USE_OPENGLWIN32 … … 76 74 CPPFLAGS += -I$(G4BASE)/visualization/OpenGL/include 77 75 endif 78 VISLIBS += -l XX -lG4OpenGL -lXX76 VISLIBS += -lG4OpenGL 79 77 INC_GL = 1 80 78 LOAD_GL = 1 … … 91 89 CPPFLAGS += -DG4VIS_USE_OIQT 92 90 INC_QT = 1 93 LOAD_ GLQT = 191 LOAD_QT = 1 94 92 endif 95 93 ifdef G4VIS_USE_OIWIN32 -
trunk/geant4/config/common.gmk
r776 r777 13 13 sources := $(wildcard src/*.cc) 14 14 15 objects := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources)) 16 17 dependencies := $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources)) 18 15 19 #ifneq ($(G4INTY_BUILD_QT),) 16 20 sources += $(moc_sources) 21 objects += $(moc_objects) 22 dependencies += $(moc_dependencies) 17 23 #endif 18 19 objects := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))20 moc_tst := $(shell ls -al * >/Users/garnier/tst)21 22 dependencies := $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources))23 24 24 25 g4libraries_to_build := … … 48 49 $(G4LIBDIR)/lib$(name).$(SHEXT): $(G4TMPDIR)/obj.last 49 50 @if [ ! -d $(G4LIBDIR) ] ; then mkdir $(G4LIBDIR) ;fi 50 @echo Creating shared library $@ ... 51 @echo Creating shared library $@ ... $(objects) 51 52 @$(RM) $@ 52 53 # use architecture specific macro defined in sys/$(G4SYSTEM).gmk -
trunk/geant4/config/moc.gmk
r776 r777 13 13 14 14 ifneq ($(G4INTY_BUILD_QT),) 15 moc_inc := $(shell (grep -l "Q_OBJECT" ../$(dirMoc)/include/*.hh))16 moc_tst := $(shell ls -al testMoc.gmk)17 moc_sources := $(patsubst ../$(dirMoc)/include/%.hh, src/%_moc.cc, $(moc_inc))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 18 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))22 # moc_tst := $(shell ls -al $(moc_inc) >/Users/garnier/tst)23 # moc_sources := $(patsubst ../$(moc_dir_name)/include/%.hh, src/%_moc.cc, $(moc_inc))19 moc_dir_name := OpenGL 20 moc_inc := $(shell (grep -l "Q_OBJECT" ../$(moc_dir_name)/include/*.hh)) 21 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)) 24 24 endif 25 25 … … 40 40 41 41 ifneq ($(G4INTY_BUILD_QT),) 42 src/%_moc.cc: ../$(dirMoc)/include/%.hh 42 $(G4TMPDIR)/%.d: moc/%.cc 43 @echo Making dependency for moc file $< ... 44 @if [ ! -d $(G4TMPDIR) ] ; then mkdir -p $(G4TMPDIR) ;fi 45 @set -e;\ 46 g++ $(GPPFLAGS) $(CPPFLAGS) -w -xc++ $< |\ 47 sed 's!$*\.o!$(G4TMPDIR)/& $@!' >$@;\ 48 [ -s $@ ] || rm -f $@ 49 @echo Making dependency for moc file $< ... END 50 51 moc/%_moc.cc: include/%.hh 43 52 @echo Making moc file for $< ... 53 @if [ ! -d moc ] ; then mkdir -p moc ;fi 44 54 @if [ `$(QTMOC) -v 2>&1 | grep "Qt 3" | wc -l ` -gt 0 ]; then \ 45 55 $(QTMOC) -o $@ $<;\ 46 56 else $(QTMOC) $(MOC_MACRO) -o $@ $<; \ 47 57 fi; 58 @echo Making moc file for $< ... END 48 59 49 src/%.cc: 50 @echo Making toto $< ... 51 @if [ ! -d $(G4TMPDIR) ] ; then mkdir -p $(G4TMPDIR) ;fi 52 60 $(G4TMPDIR)/%.o: moc/%_moc.cc 61 @echo Compiling $*.cc ... 62 ifdef CPPVERBOSE 63 @echo Compiling moc file $*.cc ... 64 $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ)$(G4TMPDIR)/$(*F)_moc.o moc/$*_moc.cc 65 else 66 @echo Compiling moc file $*.cc ... 67 @$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ)$(G4TMPDIR)/$(*F)_moc.o moc/$*_moc.cc 53 68 endif 69 endif -
trunk/geant4/visualization/GNUmakefile
r776 r777 46 46 SUBLIBS += G4OpenGL 47 47 endif 48 ifdef G4VIS_BUILD_OPENGLQT_DRIVER49 SUBDIRS += OpenGL_moc50 SUBLIBS += G4OpenGL_moc51 endif52 48 ifdef G4VIS_BUILD_OI_DRIVER 53 49 SUBDIRS += OpenInventor -
trunk/geant4/visualization/OpenGL/GNUmakefile
r776 r777 6 6 G4INSTALL = ../../.. 7 7 endif 8 9 10 # Definition of macro for moc files (for Qt use only) 11 MOC_MACRO = -DG4VIS_BUILD_OPENGLQT_DRIVER 8 12 9 13 GLOBLIBS = libG4vis_management.lib libG4modeling.lib … … 31 35 CPPFLAGS += -I$(G4BASE)/digits_hits/hits/include 32 36 37 include $(G4INSTALL)/config/moc.gmk 33 38 include $(G4INSTALL)/config/common.gmk
Note: See TracChangeset
for help on using the changeset viewer.