1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
--- include/pyamanith.h
+++ include/pyamanith.h
@@ -59,7 +59,7 @@
#include <amanith/numerics/geigen.h>
#include <amanith/numerics/gfilter.h>
#include <amanith/numerics/gintegration.h>
-#include <amanith/rendering/gdrawboard.h>
+#include <amanith/rendering/gdrawboard.swig.h>
#include <amanith/rendering/gdrawstyle.h>
#include <amanith/rendering/gopenglboard.h>
#include <amanith/support/gavltree.h>
--- setup.py
+++ setup.py
@@ -16,7 +16,7 @@
inc = [join("changes", "include"), join(amanith_base, "include"), "include"]
lib = [join(amanith_base, "lib")]
cc_args = []
-swig_args = ["-Ibuild/amanith"]
+swig_args = ["-Ichanges/include", "-Iinclude", "-I/usr/include"]
if os.name == "nt":
if debug:
@@ -39,20 +39,9 @@
relPath = join(root, file).replace(source + os.sep, "")
shutil.copy(join(source, relPath), join(target, relPath))
- def run(self):
- # Ultimately this should use patch(1) or something, but for now
- # we just copy the stuff over.
- if not os.path.isdir(join("build", "amanith")):
- os.makedirs(join("build", "amanith"))
- shutil.copytree(join(amanith_base, "include"), join("build", "amanith", "include"))
- self.copy("changes", join("build", "amanith"))
- _build_ext.run(self)
ext_amanith = Extension('_amanith', ['amanith.i'],
- include_dirs = inc,
- library_dirs = lib,
- libraries = libs,
- extra_compile_args = cc_args)
+ swig_opts = swig_args, extra_compile_args = swig_args, libraries = libs)
setup(name = 'PyAmanith',
version = '0.3.34',
|
GitWeb
