Some changes for mingw

develop
RusAnon 2010-05-05 20:33:44 +11:00
parent 1da629fc5c
commit 735b49e776
2 changed files with 11 additions and 5 deletions

@ -14,21 +14,27 @@ if platform.system() == 'Windows':
for libdir in ["..", path.join("..",".."), path.join("..", "..", "output"), path.join("..", "..", "output", "Release")]: for libdir in ["..", path.join("..",".."), path.join("..", "..", "output"), path.join("..", "..", "output", "Release")]:
if path.isfile(path.join(libdir, "dfhack.lib")): if path.isfile(path.join(libdir, "dfhack.lib")):
lib_dirs = libdir lib_dirs = libdir
libraries=["dfhack"]
break
if path.isfile(path.join(libdir, "libdfhack.dll")):
lib_dirs = libdir
libraries = ["libdfhack"]
break break
else: else:
raise Exception("dfhack.lib is not found") raise Exception("dfhack.lib is not found")
osspec = dict(library_dirs=[lib_dirs]) osspec = dict(library_dirs=[lib_dirs],
libraries=libraries)
elif platform.system() == 'Linux': elif platform.system() == 'Linux':
osspec = dict(extra_compile_args=["-DLINUX_BUILD", "-w"], osspec = dict(extra_compile_args=["-DLINUX_BUILD", "-w"],
library_dirs=[path.join("..","..","output")]) library_dirs=[path.join("..","..","output")],
libraries=["dfhack"])
e = Extension("pydfhack._pydfhack", e = Extension("pydfhack._pydfhack",
sources=["DF_API.cpp", "DF_Buildings.cpp", "DF_Constructions.cpp", "DF_CreatureManager.cpp",\ 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_GUI.cpp", "DF_Maps.cpp", "DF_Material.cpp", "DF_Position.cpp", "DF_Translate.cpp",\
"DF_Vegetation.cpp", "pydfhack.cpp"], "DF_Vegetation.cpp", "pydfhack.cpp"],
include_dirs=["../", path.join("..", "include"), path.join("..","depends","md5"), path.join("..","depends","tinyxml")], include_dirs=["../", path.join("..", "include"), path.join("..","depends","md5"), path.join("..","depends","tinyxml")],
libraries=["dfhack"],
export_symbols=["init_pydfhack", "ReadRaw", "WriteRaw"], export_symbols=["init_pydfhack", "ReadRaw", "WriteRaw"],
**osspec) **osspec)

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import pydfhack from pydfhack import API
DF = pydfhack._API("Memory.xml") DF = API("Memory.xml")
if DF.Attach(): if DF.Attach():
Mats = DF.materials Mats = DF.materials