From dd173c5251722ffc27908e75cfa5ec0839243247 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Wed, 4 May 2011 02:09:56 +0900 Subject: [PATCH] fix for cygwin build --- src/text.h | 2 +- swig/python/{ => meshio}/__init__.py | 0 swig/python/setup.py | 30 +++++++++++++++++++++--------- 3 files changed, 22 insertions(+), 10 deletions(-) rename swig/python/{ => meshio}/__init__.py (100%) diff --git a/src/text.h b/src/text.h index 7f59869..b192b64 100644 --- a/src/text.h +++ b/src/text.h @@ -162,7 +162,7 @@ namespace meshio { } #endif -#if defined(_WIN32) || defined(_MSC_VER) +#if defined(_MSC_VER) inline std::wstring to_WideChar(UINT uCodePage, const std::string &text) { int size=MultiByteToWideChar(uCodePage, 0, text.c_str(), -1, NULL, 0); diff --git a/swig/python/__init__.py b/swig/python/meshio/__init__.py similarity index 100% rename from swig/python/__init__.py rename to swig/python/meshio/__init__.py diff --git a/swig/python/setup.py b/swig/python/setup.py index f40825a..fa483f4 100644 --- a/swig/python/setup.py +++ b/swig/python/setup.py @@ -1,38 +1,50 @@ -BOOST_ROOT='C:/boost/boost_1_46_1' - -# swig -c++ -python -o mqo_wrap.cxx ../mqo.i -# swig -c++ -python -o pmd_wrap.cxx ../pmd.i import os +import commands from distutils.core import setup, Extension +def exec_command(cmd): + print cmd + os.system(cmd) + if os.name=='nt': + BOOST_ROOT='C:/boost/boost_1_46_1' # for vc extra_compile_args=["/EHsc", "/wd4996"] libraries=[] include_dirs=['../../src', BOOST_ROOT] + exec_command("swig -c++ -python -o mqo_wrap.cpp -D_MSC_VER ../mqo.i") + exec_command("swig -c++ -python -o pmd_wrap.cpp -D_MSC_VER ../pmd.i") + exec_command("mv mqo.py pmd.py meshio") else: extra_compile_args=['-std=c++0x'] libraries=["iconv"] include_dirs=['../../src'] + exec_command("swig -c++ -python -o mqo_wrap.cpp ../mqo.i") + exec_command("swig -c++ -python -o pmd_wrap.cpp ../pmd.i") + exec_command("mv mqo.py pmd.py meshio") setup( name='meshio', version='1.0', description='3D mesh IO library', - py_modules=["__init__", "mqo", "pmd"], + author='ousttrue', + author_email='ousttru@gmail.com', + url='http://meshio.sourceforge.jp/', + + packages=['meshio'], ext_modules = [ - Extension("_mqo", + Extension("meshio._mqo", language="c++", - sources=["mqo_wrap.cxx", "../../src/mqo.cpp", "../../src/binary.cpp"], + sources=["mqo_wrap.cpp", "../../src/mqo.cpp", "../../src/binary.cpp"], include_dirs=include_dirs, extra_compile_args=extra_compile_args, libraries=libraries ), - Extension("_pmd", + Extension("meshio._pmd", language="c++", - sources=["pmd_wrap.cxx", "../../src/pmd.cpp", "../../src/binary.cpp"], + sources=["pmd_wrap.cpp", "../../src/pmd.cpp", "../../src/binary.cpp"], include_dirs=include_dirs, extra_compile_args=extra_compile_args, libraries=libraries -- 2.11.0