diff options
Diffstat (limited to 'ftnoir_protocol_wine')
4 files changed, 6 insertions, 18 deletions
diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp b/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp index 5f80944a..99ad30a2 100644 --- a/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp +++ b/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp @@ -56,7 +56,4 @@ bool FTNoIR_Protocol::correct() return lck_shm.success(); } -extern "C" OPENTRACK_EXPORT void* GetConstructor() -{ - return (IProtocol*) new FTNoIR_Protocol; -} +OPENTRACK_DECLARE_PROTOCOL(FTNoIR_Protocol, FTControls, FTNoIR_ProtocolDll) diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine_dialog.cpp b/ftnoir_protocol_wine/ftnoir_protocol_wine_dialog.cpp index 81fc9560..e4027c73 100644 --- a/ftnoir_protocol_wine/ftnoir_protocol_wine_dialog.cpp +++ b/ftnoir_protocol_wine/ftnoir_protocol_wine_dialog.cpp @@ -17,7 +17,3 @@ void FTControls::doCancel() { this->close(); } -extern "C" OPENTRACK_EXPORT void* GetDialog( ) -{ - return (IProtocolDialog*) new FTControls; -} diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine_dll.cpp b/ftnoir_protocol_wine/ftnoir_protocol_wine_dll.cpp deleted file mode 100644 index 92faaa94..00000000 --- a/ftnoir_protocol_wine/ftnoir_protocol_wine_dll.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "ftnoir_protocol_wine.h" -#include "opentrack/plugin-api.hpp" - -extern "C" OPENTRACK_EXPORT Metadata* GetMetadata() -{ - return new FTNoIR_ProtocolDll; -} diff --git a/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx b/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx index 896d8078..b5906675 100644 --- a/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx +++ b/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx @@ -2,9 +2,11 @@ #include <cstdio> #include "freetrackclient/fttypes.h" #include "ftnoir_protocol_wine/wine-shm.h" +#include "opentrack/export.hpp" -#define OPENTRACK_CROSS_ONLY -#include "../opentrack/plugin-api.hpp" +enum Axis { + TX = 0, TY, TZ, Yaw, Pitch, Roll +}; #define OPENTRACK_COMPAT_BUNDLED #include "compat/compat.h" @@ -71,5 +73,5 @@ int main(void) for (int i = 0; i < 8; i++) shm_wine->table[i] = shm_posix->table[i]; (void) Sleep(4); - } + } } |