OSDN Git Service
(root)
/
meshio
/
meshio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
dd173c5
)
vc2008, gcc-4.5
author
ousttrue
<ousttrue@gmail.com>
Tue, 3 May 2011 17:25:29 +0000
(
02:25
+0900)
committer
ousttrue
<ousttrue@gmail.com>
Tue, 3 May 2011 17:25:29 +0000
(
02:25
+0900)
src/text.h
patch
|
blob
|
history
swig/python/setup.py
patch
|
blob
|
history
diff --git
a/src/text.h
b/src/text.h
index
b192b64
..
34b6f96
100644
(file)
--- a/
src/text.h
+++ b/
src/text.h
@@
-10,7
+10,7
@@
#include <stdlib.h>
#include <cstring>
#include <stdlib.h>
#include <cstring>
-#if
defined(_WIN32)
+#if
def _MSC_VER
#include <windows.h>
#else
#include <iconv.h>
#include <windows.h>
#else
#include <iconv.h>
diff --git
a/swig/python/setup.py
b/swig/python/setup.py
index
fa483f4
..
feeae64
100644
(file)
--- a/
swig/python/setup.py
+++ b/
swig/python/setup.py
@@
-1,5
+1,5
@@
import os
import os
-import
commands
+import
shutil
from distutils.core import setup, Extension
def exec_command(cmd):
from distutils.core import setup, Extension
def exec_command(cmd):
@@
-12,16
+12,26
@@
if os.name=='nt':
extra_compile_args=["/EHsc", "/wd4996"]
libraries=[]
include_dirs=['../../src', BOOST_ROOT]
extra_compile_args=["/EHsc", "/wd4996"]
libraries=[]
include_dirs=['../../src', BOOST_ROOT]
+ if os.path.exists("meshio/mqo.py"):
+ os.remove("meshio/mqo.py")
+ if os.path.exists("meshio/pmd.py"):
+ os.remove("meshio/pmd.py")
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("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")
+ shutil.move("mqo.py", "meshio")
+ shutil.move("pmd.py", "meshio")
else:
extra_compile_args=['-std=c++0x']
libraries=["iconv"]
include_dirs=['../../src']
else:
extra_compile_args=['-std=c++0x']
libraries=["iconv"]
include_dirs=['../../src']
+ if os.path.exists("meshio/mqo.py"):
+ os.remove("meshio/mqo.py")
+ if os.path.exists("meshio/pmd.py"):
+ os.remove("meshio/pmd.py")
exec_command("swig -c++ -python -o mqo_wrap.cpp ../mqo.i")
exec_command("swig -c++ -python -o pmd_wrap.cpp ../pmd.i")
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")
+ shutil.move("mqo.py", "meshio")
+ shutil.move("pmd.py", "meshio")
setup(
name='meshio',
setup(
name='meshio',