Update build configuration for windows (visual studio)

Author: vincefn

SConstruct

@@ -17,11 +17,17 @@ SCons construction environment can be customized in sconscript.local script.
 """
 
 import os
+from os.path import join as pjoin
 import platform
 
 def subdictionary(d, keyset):
     return dict(kv for kv in d.items() if kv[0] in keyset)
 
+def getsyspaths(*names):
+    pall = sum((os.environ.get(n, '').split(os.pathsep) for n in names), [])
+    rv = [p for p in pall if os.path.exists(p)]
+    return rv
+
 # copy system environment variables related to compilation
 DefaultEnvironment(ENV=subdictionary(os.environ, '''
     PATH CPATH CPLUS_INCLUDE_PATH LIBRARY_PATH LD_RUN_PATH
@@ -39,21 +45,52 @@ env.EnsureSConsVersion(0, 98, 1)
 # Customizable compile variables
 vars = Variables('sconsvars.py')
 
-vars.Add(PathVariable(
-    'prefix',
-    'installation prefix directory',
-    '/usr/local'))
-vars.Update(env)
-vars.Add(PathVariable(
-    'libdir',
-    'installation directory for compiled library [prefix/lib]',
-    env['prefix'] + '/lib',
-    PathVariable.PathAccept))
-vars.Add(PathVariable(
-    'includedir',
-    'installation directory for C++ header files [prefix/include]',
-    env['prefix'] + '/include',
-    PathVariable.PathAccept))
+if 'CONDA_PREFIX' in os.environ:
+    # building for a conda environment
+    vars.Add(PathVariable(
+        'prefix',
+        'installation prefix directory',
+        os.environ['CONDA_PREFIX']))
+    vars.Update(env)
+    if platform.system().lower() == "windows":
+        vars.Add(PathVariable(
+            'libdir',
+            'installation directory for compiled library [prefix/Library/lib]',
+            pjoin(env['prefix'],'Library', 'Lib'),
+            PathVariable.PathAccept))
+        vars.Add(PathVariable(
+            'includedir',
+            'installation directory for C++ header files [prefix/Library/include]',
+            pjoin(env['prefix'],'Library', 'include'),
+            PathVariable.PathAccept))
+    else:
+        vars.Add(PathVariable(
+            'libdir',
+            'installation directory for compiled library [prefix/lib]',
+            pjoin(env['prefix'], 'Lib'),
+            PathVariable.PathAccept))
+        vars.Add(PathVariable(
+            'includedir',
+            'installation directory for C++ header files [prefix/include]',
+            pjoin(env['prefix'], 'include'),
+            PathVariable.PathAccept))
+else:
+    vars.Add(PathVariable(
+        'prefix',
+        'installation prefix directory',
+        '/usr/local'))
+    vars.Update(env)
+    vars.Add(PathVariable(
+        'libdir',
+        'installation directory for compiled library [prefix/lib]',
+        env['prefix'] + '/lib',
+        PathVariable.PathAccept))
+    vars.Add(PathVariable(
+        'includedir',
+        'installation directory for C++ header files [prefix/include]',
+        env['prefix'] + '/include',
+        PathVariable.PathAccept))
+
 vars.Add(EnumVariable(
     'build',
     'compiler settings',
@@ -71,6 +108,26 @@ vars.Add(BoolVariable(
 vars.Update(env)
 env.Help(MY_SCONS_HELP % vars.GenerateHelpText(env))
 
+if platform.system().lower() == "windows":
+    # See https://scons.org/faq.html#Linking_on_Windows_gives_me_an_error
+    env['ENV']['TMP'] = os.environ['TMP']
+    # the CPPPATH directories are checked by scons dependency scanner
+    cpppath = getsyspaths('CPLUS_INCLUDE_PATH', 'CPATH')
+    env.AppendUnique(CPPPATH=cpppath)
+    # Insert LIBRARY_PATH explicitly because some compilers
+    # ignore it in the system environment.
+    env.PrependUnique(LIBPATH=getsyspaths('LIBRARY_PATH'))
+    if 'CONDA_PREFIX' in os.environ:
+        env.Append(CPPPATH=pjoin(os.environ['CONDA_PREFIX'],'include'))
+        env.Append(CPPPATH=pjoin(os.environ['CONDA_PREFIX'],'Library','include'))
+        env.Append(LIBPATH=pjoin(os.environ['CONDA_PREFIX'],'Library','lib'))
+    # This disable automated versioned named e.g. libboost_date_time-vc142-mt-s-x64-1_73.lib
+    # so we can use conda-installed libraries
+    env.AppendUnique(CPPDEFINES='BOOST_ALL_NO_LIB')
+    # Prevent the generation of an import lib (.lib) in addition to the dll
+    # Unused as we are using as static library for windows
+    # env.AppendUnique(no_import_lib=1)
+
 builddir = env.Dir('build/%s-%s' % (env['build'], platform.machine()))
 
 Export('env')

src/ObjCryst/version.tpl

@@ -80,7 +80,11 @@ struct libobjcryst_version_info {
     static const char* date;
     static const char* git_commit;
     // git_sha is deprecated.  Use git_commit instead.
+    #ifndef _MSC_VER
     static const char* git_sha __attribute__ ((deprecated));
+    #else
+    __declspec(deprecated) static const char* git_sha;
+    #endif
 
 };
 

src/SConscript

@@ -1,4 +1,5 @@
 import os
+import platform
 
 Import('env')
 
@@ -26,27 +27,33 @@ if env['PLATFORM'] == 'darwin':
     fast_linkflags[:] = []
 
 # Compiler specific options
-if icpc:
-    # options for Intel C++ compiler on hpc dev-intel07
-    env.PrependUnique(CCFLAGS=['-w1', '-fp-model', 'precise'])
-    env.PrependUnique(LIBS=['imf'])
-    fast_optimflags = ['-fast', '-no-ipo']
-else:
-    # g++ options
-    env.PrependUnique(CCFLAGS=['-Wall'])
-    fast_optimflags = ['-ffast-math']
-
-# Configure build variants
-if env['build'] == 'debug':
-    env.Append(CCFLAGS='-g')
-elif env['build'] == 'fast':
-    env.AppendUnique(CCFLAGS=['-O3'] + fast_optimflags)
+if platform.system().lower() == "windows":
+    # Visual c++
+    env.PrependUnique(CCFLAGS=['/Ox', '/EHsc'])
     env.AppendUnique(CPPDEFINES={'NDEBUG' : None})
-    env.AppendUnique(LINKFLAGS=fast_linkflags)
-
-if env['profile']:
-    env.AppendUnique(CCFLAGS='-pg')
-    env.AppendUnique(LINKFLAGS='-pg')
+    # env.AppendUnique(LINKFLAGS='/EXPORT')
+else:
+    if icpc:
+        # options for Intel C++ compiler on hpc dev-intel07
+        env.PrependUnique(CCFLAGS=['-w1', '-fp-model', 'precise'])
+        env.PrependUnique(LIBS=['imf'])
+        fast_optimflags = ['-fast', '-no-ipo']
+    else:
+        # g++ options
+        env.PrependUnique(CCFLAGS=['-Wall'])
+        fast_optimflags = ['-ffast-math']
+
+    # Configure build variants
+    if env['build'] == 'debug':
+        env.Append(CCFLAGS='-g')
+    elif env['build'] == 'fast':
+        env.AppendUnique(CCFLAGS=['-O3'] + fast_optimflags)
+        env.AppendUnique(CPPDEFINES={'NDEBUG' : None})
+        env.AppendUnique(LINKFLAGS=fast_linkflags)
+
+    if env['profile']:
+        env.AppendUnique(CCFLAGS='-pg')
+        env.AppendUnique(LINKFLAGS='-pg')
 
 # Lists for storing built objects and header files
 env['newmatobjs'] = []
@@ -72,9 +79,15 @@ newmatobjs = env["newmatobjs"]
 cctbxobjs = env["cctbxobjs"]
 objcrystobjs = env["objcrystobjs"]
 
-# This builds the shared library
-libobjcryst = env.SharedLibrary("libObjCryst",
-        objcrystobjs + cctbxobjs + newmatobjs)
+# This builds the library
+if platform.system().lower() == "windows":
+    # Use a static library (does not require __declspec(dllexport) all over the code)
+    libobjcryst = env.StaticLibrary("libObjCryst",
+                                    objcrystobjs + cctbxobjs + newmatobjs)
+else:
+    libobjcryst = env.SharedLibrary("libObjCryst",
+                                    objcrystobjs + cctbxobjs + newmatobjs)
+
 lib = Alias('lib', [libobjcryst, env['lib_includes']])
 Default(lib)