- Timestamp:
- Nov 18, 2009, 4:07:45 PM (15 years ago)
- Location:
- trunk/config
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/config/G4VIS_BUILD.gmk
r593 r1185 1 # $Id: G4VIS_BUILD.gmk,v 1.2 0 2007/10/03 12:15:05 lgarnierExp $1 # $Id: G4VIS_BUILD.gmk,v 1.22 2009/11/05 10:06:54 allison Exp $ 2 2 # ------------------------------------------------------------- 3 3 # Visualization-specific CPPFLAGS for BUILD phase. … … 14 14 # G4VIS_BUILD_ASCIITREE_DRIVER 15 15 # G4VIS_BUILD_DAWNFILE_DRIVER 16 # G4VIS_BUILD_G AGTREE_DRIVER16 # G4VIS_BUILD_GMOCRENFILE_DRIVER 17 17 # G4VIS_BUILD_HEPREPFILE_DRIVER 18 18 # G4VIS_BUILD_RAYTRACER_DRIVER -
trunk/config/G4VIS_USE.gmk
r1173 r1185 1 # $Id: G4VIS_USE.gmk,v 1.2 7 2009/11/05 10:06:54 allisonExp $1 # $Id: G4VIS_USE.gmk,v 1.28 2009/11/17 11:34:56 gcosmo Exp $ 2 2 # ------------------------------------------------------------- 3 3 # GNUmakefile for CPPFLAGS for visualization USE phase. … … 41 41 CPPFLAGS += -I$(G4BASE)/visualization/Tree/include 42 42 CPPFLAGS += -I$(G4BASE)/visualization/VRML/include 43 CPPFLAGS += -I$(G4BASE)/visualization/Tree/include44 CPPFLAGS += -I$(G4BASE)/visualization/gMocren/include45 43 endif 46 44 … … 112 110 endif 113 111 114 ifdef G4LIB_USE_GL2PS115 ifneq ($(G4INCLUDE_EXEC),1)116 CPPFLAGS += -I$(G4BASE)/visualization/externals/gl2ps/include117 endif118 VISLIBS += -lG4gl2ps119 endif120 121 112 ifdef G4VIS_USE_RAYTRACERX 122 113 CPPFLAGS += -DG4VIS_USE_RAYTRACERX … … 129 120 CPPFLAGS += -DG4VIS_USE_VRML 130 121 # CPPFLAGS += -I... and VISLIBS += set above. 122 endif 123 124 ifdef G4LIB_USE_GL2PS 125 ifneq ($(G4INCLUDE_EXEC),1) 126 CPPFLAGS += -I$(G4BASE)/visualization/externals/gl2ps/include 127 endif 128 VISLIBS += -lG4gl2ps 131 129 endif 132 130 -
trunk/config/History
r1045 r1185 1 cvs log $Id: History,v 1.3 55 2009/04/27 07:44:07gcosmo Exp $1 cvs log $Id: History,v 1.368 2009/11/17 15:17:55 gcosmo Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 16 16 * Reverse chronological order (last date on top), please * 17 17 ---------------------------------------------------------- 18 19 17th November 2009 Gabriele Cosmo (config-V09-02-14) 20 - Added include paths to new CHIPS modules. 21 22 17th November 2009 Gabriele Cosmo (config-V09-02-13) 23 - G4VIS_USE.gmk: fixed dependency issues on WIN32-VC for gl2ps utility 24 library in visualization. 25 - WIN32-VC.gmk: added use32.lib to OGLLIBS to fix problems of linking 26 when G4LIB_BUILD/USE_WIN32_SESSION is not set (L.Garnier). 27 - binmake.gmk: corrected inclusion of G4zlib library in link list for 28 the case of global libraries. 29 - Updated Configure script (Configure-V09-02-03) and internal scripts: 30 o Added new data set for G4REALSURFACEDATA variable and updated G4LEDATA 31 data set version. 32 o Fixed detection of QtCore library; addressing problem report #1079. 33 o Added flag to allow running with query options on non-interactive 34 terminal. Resolves issue reported in Hypernews Install-and-Config #1213. 35 o Corrected text for installation of g3tog4 module; cernlib is not required. 36 37 5th November 2009 John Allison (config-V09-02-12) 38 - Removed references to obsolete GAGTREE driver. 39 40 4th November 2009 John Allison 41 - Added new gMocren flags for backward compatibility. 42 43 4th November 2009 Gabriele Cosmo (config-V09-02-11) 44 - Added new gMocren include path to G4VIS_USE.gmk script. 45 46 8th September 2009 Gabriele Cosmo (config-V09-02-10) 47 - Darwin-g++.gmk: added paths to $QTHOME/include and $QTHOME/lib to 48 setup for Qt4 configuration. 49 50 17th August 2009 Gabriele Cosmo (config-V09-02-09) 51 - Added G4OPTDEBUG option for hybrid optimized-debug build also to 52 Darwin-g++ and WIN32-g++ configurations. 53 54 3rd August 2009 Gabriele Cosmo (config-V09-02-08) 55 - Darwin-g++.gmk: added -arch_multiple option to LDFLAGS to force more 56 diagnostics for wrong architecture errors at link stage. 57 58 17th June 2009 Gunter Folger (config-V09-02-07) 59 - binmake.gmk: moved definition of TARGOBJEXT to place not dependent 60 on G4EXLIB, such that the extension is defined when no lib is present 61 (e.g. for hadronic exercisers). 62 63 27th May 2009 Ben Morgan (config-V09-02-06) 64 - Configure script: 65 o Rewritten check on make/gmake on WIN32-VC systems to avoid problems 66 with cygwin and Matlab. 67 o Added check to build Qt driver only when Qt UI module is built; 68 reordered moc checks and added cross-check on moc version. 69 Added safety reset of OpenGL QT build and use variables. 70 o Commented out echo compatibility warning to address problem report #1067. 18 71 19 72 27th April 2009 Gabriele Cosmo (config-V09-02-05) -
trunk/config/sys/Darwin-g++.gmk
r1045 r1185 13 13 CXX := g++ 14 14 CXXFLAGS := -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long 15 CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe -Wextra 16 # CXXFLAGS := -Wall -Wextra -ansi -pedantic -Wuninitialized -Winline -Wunreachable-code15 # CXXFLAGS += -Wunused-parameter -Winline -Wunreachable-code 16 CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe 17 17 ifdef G4OPTIMISE 18 #CXXFLAGS += -O219 #FCFLAGS := -O220 #CCFLAGS := -O218 CXXFLAGS += -O2 19 FCFLAGS := -O2 20 CCFLAGS := -O2 21 21 else 22 22 ifdef G4DEBUG … … 31 31 CCFLAGS += -pg 32 32 endif 33 ifdef G4OPTDEBUG 34 CXXFLAGS += -O2 -g 35 FCFLAGS += -O2 -g 36 CCFLAGS += -O2 -g 37 endif 33 38 FC := gfortran 34 39 FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore 35 LDFLAGS += -bind_at_load 40 LDFLAGS += -bind_at_load -arch_multiple 36 41 FCLIBS := -lg2c -lnsl 37 42 SHEXT := dylib … … 92 97 QTFLAGS += -I $(QTHOME)/QtGui.framework/Headers 93 98 QTFLAGS += -I $(QTHOME)/QtOpenGL.framework/Headers 99 QTFLAGS += -I $(QTHOME)/include/Qt -I$(QTHOME)/include 94 100 else 95 101 QTFLAGS := -I $(QTHOME)/include/Qt -I$(QTHOME)/include … … 100 106 QTLIBPATH := $(shell test -d $(QTHOME)/lib/qt3/lib && echo "$(QTHOME)/lib/qt3/lib" || echo "$(QTHOME)/lib" ) 101 107 else 102 QTLIBPATH := -F$(QTHOME) 108 QTLIBPATH := -F$(QTHOME)/lib -F$(QTHOME) 103 109 endif 104 110 endif -
trunk/config/sys/WIN32-VC.gmk
r1176 r1185 33 33 endif 34 34 ifndef OGLLIBS 35 OGLLIBS := glu32.lib opengl32.lib gdi32.libuser32.lib35 OGLLIBS := glu32.lib opengl32.lib user32.lib 36 36 endif 37 37 ifndef UI32LIBS … … 64 64 endif 65 65 endif 66 67 66 68 67 # -
trunk/config/sys/WIN32-g++.gmk
r1017 r1185 20 20 CCFLAGS := -g 21 21 endif 22 endif 23 ifdef G4PROFILE 24 CXXFLAGS += -pg 25 FCFLAGS += -pg 26 CCFLAGS += -pg 27 endif 28 ifdef G4OPTDEBUG 29 CXXFLAGS += -O2 -g 30 FCFLAGS += -O2 -g 31 CCFLAGS += -O2 -g 22 32 endif 23 33 ifdef G4LIB_BUILD_SHARED
Note: See TracChangeset
for help on using the changeset viewer.