summaryrefslogtreecommitdiffhomepage
path: root/gui
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-07-08 10:06:49 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-07-08 10:27:30 +0200
commite4cb9703cc6810dbe07070b485ea866f00ba9252 (patch)
treeaa78e77c2ce4520513300d1c06cdb53c5c0cacd7 /gui
parent81b49dabaf168b907252affd5412de7744a409de (diff)
gui, api, proto/wine: get rid of library path as exported symbol
There's no need to do that. It never changes unless the toolchain changes.
Diffstat (limited to 'gui')
-rw-r--r--gui/library-path.cpp4
-rw-r--r--gui/library-path.hpp1
-rw-r--r--gui/ui.cpp5
3 files changed, 3 insertions, 7 deletions
diff --git a/gui/library-path.cpp b/gui/library-path.cpp
deleted file mode 100644
index 683dc346..00000000
--- a/gui/library-path.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "library-path.hpp"
-#include "opentrack-library-path.h"
-
-const char* opentrack_library_path = OPENTRACK_LIBRARY_PATH;
diff --git a/gui/library-path.hpp b/gui/library-path.hpp
deleted file mode 100644
index b6454852..00000000
--- a/gui/library-path.hpp
+++ /dev/null
@@ -1 +0,0 @@
-extern "C" const char* opentrack_library_path;
diff --git a/gui/ui.cpp b/gui/ui.cpp
index dc608a7c..37b9b748 100644
--- a/gui/ui.cpp
+++ b/gui/ui.cpp
@@ -9,10 +9,11 @@
#include "ui.h"
#include "opentrack-logic/tracker.h"
#include "opentrack-compat/options.hpp"
-#include "library-path.hpp"
+#include "opentrack-library-path.h"
#include "new_file_dialog.h"
#include <QFileDialog>
#include <QDesktopServices>
+#include <QCoreApplication>
#ifndef _WIN32
# include <unistd.h>
@@ -21,7 +22,7 @@
#endif
MainWindow::MainWindow() :
- State(opentrack_library_path),
+ State(QCoreApplication::applicationDirPath() + OPENTRACK_LIBRARY_PATH),
pose_update_timer(this),
kbd_quit(QKeySequence("Ctrl+Q"), this),
is_refreshing_profiles(false)