Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Re-fix: Use correct 64-bit library paths on Windows (Issue #113)
  • Loading branch information
inducer committed Jul 5, 2016
1 parent 66304d3 commit 4ad7e87
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions setup.py
Expand Up @@ -36,11 +36,17 @@ def get_config_schema():
else:
cuda_root_default = normpath(join(dirname(nvcc_path), ".."))

cxxflags_default = []
ldflags_default = []

lib64 = "lib64"
import sys
if sys.platform.startswith("win"):
# https://github.com/inducer/pycuda/issues/113
lib64 = "x64"
lib64 = "lib/x64"

cxxflags_default.extend(['/EHsc'])
ldflags_default.extend(['/FORCE'])

default_lib_dirs = [
"${CUDA_ROOT}/lib",
Expand Down Expand Up @@ -75,9 +81,9 @@ def get_config_schema():
LibraryDir("CURAND", default_lib_dirs),
Libraries("CURAND", ["curand"]),

StringListOption("CXXFLAGS", [],
StringListOption("CXXFLAGS", cxxflags_default,
help="Any extra C++ compiler options to include"),
StringListOption("LDFLAGS", [],
StringListOption("LDFLAGS", ldflags_default,
help="Any extra linker options to include"),
])

Expand Down

0 comments on commit 4ad7e87

Please sign in to comment.