Skip to content

Commit

Permalink
Merge branch 'master' of github.com:/proycon/python-timbl
Browse files Browse the repository at this point in the history
  • Loading branch information
proycon committed Feb 26, 2018
2 parents 3fe2d52 + 6423d74 commit 2560703
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
4 changes: 3 additions & 1 deletion setup2.py
Expand Up @@ -179,6 +179,8 @@ def build_extensions(self):
else:
ext.libraries.append(self.boostlib)

ext.extra_compile_args.extend("-std=c++11")

build_ext.build_extensions(self)


Expand All @@ -190,7 +192,7 @@ def build_extensions(self):
setup(
name="python-timbl",
version="2018.02.26",
description="Python 3 language binding for the Tilburg Memory-Based Learner",
description="Python 2 language binding for the Tilburg Memory-Based Learner",
author="Sander Canisius, Maarten van Gompel",
author_email="S.V.M.Canisius@uvt.nl, proycon@anaproy.nl",
url="http://github.com/proycon/python-timbl",
Expand Down
3 changes: 3 additions & 0 deletions setup3.py
Expand Up @@ -170,12 +170,15 @@ def build_extensions(self):
ext.library_dirs.append(self.libxml2_library_dir)


ext.extra_compile_args.extend(["-std=c++11"])
if isinstance(self.compiler, UnixCCompiler) and self.static_boost_python:
ext.extra_link_args.extend(
"-Wl,-Bstatic -l" + self.boostlib + " -Wl,-Bdynamic".split())
else:
ext.libraries.append(self.boostlib)

ext.extra_compile_args.extend("-std=c++11")

build_ext.build_extensions(self)


Expand Down
1 change: 1 addition & 0 deletions src/timblapi.cc
Expand Up @@ -54,6 +54,7 @@
#include <iostream>
#include <sstream>
#include <string>
#include <unordered_map>

#ifndef __clang__
#include <ext/stdio_filebuf.h>
Expand Down

0 comments on commit 2560703

Please sign in to comment.