summaryrefslogtreecommitdiffhomepage
path: root/proto-wine/opentrack-wrapper-wine-main.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'proto-wine/opentrack-wrapper-wine-main.cxx')
-rw-r--r--proto-wine/opentrack-wrapper-wine-main.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/proto-wine/opentrack-wrapper-wine-main.cxx b/proto-wine/opentrack-wrapper-wine-main.cxx
index 1c88755a..9248a212 100644
--- a/proto-wine/opentrack-wrapper-wine-main.cxx
+++ b/proto-wine/opentrack-wrapper-wine-main.cxx
@@ -1,18 +1,19 @@
#include <cerrno>
+
// OSX sdk 10.8 build error otherwise
-#ifdef _LIBCPP_MSVCRT
-# undef _LIBCPP_MSVCRT
-#endif
+#undef _LIBCPP_MSVCRT
#include <cstdio>
+
#include "freetrackclient/fttypes.h"
-#include "wine-shm.h"
#include "compat/export.hpp"
enum Axis {
TX = 0, TY, TZ, Yaw, Pitch, Roll
};
+#define __WINE_OLE2_H
#include "compat/shm.h"
+#include "wine-shm.h"
void create_registry_key(void);
@@ -41,18 +42,17 @@ private:
void* mem;
void *hMutex, *hMapFile;
};
-#include <windows.h>
int main(void)
{
ShmPosix lck_posix(WINE_SHM_NAME, WINE_MTX_NAME, sizeof(WineSHM));
ShmWine lck_wine("FT_SharedMem", "FT_Mutext", sizeof(FTHeap));
if(!lck_posix.success()) {
- printf("Can't open posix map: %d\n", errno);
+ fprintf(stderr, "Can't open posix map: %d\n", errno);
return 1;
}
if(!lck_wine.success()) {
- printf("Can't open Wine map\n");
+ fprintf(stderr, "Can't open Wine map\n");
return 1;
}
WineSHM* shm_posix = (WineSHM*) lck_posix.ptr();