diff options
| -rw-r--r-- | protocol-fg/ftnoir_fgcontrols.ui | 7 | ||||
| -rw-r--r-- | protocol-wine/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | protocol-wine/ftnoir_protocol_wine.h | 2 | ||||
| -rw-r--r-- | protocol-wine/opentrack-wrapper-wine-main.cxx | 2 |
4 files changed, 3 insertions, 10 deletions
diff --git a/protocol-fg/ftnoir_fgcontrols.ui b/protocol-fg/ftnoir_fgcontrols.ui index 575549d6..bd5b95c7 100644 --- a/protocol-fg/ftnoir_fgcontrols.ui +++ b/protocol-fg/ftnoir_fgcontrols.ui @@ -16,10 +16,6 @@ <property name="windowTitle"> <string>FlightGear protocol settings</string> </property> - <property name="windowIcon"> - <iconset resource="../ftnoir_filter_ewma2/ewma-filter.qrc"> - <normaloff>:/images/filter-16.png</normaloff>:/images/filter-16.png</iconset> - </property> <property name="layoutDirection"> <enum>Qt::LeftToRight</enum> </property> @@ -131,9 +127,6 @@ <tabstop>spinIPFourthNibble</tabstop> <tabstop>spinPortNumber</tabstop> </tabstops> - <resources> - <include location="../ftnoir_filter_ewma2/ewma-filter.qrc"/> - </resources> <connections/> <slots> <slot>startEngineClicked()</slot> diff --git a/protocol-wine/CMakeLists.txt b/protocol-wine/CMakeLists.txt index 682e50de..db5eddb5 100644 --- a/protocol-wine/CMakeLists.txt +++ b/protocol-wine/CMakeLists.txt @@ -9,7 +9,7 @@ if(NOT WIN32) if(APPLE) set(my-rt) endif() - file(GLOB wine-deps ${CMAKE_SOURCE_DIR}/ftnoir_protocol_wine/*.cxx) + file(GLOB wine-deps ${CMAKE_SOURCE_DIR}/protocol-wine/*.cxx) add_custom_command( OUTPUT opentrack-wrapper-wine.exe.so DEPENDS ${wine-deps} diff --git a/protocol-wine/ftnoir_protocol_wine.h b/protocol-wine/ftnoir_protocol_wine.h index 2aeb4608..f1c556d9 100644 --- a/protocol-wine/ftnoir_protocol_wine.h +++ b/protocol-wine/ftnoir_protocol_wine.h @@ -10,7 +10,7 @@ #include <QFile> #include "opentrack/plugin-api.hpp" #include "opentrack-compat/shm.h" -#include "ftnoir_protocol_wine/wine-shm.h" +#include "protocol-wine/wine-shm.h" class FTNoIR_Protocol : public IProtocol { diff --git a/protocol-wine/opentrack-wrapper-wine-main.cxx b/protocol-wine/opentrack-wrapper-wine-main.cxx index ffe8938d..875fc6ef 100644 --- a/protocol-wine/opentrack-wrapper-wine-main.cxx +++ b/protocol-wine/opentrack-wrapper-wine-main.cxx @@ -5,7 +5,7 @@ #endif #include <cstdio> #include "freetrackclient/fttypes.h" -#include "ftnoir_protocol_wine/wine-shm.h" +#include "protocol-wine/wine-shm.h" #include "opentrack-compat/export.hpp" enum Axis { |