From e009f816395d5af9c8a1e0cafc5475fe1d2ca418 Mon Sep 17 00:00:00 2001 From: Peter Thomas Barrow Date: Tue, 20 Aug 2024 09:50:42 +0100 Subject: [PATCH] ci: windows fix --- setup.py | 4 ++-- tangy_src/_uqd.pxd | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index fc6ec5e..b20b0c1 100644 --- a/setup.py +++ b/setup.py @@ -74,9 +74,9 @@ def building_on_github_actions(): "tangy._uqd", sources=[os.path.join(cython_dir, "_uqd.py")], define_macros=[('NPY_NO_DEPRECATED_API', 'NPY_1_7_API_VERSION')], - include_dirs=[base_path, base_path + '\\opt\\CTimeTag\\Win64\\'], + include_dirs=[get_include(), base_path + "\\opt\\CTimeTag\\Include\\"], libraries=["CTimeTagLib"], - library_dirs=[get_include(), base_path + "\\opt\\CTimeTag\\Include\\"], + library_dirs=[base_path, base_path + '\\opt\\CTimeTag\\Win64\\'], extra_link_args=['/d2:-AllowCompatibleILVersions'], extra_compile_args=compiler_flags, language="c++", diff --git a/tangy_src/_uqd.pxd b/tangy_src/_uqd.pxd index 6e2458d..a58201f 100644 --- a/tangy_src/_uqd.pxd +++ b/tangy_src/_uqd.pxd @@ -1,7 +1,6 @@ from libcpp cimport bool from libcpp.string cimport string -# cdef extern from "../opt/CTimeTag/Include/CTimeTag.h" namespace "TimeTag": cdef extern from "CTimeTag.h" namespace "TimeTag": cdef cppclass CTimeTag: CTimeTag() @@ -43,7 +42,6 @@ cdef extern from "CTimeTag.h" namespace "TimeTag": void SetFG(int period, int high) -# cdef extern from "../opt/CTimeTag/Include/CLogic.h" namespace "TimeTag": cdef extern from "CLogic.h" namespace "TimeTag": cdef cppclass CLogic(CTimeTag): CLogic(CTimeTag *interface)