diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-28 07:59:39 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-28 07:59:39 +0200 |
| commit | a7941f6dcad548bfbd6e8c5a5b7ebcb83d9c1df6 (patch) | |
| tree | aa92039b15df5fb4c2f2af5bf295031e4c4e931e | |
| parent | dfdfe5f030f75399d6f0c93c56e7aa0b84c30e9e (diff) | |
fix Linux "make all" completelyopentrack-2.2-stable-20150728stable/2.2
Closes #209
| -rw-r--r-- | facetracknoir/plugin-support.cpp | 1 | ||||
| -rw-r--r-- | ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/facetracknoir/plugin-support.cpp b/facetracknoir/plugin-support.cpp index 2e80c5e4..6c52f972 100644 --- a/facetracknoir/plugin-support.cpp +++ b/facetracknoir/plugin-support.cpp @@ -1,5 +1,6 @@ #include "plugin-support.h" #include <QCoreApplication> +#include <QFile> #if !(defined(_WIN32)) # include <dlfcn.h> diff --git a/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx b/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx index 6e512b6e..f4a22c14 100644 --- a/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx +++ b/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx @@ -34,7 +34,7 @@ private: int main(void) { ShmPosix lck_posix(WINE_SHM_NAME, WINE_MTX_NAME, sizeof(WineSHM)); - ShmWine lck_wine("FT_SharedMem", "FT_Mutext", sizeof(FTMemMap)); + ShmWine lck_wine("FT_SharedMem", "FT_Mutext", sizeof(FTHeap)); if(!lck_posix.success()) { printf("Can't open posix map: %d\n", errno); return 1; @@ -44,8 +44,8 @@ int main(void) return 1; } WineSHM* shm_posix = (WineSHM*) lck_posix.mem; - FTMemMap* shm_wine = (FTMemMap*) lck_wine.mem; - TFreeTrackData* data = &shm_wine->data; + FTHeap* shm_wine = (FTHeap*) lck_wine.mem; + FTData* data = &shm_wine->data; create_registry_key(); while (1) { (void) Sleep(10); |