Merge pull request #26 from evanheller/master

Modifications to MANIFEST, SConstruct for easier macOS compilation
ZhuangLab · Aug 15, 2017 · e4d66fd · e4d66fd
2 parents 1c2341f + f562099
commit e4d66fd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -6,6 +6,7 @@ recursive-include storm_analysis *.mat
 recursive-include storm_analysis *.md
 recursive-include storm_analysis *.py
 recursive-include storm_analysis *.so
+recursive-include storm_analysis *.dylib
 recursive-include storm_analysis *.txt
 recursive-include storm_analysis *.ui
 

diff --git a/SConstruct b/SConstruct
@@ -39,7 +39,11 @@ fftw_lib_path = None
 
 # OS-X apparently does not have and doesn't need the rt library.
 if (platform.system() == "Darwin"):
+    fftw_lib='libfftw3'
+    fftw_lib_path = '/usr/local/lib'
     l1h_libs = ['lapack']
+    env.Append(CCFLAGS='-I/usr/local/include')
+    env.Append(LDFLAGS='-L/usr/local/include')
 else:
     l1h_libs = ['lapack', 'rt']