Import Geant4 10.6.1 source tree

config/History

@@ -15,6 +15,9 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+12th Feb 2020 Gabriele Cosmo (config-V10-05-09)
+- Fixed and updated setup for DLL builds on Windows.
+
 20th Nov 2019 Gabriele Cosmo (config-V10-05-08)
 - interactivity.gmk: added -DQT_NO_DEPRECATED_WARNINGS to Qt compilation
   settings, to silence warnings from Qt for use of deprecated features.

config/binmake.gmk

@@ -261,10 +261,6 @@ ifdef GLOBALLIBS
     LDLIBS2 += -lG4expat
   endif
 
-  ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
-    LDLIBS2 += -lG4expat
-  endif
-
   ifdef G4LIB_USE_ZLIB
     LDLIBS2 += -lG4zlib
   endif

config/genwindef.cc

@@ -102,7 +102,7 @@ typedef MEMORY_MAPPED_FILE* PMEMORY_MAPPED_FILE;
 
 using namespace std;
 
-#define MakePtr( cast, ptr, addValue ) (cast)( (DWORD)(ptr) + (DWORD)(addValue))
+#define MakePtr( cast, ptr, addValue ) (cast)( (DWORD_PTR)(ptr) + (DWORD_PTR)(addValue))
 
 /////////////////////////////////////////////////////////////////////////////
 // CLibSymbolInfo

config/sys/WIN32-VC.gmk

@@ -12,8 +12,9 @@ ifeq ($(G4SYSTEM),WIN32-VC)
   endif
   CXXFLAGS += -GR -EHsc -Zm200 -nologo -std:c++17
   CXXFLAGS += -D_CONSOLE -D_WIN32 -DOS
-  CPPFLAGS += -DWIN32 -DXPNET -D_CRT_SECURE_NO_DEPRECATE
+  CPPFLAGS += -DWIN32 -DXPNET -D_CRT_SECURE_NO_DEPRECATE -D_NO_CRT_STDIO_INLINE
   LDFLAGS  += -FORCE /NODEFAULTLIB:MSVCRT.dll /STACK:12582912
+  LOADLIBS += legacy_stdio_definitions.lib
 
   SHEXT := dll
   AR := LIB
@@ -93,15 +94,15 @@ ifeq ($(G4SYSTEM),WIN32-VC)
     $(ECHO) "Building lib$(name).exp and lib$(name).lib file ...";\
     $(RM) $(G4LIBDIR)/lib$(name).exp;\
     $(RM) $(G4LIBDIR)/lib$(name).lib;\
-    lib.exe /nologo /machine:ix86 /def:$(name).def \
+    lib.exe /nologo /machine:x64 /def:$(name).def \
             /out:$(G4LIBDIR)/lib$(name).lib;\
     $(RM) $(G4LIBDIR)/$(name).dll;\
     $(ECHO) "Building $(name).dll file ...";\
-    link.exe /nologo /dll /out:$(G4LIBDIR)/$(name).dll \
+    link.exe /nologo /machine:x64 /dll /out:$(G4LIBDIR)/$(name).dll \
              $(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \
              $(LIB_PATH)$(G4LIBDIR) $(GLOBLIBS) \
              $(LIB_PATH)$(CLHEP_LIB_DIR) $(CLHEP_LIB) \
-             $(INTYLIBS) $(GDMLLIBS) $(ANALYSISLIBS) $(UI32LIBS)
+             $(INTYLIBS) $(GDMLLIBS) $(ANALYSISLIBS) $(UI32LIBS) $(LOADLIBS)
   endef
   define build-global-shared-lib
     @libdir=`(cd $(@D);/bin/pwd)`;\
@@ -112,14 +113,14 @@ ifeq ($(G4SYSTEM),WIN32-VC)
     $(ECHO) "Building lib$(name).exp and lib$(name).lib ...";\
     $(RM) $(G4LIBDIR)/lib$(name).exp;\
     $(RM) $(G4LIBDIR)/lib$(name).lib;\
-    lib.exe /nologo /machine:ix86 /def:$(name).def \
+    lib.exe /nologo /machine:x64 /def:$(name).def \
             /out:$(G4LIBDIR)/lib$(name).lib;\
     $(RM) $(G4LIBDIR)/$(name).dll;\
     $(ECHO) "Building $(name).dll ...";\
-    link.exe /nologo /dll /out:$(G4LIBDIR)/$(name).dll \
+    link.exe /nologo /machine:x64 /dll /out:$(G4LIBDIR)/$(name).dll \
              $(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \
              $(LIB_PATH)$(G4LIBDIR) $(GLOBLIBS) \
              $(LIB_PATH)$(CLHEP_LIB_DIR) $(CLHEP_LIB) \
-             $(INTYLIBS) $(GDMLLIBS) $(ANALYSISLIBS) $(UI32LIBS)
+             $(INTYLIBS) $(GDMLLIBS) $(ANALYSISLIBS) $(UI32LIBS) $(LOADLIBS)
   endef
 endif