From 29d5ab7336e670ad9b628d8c0df0ff90fc48f334 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Fri, 10 Jan 2014 14:15:13 +0100
Subject: [PATCH] Main library now compiling
---
setup.py | 5 +++--
xbob/machine/include/xbob.machine/api.h | 2 --
xbob/machine/main.cpp | 6 +++++-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/setup.py b/setup.py
index 2fcf70f..0f9ce08 100644
--- a/setup.py
+++ b/setup.py
@@ -4,13 +4,14 @@
# Mon 16 Apr 08:18:08 2012 CEST
from setuptools import setup, find_packages, dist
-dist.Distribution(dict(setup_requires=['xbob.blitz']))
+dist.Distribution(dict(setup_requires=['xbob.blitz', 'xbob.io']))
from xbob.blitz.extension import Extension
+import xbob.io
import os
package_dir = os.path.dirname(os.path.realpath(__file__))
package_dir = os.path.join(package_dir, 'xbob', 'machine', 'include')
-include_dirs = [package_dir]
+include_dirs = [package_dir, xbob.io.get_include()]
packages = ['bob-machine >= 1.3']
version = '2.0.0a0'
diff --git a/xbob/machine/include/xbob.machine/api.h b/xbob/machine/include/xbob.machine/api.h
index f27ab64..1eab3c5 100644
--- a/xbob/machine/include/xbob.machine/api.h
+++ b/xbob/machine/include/xbob.machine/api.h
@@ -88,8 +88,6 @@ typedef struct {
# endif
# endif
- static void **PyXbobMachine_API;
-
/**************
* Versioning *
**************/
diff --git a/xbob/machine/main.cpp b/xbob/machine/main.cpp
index 4b0147a..3750fe6 100644
--- a/xbob/machine/main.cpp
+++ b/xbob/machine/main.cpp
@@ -5,10 +5,14 @@
* @brief Bindings to bob::machine
*/
+#define XBOB_MACHINE_MODULE
+#include <xbob.machine/api.h>
+
#ifdef NO_IMPORT_ARRAY
#undef NO_IMPORT_ARRAY
#endif
-#include <xbob.machine/api.h>
+#include <xbob.blitz/capi.h>
+#include <xbob.io/api.h>
static PyMethodDef library_methods[] = {
{0} /* Sentinel */
--
GitLab