Import Geant4 5.0.0 source tree

2016-06-08 16:57:27 +02:00
parent 330b82b769
commit 37fff30d2e
5733 changed files with 263867 additions and 74574 deletions
@@ -15,20 +15,10 @@ ifeq ($(G4SYSTEM),WIN32-VC)
  CXXFLAGS += -D_WIN32 -DOS
  CPPFLAGS += -DWIN32
  #
-  # Should set $INCLUDE environment, if not set as below
+  # Use ISO standard version.
  #
-  ifdef G4USE_OSPACE
-    CXXFLAGS += $(OSPACEINC)
-    CPPFLAGS += -DG4USE_OSPACE
-  else 
-    ifdef G4USE_STLPORT
-      CXXFLAGS += $(OSPACEINC)
-    else
-  #  If native STL is selected, use ISO standard version.
-      G4USE_STD_NAMESPACE := yes 
-      CPPFLAGS += -DG4USE_STD_NAMESPACE
-    endif
-  endif   #ospace
+  G4USE_STD_NAMESPACE := yes 
+  CPPFLAGS += -DG4USE_STD_NAMESPACE

  LDFLAGS  += -FORCE /NODEFAULTLIB:MSVCRT.dll