Changeset 1185 for trunk/config

Timestamp:

Nov 18, 2009, 4:07:45 PM (15 years ago)

Author:

garnier

Message:

update par rapport a CVS

Location:

trunk/config

Files:

• G4VIS_BUILD.gmk (modified) (2 diffs)
• G4VIS_USE.gmk (modified) (4 diffs)
• History (modified) (2 diffs)
• sys/Darwin-g++.gmk (modified) (4 diffs)
• sys/WIN32-VC.gmk (modified) (2 diffs)
• sys/WIN32-g++.gmk (modified) (1 diff)

trunk/config/G4VIS_BUILD.gmk

@@ -1 @@
-# $Id: G4VIS_BUILD.gmk,v 1.20 2007/10/03 12:15:05 lgarnier Exp $
+# $Id: G4VIS_BUILD.gmk,v 1.22 2009/11/05 10:06:54 allison Exp $
 # -------------------------------------------------------------
 # Visualization-specific CPPFLAGS for BUILD phase.
@@ -14 +14 @@
 # G4VIS_BUILD_ASCIITREE_DRIVER
 # G4VIS_BUILD_DAWNFILE_DRIVER
-# G4VIS_BUILD_GAGTREE_DRIVER
+# G4VIS_BUILD_GMOCRENFILE_DRIVER
 # G4VIS_BUILD_HEPREPFILE_DRIVER
 # G4VIS_BUILD_RAYTRACER_DRIVER

trunk/config/G4VIS_USE.gmk

@@ -1 @@
-# $Id: G4VIS_USE.gmk,v 1.27 2009/11/05 10:06:54 allison Exp $
+# $Id: G4VIS_USE.gmk,v 1.28 2009/11/17 11:34:56 gcosmo Exp $
 # -------------------------------------------------------------
 # GNUmakefile for CPPFLAGS for visualization USE phase.
@@ -41 +41 @@
   CPPFLAGS += -I$(G4BASE)/visualization/Tree/include
   CPPFLAGS += -I$(G4BASE)/visualization/VRML/include
-  CPPFLAGS += -I$(G4BASE)/visualization/Tree/include
-  CPPFLAGS += -I$(G4BASE)/visualization/gMocren/include
 endif
 
@@ -112 +110 @@
 endif
 
-ifdef G4LIB_USE_GL2PS
-   ifneq ($(G4INCLUDE_EXEC),1)
-     CPPFLAGS += -I$(G4BASE)/visualization/externals/gl2ps/include
-   endif
-   VISLIBS += -lG4gl2ps
-endif
-
 ifdef G4VIS_USE_RAYTRACERX
   CPPFLAGS += -DG4VIS_USE_RAYTRACERX
@@ -129 +120 @@
   CPPFLAGS += -DG4VIS_USE_VRML
   # CPPFLAGS += -I... and VISLIBS += set above.
+endif
+
+ifdef G4LIB_USE_GL2PS
+  ifneq ($(G4INCLUDE_EXEC),1)
+    CPPFLAGS += -I$(G4BASE)/visualization/externals/gl2ps/include
+  endif
+  VISLIBS += -lG4gl2ps
 endif
 

trunk/config/History

@@ -1 @@
-cvs log $Id: History,v 1.355 2009/04/27 07:44:07 gcosmo Exp $
+cvs log $Id: History,v 1.368 2009/11/17 15:17:55 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -16 +16 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+17th November 2009  Gabriele Cosmo (config-V09-02-14)
+- Added include paths to new CHIPS modules.
+
+17th November 2009  Gabriele Cosmo (config-V09-02-13)
+- G4VIS_USE.gmk: fixed dependency issues on WIN32-VC for gl2ps utility
+  library in visualization.
+- WIN32-VC.gmk: added use32.lib to OGLLIBS to fix problems of linking
+  when G4LIB_BUILD/USE_WIN32_SESSION is not set (L.Garnier).
+- binmake.gmk: corrected inclusion of G4zlib library in link list for
+  the case of global libraries.
+- Updated Configure script (Configure-V09-02-03) and internal scripts:
+  o Added new data set for G4REALSURFACEDATA variable and updated G4LEDATA
+    data set version.
+  o Fixed detection of QtCore library; addressing problem report #1079.
+  o Added flag to allow running with query options on non-interactive
+    terminal. Resolves issue reported in Hypernews Install-and-Config #1213.
+  o Corrected text for installation of g3tog4 module; cernlib is not required.
+
+5th November 2009  John Allison (config-V09-02-12)
+- Removed references to obsolete GAGTREE driver.
+
+4th November 2009  John Allison
+- Added new gMocren flags for backward compatibility.
+
+4th November 2009  Gabriele Cosmo (config-V09-02-11)
+- Added new gMocren include path to G4VIS_USE.gmk script.
+
+8th September 2009  Gabriele Cosmo (config-V09-02-10)
+- Darwin-g++.gmk: added paths to $QTHOME/include and $QTHOME/lib to
+  setup for Qt4 configuration.
+
+17th August 2009  Gabriele Cosmo (config-V09-02-09)
+- Added G4OPTDEBUG option for hybrid optimized-debug build also to
+  Darwin-g++ and WIN32-g++ configurations.
+
+3rd August 2009  Gabriele Cosmo (config-V09-02-08)
+- Darwin-g++.gmk: added -arch_multiple option to LDFLAGS to force more
+  diagnostics for wrong architecture errors at link stage.
+
+17th June 2009  Gunter Folger (config-V09-02-07)
+- binmake.gmk: moved definition of TARGOBJEXT to place not dependent
+  on G4EXLIB, such that the extension is defined when no lib is present
+  (e.g. for hadronic exercisers).
+
+27th May 2009  Ben Morgan (config-V09-02-06)
+- Configure script:
+  o Rewritten check on make/gmake on WIN32-VC systems to avoid problems
+    with cygwin and Matlab.
+  o Added check to build Qt driver only when Qt UI module is built;
+    reordered moc checks and added cross-check on moc version.
+    Added safety reset of OpenGL QT build and use variables.
+  o Commented out echo compatibility warning to address problem report #1067.
 
 27th April 2009  Gabriele Cosmo (config-V09-02-05)

trunk/config/sys/Darwin-g++.gmk

@@ -13 +13 @@
   CXX       := g++
   CXXFLAGS  := -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long
-  CXXFLAGS  += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe -Wextra 
-#  CXXFLAGS  := -Wall -Wextra -ansi -pedantic -Wuninitialized -Winline -Wunreachable-code
+# CXXFLAGS  += -Wunused-parameter -Winline -Wunreachable-code
+  CXXFLAGS  += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe
   ifdef G4OPTIMISE
-#    CXXFLAGS  += -O2
-#    FCFLAGS   := -O2
-#    CCFLAGS   := -O2
+    CXXFLAGS  += -O2
+    FCFLAGS   := -O2
+    CCFLAGS   := -O2
   else
     ifdef G4DEBUG
@@ -31 +31 @@
     CCFLAGS   += -pg
   endif
+  ifdef G4OPTDEBUG
+    CXXFLAGS  += -O2 -g
+    FCFLAGS   += -O2 -g
+    CCFLAGS   += -O2 -g
+  endif
   FC := gfortran
   FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
-  LDFLAGS += -bind_at_load
+  LDFLAGS += -bind_at_load -arch_multiple
   FCLIBS := -lg2c -lnsl
   SHEXT   := dylib
@@ -92 +97 @@
       QTFLAGS   += -I $(QTHOME)/QtGui.framework/Headers 
       QTFLAGS   += -I $(QTHOME)/QtOpenGL.framework/Headers
+      QTFLAGS   += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
     else
       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" )
     else
-      QTLIBPATH  := -F$(QTHOME)
+      QTLIBPATH  := -F$(QTHOME)/lib -F$(QTHOME)
     endif
   endif

trunk/config/sys/WIN32-VC.gmk

@@ -33 +33 @@
   endif
   ifndef OGLLIBS
-    OGLLIBS   := glu32.lib opengl32.lib gdi32.lib user32.lib
+    OGLLIBS   := glu32.lib opengl32.lib user32.lib
   endif
   ifndef UI32LIBS
@@ -64 +64 @@
     endif
   endif
-
 
 #

trunk/config/sys/WIN32-g++.gmk

@@ -20 +20 @@
       CCFLAGS   := -g
     endif
+  endif
+  ifdef G4PROFILE
+    CXXFLAGS  += -pg
+    FCFLAGS   += -pg
+    CCFLAGS   += -pg
+  endif
+  ifdef G4OPTDEBUG
+    CXXFLAGS  += -O2 -g
+    FCFLAGS   += -O2 -g
+    CCFLAGS   += -O2 -g
   endif
   ifdef G4LIB_BUILD_SHARED