Changeset 850 for trunk/config
- Timestamp:
- Sep 10, 2008, 5:40:37 PM (16 years ago)
- Location:
- trunk/config
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/config/G4UI_USE.gmk
r794 r850 1 # $Id: G4UI_USE.gmk,v 1.1 0 2008/04/30 10:40:12 lgarnierExp $1 # $Id: G4UI_USE.gmk,v 1.12 2008/05/14 09:48:19 gbarrand Exp $ 2 2 # ------------------------------------------------------------- 3 3 # GNUmakefile for CPPFLAGS for interfaces USE phase. … … 81 81 endif 82 82 83 ifdef G4UI_USE_OSC 84 CPPFLAGS += -DG4UI_USE_OSC 85 ifneq (,$(findstring WIN32-VC,$(G4SYSTEM))) 86 # need a syntax that both g++ and CL.exe understand : 87 G4OSC_TMP_1 := $(shell echo "`osc-config --g4lab_incs`") 88 CPPFLAGS += $(patsubst /I%,-I"%",$(G4OSC_TMP_1)) 89 else 90 CPPFLAGS += `osc-config --g4lab_incs` 91 endif 92 INTYLIBS += `osc-config --g4lab_libs` 93 INTYLIBS += `osc-config --iv_libs` 94 # 95 ifndef G4ANALYSIS_AIDA_CONFIG_CFLAGS 96 ifneq (,$(findstring WIN32-VC,$(G4SYSTEM))) 97 # need a syntax that both g++ and CL.exe understand : 98 G4OSC_TMP_2 := $(shell echo "`aida-config --include`") 99 G4ANALYSIS_AIDA_CONFIG_CFLAGS := $(patsubst /I%,-I"%",$(G4OSC_TMP_2)) 100 endif 101 endif 102 endif 103 83 104 ########################### interfaces/XVT - not currently implemented ##### 84 105 -
trunk/config/History
r790 r850 1 $Id: History,v 1.32 0 2008/04/30 10:40:12 lgarnierExp $1 $Id: History,v 1.325 2008/07/11 15:42:35 gcosmo Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 17 17 ---------------------------------------------------------- 18 18 19 11th July 2008 Gabriele Cosmo (config-V09-01-07) 20 - architecture.gmk: removed obsoled DOM library from GDMLIBS. 21 22 12th June 2008 Gabriele Cosmo (config-V09-01-06) 23 - Linux-g++.gmk: added G4OPTDEBUG flag for "-O2 -g" combined compilation. 24 - AIX-xlC.gmk: added shared libs section as for Linux-g++ according to user 25 suggestion on HN. 26 27 9th June 2008 Gabriele Cosmo (config-V09-01-05) 28 - Integrated improvements to Qt setup and AIDA. 29 Restored Qt libs setup to include GL as default. 30 31 20th May 2008 Gunter Folger (config-V09-01-04) 32 - liblist.c: removed C++ style comments. 33 - Not including changes made after "config-V09-01-03 ". 34 35 13th May 2008 Guy Barrand 36 - G4UI_USE.gmk: added material (protected with G4UI_USE_OSC) to use osc_vis 37 binary kits built with the Geant4 drivers. It allows to use the G4Lab::UIOnX 38 G4 session in Geant4 (G4Lab::UIOnX allows for visualization and AIDA plotting 39 within the same GUI). 40 - analysis.gmk: added default setup aida-config for flags 41 G4ANALYSIS_AIDA_CONFIG_CFLAGS and G4ANALYSIS_AIDA_CONFIG_LIBS. 42 19 43 30th April 2008 Laurent Garnier 20 - common.gmk : Better Qt moc files integration21 - moc.gmk : Add a file for Qt moc files configuration22 - G4UI_USE, G4VIS_USE, interactivity, sys/*: Separation of QT with OpenGL23 or without44 - common.gmk: simplified Qt moc files integration. 45 - moc.gmk: new configuration file for Qt moc files setup. 46 - G4UI_USE, G4VIS_USE, interactivity, sys/*: separation of Qt with or 47 without OpenGL. 24 48 25 49 3rd April 2008 Gabriele Cosmo (config-V09-01-03) -
trunk/config/analysis.gmk
r472 r850 8 8 ifdef G4ANALYSIS_USE 9 9 CPPFLAGS += -DG4ANALYSIS_USE 10 ifndef G4ANALYSIS_AIDA_CONFIG_CFLAGS 11 ifneq (,$(findstring WIN32-VC,$(G4SYSTEM))) 12 # The "aida-config --include" for VC may return information 13 # by using the Windows /I syntax which is not understood 14 # by "g++ -M" used by the Geant4 make system to get dependencies. 15 # Then we transform to use the -I syntax which is understood by 16 # both g++ and CL.exe compilers : 17 G4ANALYSIS_TMP := $(shell echo "`aida-config --include`") 18 G4ANALYSIS_AIDA_CONFIG_CFLAGS := $(patsubst /I%,-I"%",$(G4ANALYSIS_TMP)) 19 else 20 G4ANALYSIS_AIDA_CONFIG_CFLAGS := `aida-config --include` 21 endif 22 endif 23 ifndef G4ANALYSIS_AIDA_CONFIG_LIBS 24 G4ANALYSIS_AIDA_CONFIG_LIBS := `aida-config --lib` 25 endif 10 26 CPPFLAGS += $(G4ANALYSIS_AIDA_CONFIG_CFLAGS) 11 27 ANALYSISLIBS += $(G4ANALYSIS_AIDA_CONFIG_LIBS) -
trunk/config/architecture.gmk
r689 r850 1 # $Id: architecture.gmk,v 1.11 4 2007/12/11 13:20:29gcosmo Exp $1 # $Id: architecture.gmk,v 1.115 2008/07/11 15:40:14 gcosmo Exp $ 2 2 # ------------------------------------------------------------------------ 3 3 # GEANT 4 - Architecture configuration script for GNU Make … … 270 270 ifndef GDMLLIBS 271 271 ifneq (,$(findstring WIN32-VC,$(G4SYSTEM))) 272 GDMLLIBS := $(LIB_PATH)$(XERCESCROOT)/lib xerces- depdom_2.lib xerces-c_2.lib272 GDMLLIBS := $(LIB_PATH)$(XERCESCROOT)/lib xerces-c_2.lib 273 273 else 274 GDMLLIBS := -L$(XERCESCROOT)/lib -lxerces- depdom -lxerces-c274 GDMLLIBS := -L$(XERCESCROOT)/lib -lxerces-c 275 275 endif 276 276 endif -
trunk/config/interactivity.gmk
r787 r850 32 32 INTYLIBS += $(QTLIBS) 33 33 endif 34 35 ########################### Open GL Qt ###############################36 # Should be before X11.37 34 ifdef LOAD_GLQT 38 INTYLIBS += $( GLQTLIBS)35 INTYLIBS += $(QTLIBS) 39 36 endif 40 37 -
trunk/config/liblist.c
r761 r850 1 /* $Id: liblist.c,v 1.2 0 2008/04/03 17:26:36gunter Exp $ */1 /* $Id: liblist.c,v 1.21 2008/05/20 13:33:34 gunter Exp $ */ 2 2 3 3 /* … … 208 208 exit(1); 209 209 } 210 /* discarded trailing \n, as gets() was doing */ 210 211 if ( buffer[strlen(buffer)-1] == '\n') 211 { buffer[strlen(buffer)-1]='\0'; } // when gets() was used, this discarded trailing \n212 { buffer[strlen(buffer)-1]='\0'; } 212 213 213 214 ptr=strtok(buffer,":\n"); … … 268 269 exit(1); 269 270 } 271 /* discarded trailing \n, as gets() was doing */ 270 272 if ( buffer[strlen(buffer)-1] == '\n') 271 { buffer[strlen(buffer)-1]='\0'; } // when gets() was used, this discarded trailing \n273 { buffer[strlen(buffer)-1]='\0'; } 272 274 273 275 ptr=strtok(buffer,"/"); -
trunk/config/moc.gmk
r781 r850 1 # $Id: common.gmk,v 1.51 2008/04/04 10:35:20 gcosmoExp $1 # $Id: moc.gmk,v 1.1 2008/05/05 12:48:07 lgarnier Exp $ 2 2 # ---------------------------------------------------------------- 3 3 # Common part of GNUmakefile for libraries. John Allison, 5/7/95.
Note: See TracChangeset
for help on using the changeset viewer.