Changeset 787
- Timestamp:
- Apr 22, 2008, 6:00:54 PM (16 years ago)
- Location:
- trunk/geant4/config
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/config/G4UI_USE.gmk
r766 r787 66 66 CPPFLAGS += -DG4UI_USE_QT 67 67 INTYLIBS += -DG4UI_USE_QT 68 else69 INTYLIBS += -DNO_G4VIS_USE_OIQT70 68 endif 71 69 -
trunk/geant4/config/binmake.gmk
r776 r787 242 242 < $(G4LIB)/$(G4SYSTEM)/libname.map; fi) 243 243 else 244 LDLIBS2 = -DNO_G4INCLUDE_EXEC$(shell \244 LDLIBS2 = $(shell \ 245 245 G4TMP=$(G4TMP); export G4TMP; \ 246 246 if [ \( -f $(G4LIB)/$(G4SYSTEM)/liblist \ … … 282 282 else 283 283 # Again, do not use := or +=. See note on LDLIBS2 above. 284 LDLIBS_PREFINAL = $(LDLIBS1) -DLDLIBS2_END $(LDLIBS2) -DLDLIBS2_END$(LDLIBS2EXTRA) $(LDLIBS3)284 LDLIBS_PREFINAL = $(LDLIBS1) $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3) 285 285 # Version leaving out EXTRALIBS 286 286 LDLIBS_KERNEL = $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3) 287 287 endif 288 LDLIBS_PREFINAL += -DLDLIBS4 $(LDLIBS4) -DLDLIBS_END4288 LDLIBS_PREFINAL += $(LDLIBS4) 289 289 LDLIBS_KERNEL += $(LDLIBS4) 290 290 … … 308 308 else 309 309 # Unix 310 LDLIBS = $(TARGETLIB) -DLDLIBS_PREFINAL $(LDLIBS_PREFINAL) -DLDLIBS_PREFINAL_END310 LDLIBS = $(TARGETLIB) $(LDLIBS_PREFINAL) 311 311 OUT := -o 312 312 endif -
trunk/geant4/config/common.gmk
r782 r787 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 … … 49 50 $(G4LIBDIR)/lib$(name).$(SHEXT): $(G4TMPDIR)/obj.last 50 51 @if [ ! -d $(G4LIBDIR) ] ; then mkdir $(G4LIBDIR) ;fi 51 @echo Creating shared library $@ ... $(objects)52 @echo Creating shared library $@ ... 52 53 @$(RM) $@ 53 54 # use architecture specific macro defined in sys/$(G4SYSTEM).gmk -
trunk/geant4/config/interactivity.gmk
r776 r787 36 36 # Should be before X11. 37 37 ifdef LOAD_GLQT 38 INTYLIBS += -D LOAD_GLQT $(GLQTLIBS) -D END_OF_LOAD_GLQT38 INTYLIBS += $(GLQTLIBS) 39 39 endif 40 40 … … 45 45 endif 46 46 ifdef LOAD_GL 47 INTYLIBS += -D_LOAD_GL $(OGLLIBS) -D_LOAD_GL 48 else 49 INTYLIBS += -D_NO_LOAD_GL 47 INTYLIBS += $(OGLLIBS) 50 48 endif 51 49
Note: See TracChangeset
for help on using the changeset viewer.