--- a/src/SConscript Tue Jul 26 17:41:36 2016 +0200
+++ b/src/SConscript Tue Jul 26 18:19:37 2016 +0200
@@ -20,36 +20,13 @@
ccflags = '$CCFLAGS -Wno-write-strings'
else:
ccflags = '$CCFLAGS'
- if cc == 'msvc':
- linkflags = '$LINKFLAGS /export:initpyrit'
- else:
- linkflags = '$LINKFLAGS'
+ linkflags = '$LINKFLAGS'
pymodule = pyenv.SharedLibrary('pyrit',
['raytracermodule.cc']+shared_objs,
SHLIBPREFIX = '', CCFLAGS = ccflags,
LINKFLAGS=linkflags)
- if cc == 'msvc':
- pyenv.AddPostAction(pymodule, 'mt /nologo /manifest ${TARGET}.manifest /outputresource:$TARGET;2')
env.Alias('shared-objs', shared_objs)
env.Alias('python-module', pymodule)
-
- if cc == 'msvc':
- # MS Visual Studio Project
- vcprojsrcs = []
- for src in sources+['raytracermodule.cc']:
- vcprojsrcs += ['src/' + src]
- vcprojincs = []
- for inc in includes:
- vcprojincs += ['include/' + inc]
- vcproj = env.MSVSProject(
- auto_build_solution=0,
- target = '#pyrit_module' + env['MSVSPROJECTSUFFIX'],
- srcs = vcprojsrcs,
- incs = vcprojincs,
- buildtarget = 'python-module',
- variant = 'Release')
- Return(('pymodule', 'vcproj'))
-
Return('pymodule')
else:
objs = []