summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRusAnon2010-05-03 14:12:31 +1100
committerRusAnon2010-05-03 14:12:31 +1100
commit34a8424afd13b230cad7bc2ca42ef4367591bddd (patch)
tree9a85864a61741f94438574a8550cbaecf2633119
parent021480ca9a0882a084be8f62335de0f9e1e965e5 (diff)
downloaddfhack-34a8424afd13b230cad7bc2ca42ef4367591bddd.tar.gz
dfhack-34a8424afd13b230cad7bc2ca42ef4367591bddd.tar.bz2
dfhack-34a8424afd13b230cad7bc2ca42ef4367591bddd.tar.xz
Some fixes for compiling, setup and importing
-rw-r--r--.gitignore1
-rw-r--r--dfhack/python/pydfhack.cpp2
-rw-r--r--dfhack/python/pydfhack/__init__.py1
-rw-r--r--dfhack/python/pydfhack/pydfapi.py19
-rw-r--r--dfhack/python/setup.py4
5 files changed, 14 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore
index 0facefd9..78db0d39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ examples/fake-curses.h
*.pyc
dfhack/python/pydfhack/_pydfhack.so
dfhack/python/PyDFHack.egg-info
+dfhack/python/build
diff --git a/dfhack/python/pydfhack.cpp b/dfhack/python/pydfhack.cpp
index 3ce0634c..80b2c357 100644
--- a/dfhack/python/pydfhack.cpp
+++ b/dfhack/python/pydfhack.cpp
@@ -62,7 +62,7 @@ static PyMethodDef module_methods[] =
{NULL} //Sentinel
};
-PyMODINIT_FUNC initpydfhack(void)
+PyMODINIT_FUNC init_pydfhack(void)
{
PyObject* module;
diff --git a/dfhack/python/pydfhack/__init__.py b/dfhack/python/pydfhack/__init__.py
new file mode 100644
index 00000000..1f17c856
--- /dev/null
+++ b/dfhack/python/pydfhack/__init__.py
@@ -0,0 +1 @@
+from .pydfapi import API
diff --git a/dfhack/python/pydfhack/pydfapi.py b/dfhack/python/pydfhack/pydfapi.py
index 0cb4c5be..5b7f7ae9 100644
--- a/dfhack/python/pydfhack/pydfapi.py
+++ b/dfhack/python/pydfhack/pydfapi.py
@@ -1,6 +1,5 @@
-import pydfhack, os
-
-class API(pydfhack._API):
+import _pydfhack, os
+class API(_pydfhack._API):
for file in ["Memory.xml", os.path.join("..","..","output","Memory.xml")]:
if os.path.isfile(file):
datafile = file
@@ -9,20 +8,20 @@ class API(pydfhack._API):
raise ImportError, "Memory.xml not found."
def __init__(self, *args, **kwds):
- pydfhack._API.__init__(self, API.datafile)
+ _pydfhack._API.__init__(self, API.datafile)
self._map_mgr_type = Map
self._vegetation_mgr_type = Vegetation
self._gui_mgr_type = GUI
-class Map(pydfhack._MapManager):
+class Map(_pydfhack._MapManager):
def __init__(self, *args, **kwds):
- pydfhack._MapManager.__init__(self, args, kwds)
+ _pydfhack._MapManager.__init__(self, args, kwds)
-class Vegetation(pydfhack._VegetationManager):
+class Vegetation(_pydfhack._VegetationManager):
def __init__(self, *args, **kwds):
- pydfhack._VegetationManager.__init__(self, args, kwds)
+ _pydfhack._VegetationManager.__init__(self, args, kwds)
-class GUI(pydfhack._GUIManager):
+class GUI(_pydfhack._GUIManager):
def __init__(self, *args, **kwds):
- pydfhack._GUIManager.__init__(self, args, kwds)
+ _pydfhack._GUIManager.__init__(self, args, kwds)
diff --git a/dfhack/python/setup.py b/dfhack/python/setup.py
index 6421ff17..22668147 100644
--- a/dfhack/python/setup.py
+++ b/dfhack/python/setup.py
@@ -7,13 +7,13 @@ except ImportError:
from setuptools import setup, find_packages
from distutils.core import Extension
-e = Extension("pydfhack",
+e = Extension("_pydfhack",
sources=["DF_API.cpp", "DF_Buildings.cpp", "DF_Constructions.cpp", "DF_CreatureManager.cpp", "DF_GUI.cpp", "DF_Maps.cpp", "DF_Material.cpp", "DF_Position.cpp", "DF_Translate.cpp", "DF_Vegetation.cpp", "pydfhack.cpp"],
include_dirs=["../", "../include", "../depends/md5", "../depends/tinyxml"],
library_dirs=["..\\..\\output"],
#extra_compile_args=["-w"],
libraries=["libdfhack"],
- export_symbols=["initpydfhack", "ReadRaw", "WriteRaw"])
+ export_symbols=["init_pydfhack", "ReadRaw", "WriteRaw"])
setup(
name="PyDFHack",