diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-19 16:50:41 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-19 16:50:41 +0200 |
| commit | 4da0c0619cbf052eb87a618aba4c8de79f0d4325 (patch) | |
| tree | e075b2a2601d6d2f26a8a70fb83cb682cdfb23df /ftnoir_protocol_wine | |
| parent | f9b5b72cbcf9f121e0184f9a907bbffd7e1e16a9 (diff) | |
| parent | a8165591d993a23ae71ea4e5bb7df7596688ef7b (diff) | |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'ftnoir_protocol_wine')
4 files changed, 9 insertions, 3 deletions
diff --git a/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx b/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx index b5906675..026135f0 100644 --- a/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx +++ b/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx @@ -1,4 +1,8 @@ #include <cerrno> +// OSX sdk 10.8 build error otherwise +#ifdef _LIBCPP_MSVCRT +# undef _LIBCPP_MSVCRT +#endif #include <cstdio> #include "freetrackclient/fttypes.h" #include "ftnoir_protocol_wine/wine-shm.h" @@ -8,7 +12,6 @@ enum Axis { TX = 0, TY, TZ, Yaw, Pitch, Roll }; -#define OPENTRACK_COMPAT_BUNDLED #include "compat/compat.h" void create_registry_key(void); diff --git a/ftnoir_protocol_wine/opentrack-wrapper-wine-posix.cxx b/ftnoir_protocol_wine/opentrack-wrapper-wine-posix.cxx index 010c4440..6f43f899 100644 --- a/ftnoir_protocol_wine/opentrack-wrapper-wine-posix.cxx +++ b/ftnoir_protocol_wine/opentrack-wrapper-wine-posix.cxx @@ -1,4 +1,3 @@ -#define OPENTRACK_COMPAT_BUNDLED #ifdef _WIN32 # undef _WIN32 #endif diff --git a/ftnoir_protocol_wine/opentrack-wrapper-wine-windows.cxx b/ftnoir_protocol_wine/opentrack-wrapper-wine-windows.cxx index 5d19608a..6592fbe6 100644 --- a/ftnoir_protocol_wine/opentrack-wrapper-wine-windows.cxx +++ b/ftnoir_protocol_wine/opentrack-wrapper-wine-windows.cxx @@ -2,7 +2,6 @@ # error "bad cross" #endif -#define OPENTRACK_COMPAT_BUNDLED #define PortableLockedShm ShmWine #include "compat/compat.h" #include "compat/compat.cpp" diff --git a/ftnoir_protocol_wine/wine-shm.h b/ftnoir_protocol_wine/wine-shm.h index c0f29cd3..c7e29abb 100644 --- a/ftnoir_protocol_wine/wine-shm.h +++ b/ftnoir_protocol_wine/wine-shm.h @@ -3,6 +3,11 @@ #define WINE_SHM_NAME "facetracknoir-wine-shm" #define WINE_MTX_NAME "facetracknoir-wine-mtx" +// OSX sdk 10.8 build error otherwise +#ifdef _LIBCPP_MSVCRT +# undef _LIBCPP_MSVCRT +#endif + #include <memory> template<typename t> using ptr = std::shared_ptr<t>; |