summaryrefslogtreecommitdiffhomepage
path: root/qxt-mini
diff options
context:
space:
mode:
Diffstat (limited to 'qxt-mini')
-rw-r--r--qxt-mini/CMakeLists.txt9
-rw-r--r--qxt-mini/qxtglobal.h6
-rw-r--r--qxt-mini/qxtglobalshortcut.cpp1
-rw-r--r--qxt-mini/qxtglobalshortcut_mac.cpp1
-rw-r--r--qxt-mini/qxtglobalshortcut_x11.cpp3
5 files changed, 16 insertions, 4 deletions
diff --git a/qxt-mini/CMakeLists.txt b/qxt-mini/CMakeLists.txt
new file mode 100644
index 00000000..5de29cd1
--- /dev/null
+++ b/qxt-mini/CMakeLists.txt
@@ -0,0 +1,9 @@
+if(UNIX OR APPLE)
+ opentrack_boilerplate(opentrack-qxt-mini NO-LINKER-SCRIPT NO-COMPAT)
+ if(NOT APPLE)
+ target_link_libraries(opentrack-qxt-mini X11)
+ else()
+ set_target_properties(opentrack-qxt-mini PROPERTIES LINK_FLAGS
+ "-framework Carbon -framework CoreFoundation")
+ endif()
+endif()
diff --git a/qxt-mini/qxtglobal.h b/qxt-mini/qxtglobal.h
index 574482ae..64fd35dc 100644
--- a/qxt-mini/qxtglobal.h
+++ b/qxt-mini/qxtglobal.h
@@ -51,6 +51,12 @@
#define QXT_DLLEXPORT DO_NOT_USE_THIS_ANYMORE
+#ifdef BUILD_opentrack_qxt_mini
+# define QXT_BUILD
+# define BUILD_QXT_GUI
+# define BUILD_QXT
+#endif
+
#ifdef QXT_BUILD
# if defined(BUILD_QXT_CORE)
# define QXT_CORE_EXPORT Q_DECL_EXPORT
diff --git a/qxt-mini/qxtglobalshortcut.cpp b/qxt-mini/qxtglobalshortcut.cpp
index 4b400a72..45576d37 100644
--- a/qxt-mini/qxtglobalshortcut.cpp
+++ b/qxt-mini/qxtglobalshortcut.cpp
@@ -1,4 +1,3 @@
-#define QXT_BUILD
#include "qxtglobalshortcut.h"
/****************************************************************************
** Copyright (c) 2006 - 2011, the LibQxt project.
diff --git a/qxt-mini/qxtglobalshortcut_mac.cpp b/qxt-mini/qxtglobalshortcut_mac.cpp
index 34de694e..b19de377 100644
--- a/qxt-mini/qxtglobalshortcut_mac.cpp
+++ b/qxt-mini/qxtglobalshortcut_mac.cpp
@@ -1,5 +1,4 @@
#ifdef __APPLE__
-#define QXT_BUILD
#include <Carbon/Carbon.h>
/****************************************************************************
** Copyright (c) 2006 - 2011, the LibQxt project.
diff --git a/qxt-mini/qxtglobalshortcut_x11.cpp b/qxt-mini/qxtglobalshortcut_x11.cpp
index b13770a2..12279ac8 100644
--- a/qxt-mini/qxtglobalshortcut_x11.cpp
+++ b/qxt-mini/qxtglobalshortcut_x11.cpp
@@ -1,5 +1,4 @@
-#ifndef __APPLE_
-#define QXT_BUILD
+#ifndef __APPLE__
#include "qxtglobalshortcut_p.h"
/****************************************************************************
** Copyright (c) 2006 - 2011, the LibQxt project.