diff options
| author | Mihael Koep <koep@schneide.com> | 2012-10-25 17:44:00 +0200 |
|---|---|---|
| committer | Mihael Koep <koep@schneide.com> | 2012-10-25 17:44:00 +0200 |
| commit | 9c6732c05f35bb06f92593b46990473aa7a0f799 (patch) | |
| tree | 12eba41a632342d44ea21fe9738f7b76712fd6e8 | |
| parent | 9866002f3f569f6da886d71964d3298183cd1646 (diff) | |
| download | libuca-9c6732c05f35bb06f92593b46990473aa7a0f799.tar.gz libuca-9c6732c05f35bb06f92593b46990473aa7a0f799.tar.bz2 libuca-9c6732c05f35bb06f92593b46990473aa7a0f799.tar.xz libuca-9c6732c05f35bb06f92593b46990473aa7a0f799.zip | |
Start migrating to libuca 1.1 and glib plugins.
| -rw-r--r-- | plugins/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | plugins/dexela/uca-dexela-camera.c (renamed from src/cameras/uca-dexela-camera.c) | 0 | ||||
| -rw-r--r-- | plugins/dexela/uca-dexela-camera.h (renamed from src/cameras/uca-dexela-camera.h) | 0 | ||||
| -rw-r--r-- | src/config.h.in | 3 |
4 files changed, 3 insertions, 1 deletions
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 5131280..1cfff78 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -3,3 +3,4 @@ add_subdirectory(pf) add_subdirectory(pco) add_subdirectory(pylon) add_subdirectory(ufo) +add_subdirectory(dexela) diff --git a/src/cameras/uca-dexela-camera.c b/plugins/dexela/uca-dexela-camera.c index 7ec96e6..7ec96e6 100644 --- a/src/cameras/uca-dexela-camera.c +++ b/plugins/dexela/uca-dexela-camera.c diff --git a/src/cameras/uca-dexela-camera.h b/plugins/dexela/uca-dexela-camera.h index 9badf10..9badf10 100644 --- a/src/cameras/uca-dexela-camera.h +++ b/plugins/dexela/uca-dexela-camera.h diff --git a/src/config.h.in b/src/config.h.in index ec1fb62..d16158b 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -6,4 +6,5 @@ #cmakedefine HAVE_DEXELA_CL #cmakedefine HAVE_MOCK_CAMERA -#define CONTROL_GLADE_PATH "${CMAKE_INSTALL_PREFIX}/share/libuca/control.glade" +//#define CONTROL_GLADE_PATH "${CMAKE_INSTALL_PREFIX}/share/libuca/control.glade" +#define CONTROL_GLADE_PATH "./control.glade" |