From 9887381d740e1b792c5d7bacdbc486f31abad1de Mon Sep 17 00:00:00 2001 From: Mario Fink Date: Thu, 9 May 2019 15:27:20 +0200 Subject: [PATCH] build on both OSX and Linux --- lib/tdm_ripper.hpp | 1 + makefile | 8 ++++++-- setup.py | 6 +++--- setup_osx.py | 19 +++++++++++++++++++ 4 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 setup_osx.py diff --git a/lib/tdm_ripper.hpp b/lib/tdm_ripper.hpp index ab8ce72..1f4a8cb 100644 --- a/lib/tdm_ripper.hpp +++ b/lib/tdm_ripper.hpp @@ -11,6 +11,7 @@ #include #include #include +#include #include "../pugixml/pugixml.hpp" diff --git a/makefile b/makefile index 12a5ff4..0a5cb74 100644 --- a/makefile +++ b/makefile @@ -1,7 +1,8 @@ EXE = tdm_parser -CC = g++ -std=c++11 -stdlib=libc++ +CC = g++ -std=c++11 +# -stdlib=libc++ CPPFLAGS = -O3 -Wall -Werror -Wunused-variable -Wsign-compare LIB = pugixml/ @@ -12,7 +13,7 @@ main.o : main.cpp $(CC) -c $(CPPFLAGS) -I $(LIB) $< -o $@ tdm_ripper.o : lib/tdm_ripper.cpp lib/tdm_ripper.hpp - $(CC) -c $(CPPFLAGS) -I $(LIB) $< -o $@ + $(CC) -c $(CPPFLAGS) -I $(LIB) $< -o $@ clean : rm -f $(EXE) *.o @@ -25,6 +26,9 @@ pylib : setup.py pytdm_ripper.pyx tdm_ripper.pxd tdm_ripper.o install : setup.py pytdm_ripper.pyx tdm_ripper.pxd lib/tdm_ripper.cpp lib/tdm_ripper.hpp python3 setup.py install +install_osx : setup_osx.py pytdm_ripper.pyx tdm_ripper.pxd lib/tdm_ripper.cpp lib/tdm_ripper.hpp + python3 setup_osx.py install + lib/libtdmripper.a : make -C lib libtdmripper.a diff --git a/setup.py b/setup.py index 6a2c47d..1a7e79e 100644 --- a/setup.py +++ b/setup.py @@ -4,13 +4,13 @@ from Cython.Build import cythonize extensions = Extension( name="tdm_ripper", - sources=["pytdm_ripper.pyx"], #,"lib/tdm_ripper.cpp"], + sources=["pytdm_ripper.pyx"], # libraries=[""], library_dirs=["lib"], include_dirs=["lib"], language='c++', - extra_compile_args=['-stdlib=libc++','-std=c++11','-Wno-unused-variable'], - extra_link_args=['-stdlib=libc++','-std=c++11'], + extra_compile_args=['-std=c++11','-Wno-unused-variable'], + extra_link_args=['-std=c++11'], ) setup( diff --git a/setup_osx.py b/setup_osx.py new file mode 100644 index 0000000..cd2876a --- /dev/null +++ b/setup_osx.py @@ -0,0 +1,19 @@ +from distutils.core import setup +from distutils.extension import Extension +from Cython.Build import cythonize + +extensions = Extension( + name="tdm_ripper", + sources=["pytdm_ripper.pyx"], + # libraries=[""], + library_dirs=["lib"], + include_dirs=["lib"], + language='c++', + extra_compile_args=['-stdlib=libc++','-std=c++11','-Wno-unused-variable'], + extra_link_args=['-stdlib=libc++','-std=c++11'], +) + +setup( + name="tdm_ripper", + ext_modules=cythonize(extensions) +)