From f47a4782da79a42784902cd660bceb889f6f7055 Mon Sep 17 00:00:00 2001 From: Jennifer Taylor Date: Wed, 19 May 2021 20:16:51 +0000 Subject: [PATCH] Another attempted fix for CLANG on OSX. --- .gitignore | 1 + .../afp/{blendaltimpl.cpp => blendaltimpl.cxx} | 0 bemani/protocol/{lz77.cpp => lz77.cxx} | 0 setup.py | 14 ++++++++++---- 4 files changed, 11 insertions(+), 4 deletions(-) rename bemani/format/afp/{blendaltimpl.cpp => blendaltimpl.cxx} (100%) rename bemani/protocol/{lz77.cpp => lz77.cxx} (100%) diff --git a/.gitignore b/.gitignore index c59dc2d..a61fd21 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ __pycache__ *.pyo .mypy_cache/ *.c +*.cpp *.o *.so build/ diff --git a/bemani/format/afp/blendaltimpl.cpp b/bemani/format/afp/blendaltimpl.cxx similarity index 100% rename from bemani/format/afp/blendaltimpl.cpp rename to bemani/format/afp/blendaltimpl.cxx diff --git a/bemani/protocol/lz77.cpp b/bemani/protocol/lz77.cxx similarity index 100% rename from bemani/protocol/lz77.cpp rename to bemani/protocol/lz77.cxx diff --git a/setup.py b/setup.py index a0c1158..4489cfd 100644 --- a/setup.py +++ b/setup.py @@ -90,8 +90,11 @@ setup( Extension( "bemani.protocol.lz77alt", [ - "bemani/protocol/lz77.cpp", - ] + "bemani/protocol/lz77.cxx", + ], + language="c++", + extra_compile_args=["-std=c++14"], + extra_link_args=["-std=c++14"], ), Extension( "bemani.protocol.node", @@ -127,8 +130,11 @@ setup( "bemani.format.afp.blendalt", [ "bemani/format/afp/blendalt.pyx", - "bemani/format/afp/blendaltimpl.cpp", - ] + "bemani/format/afp/blendaltimpl.cxx", + ], + language="c++", + extra_compile_args=["-std=c++14"], + extra_link_args=["-std=c++14"], ), Extension( "bemani.format.afp.types.generic",