Skip to content

Commit 94155c4

Browse files
committedOct 16, 2022
Update windows build: conda-recipe, use /MD for scons compilation
1 parent 669ef08 commit 94155c4

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed
 

‎conda-recipe/meta.yaml

+8-3
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,17 @@ requirements:
1818
build:
1919
- {{ compiler('cxx') }}
2020
- scons
21-
- boost-cpp {{ boost }}
2221
- python
22+
host:
23+
- boost {{ boost }}
24+
2325

2426
test:
25-
commands: # [not win]
26-
- test -f $PREFIX/lib/libObjCryst${SHLIB_EXT} # [not win]
27+
commands:
28+
- test -f $PREFIX/lib/libObjCryst${SHLIB_EXT} # [not win]
29+
- test -f $PREFIX/include/ObjCryst/version.h # [not win]
30+
- if not exist %LIBRARY_LIB%\\libObjCryst.lib exit 1 # [win]
31+
- if not exist %LIBRARY_INC%\\ObjCryst\\version.h exit 1 # [win]
2732

2833
about:
2934
home: https://github.com/diffpy/libobjcryst/

‎src/SConscript

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ if env['PLATFORM'] == 'darwin':
2929
# Compiler specific options
3030
if platform.system().lower() == "windows":
3131
# Visual c++
32-
env.PrependUnique(CCFLAGS=['/Ox', '/EHsc'])
32+
env.PrependUnique(CCFLAGS=['/Ox', '/EHsc', '/MD'])
3333
env.AppendUnique(CPPDEFINES={'NDEBUG' : None})
3434
# env.AppendUnique(LINKFLAGS='/EXPORT')
3535
else:

0 commit comments

Comments
 (0)
Please sign in to comment.