Fix windows warnings.

FLAMEGPU · Oct 31, 2023 · 4b5c514 · 4b5c514
1 parent 2efb653
commit 4b5c514
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/swig/conda/conda_build_config.yaml b/swig/conda/conda_build_config.yaml
@@ -2,9 +2,7 @@
 # https://github.com/rapidsai/cuml/blob/branch-23.12/conda/recipes/libcuml/conda_build_config.yaml
 # https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/main/recipe/conda_build_config.yaml
 cuda_compiler:
-  #- nvcc # [win] # installs/uses cudatoolkit package?
-  - cuda-nvcc # [win] # requires -c nvidia
-  - cuda-nvcc # [linux] # installs/uses cuda-toolkit package?
+  - cuda-nvcc # requires 'conda build -c nvidia conda' on Windows
 
 c_compiler: # [win]
   - vs2022 # [win]

diff --git a/swig/conda/meta.yaml b/swig/conda/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: "pyflamegpu"
-  version: "2.0.0rc1"
+  version: "2.0.0rc1" # todo
 
 source:
   # Use the current committed state of the repo, to avoid pinning versions or copying the build directory if using path.
@@ -46,12 +46,16 @@ build:
 #  track_features:
 #    - feature2
   missing_dso_whitelist:
-    - $RPATH/libcuda.so.1 # Ignore as this comes from CUDA driver
-    - $RPATH/libnvrtc.so.12 # Conda-build can't find this in run reqs cuda-cudart??
-    - $RPATH/libcudart.so.12 # Conda-build can't find this in run reqs cuda-nvrtc??
+    - $RPATH/libcuda.so.1 # [linux] Ignore as this comes from CUDA driver
+    - $RPATH/libnvrtc.so.12 # [linux] Conda-build can't find this in run reqs cuda-cudart??
+    - $RPATH/libcudart.so.12 # [linux] Conda-build can't find this in run reqs cuda-nvrtc??
+    - $RPATH/nvrtc64_120_0.dll # [win64] Ignore as this comes from CUDA driver
+    - $RPATH/cudart64_12.dll # [win64] Ignore as this comes from CUDA driver
   ignore_run_exports:
-    - python # Not clear why conda thinks this isn't used
-    - astpretty # Not clear why conda thinks this isn't used
+    - python # [linux] Not clear why conda thinks this isn't used
+    - astpretty # [linux, win64] Not clear why conda thinks this isn't used
+    - vc14_runtime # [win64] Not clear why conda thinks this isn't used (we aren't static linking)
+    - ucrt # [win64] Not clear why conda thinks this isn't used (we aren't static linking)
 
 test:
   imports: