summaryrefslogtreecommitdiffhomepage
path: root/facetracknoir
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2014-08-30 10:19:10 +0200
committerStanislaw Halik <sthalik@misaki.pl>2014-08-30 10:22:12 +0200
commit0027139d8348e07e6a2d9734489964961294fe22 (patch)
tree490a4b215f6005e7f444f4f97cddaf60f357fcd0 /facetracknoir
parent512d269886e2d27c105157ef0db926fe03d48f70 (diff)
remove MSVC support
Leave as-is to avoid unconditionally assuming GNU extensions and ABI
Diffstat (limited to 'facetracknoir')
-rw-r--r--facetracknoir/facetracknoir.cpp2
-rw-r--r--facetracknoir/main.cpp26
-rw-r--r--facetracknoir/plugin-support.h8
3 files changed, 2 insertions, 34 deletions
diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp
index 00a7b95e..d717b3be 100644
--- a/facetracknoir/facetracknoir.cpp
+++ b/facetracknoir/facetracknoir.cpp
@@ -44,7 +44,7 @@
#include <iostream>
#ifdef _MSC_VER
-# define LIB_PREFIX ""
+# error "No support for MSVC anymore"
#else
# define LIB_PREFIX "lib"
#endif
diff --git a/facetracknoir/main.cpp b/facetracknoir/main.cpp
index 3143a093..9bf11b32 100644
--- a/facetracknoir/main.cpp
+++ b/facetracknoir/main.cpp
@@ -32,34 +32,8 @@
#include <QStringList>
#include <memory>
-#if defined(_WIN32) && defined(_MSC_VER)
-# include <windows.h>
-# ifdef OPENTRACK_BREAKPAD
-# include <exception_handler.h>
-using namespace google_breakpad;
-bool dumpCallback(const wchar_t* dump_path,
- const wchar_t* minidump_id,
- void* context,
- EXCEPTION_POINTERS* exinfo,
- MDRawAssertionInfo* assertion,
- bool succeeded)
-{
- MessageBoxA(GetDesktopWindow(),
- "Generating crash dump!\r\n"
- "Please send the .dmp file to <sthalik@misaki.pl> to help us improve the code.",
- "opentrack crashed :(",
- MB_OK | MB_ICONERROR);
- return succeeded;
-}
-
-# endif
-#endif
-
int main(int argc, char** argv)
{
-#if defined(OPENTRACK_BREAKPAD) && defined(_MSC_VER)
- auto handler = new ExceptionHandler(L".", nullptr, dumpCallback, nullptr, -1);
-#endif
QApplication::setAttribute(Qt::AA_X11InitThreads, true);
QApplication app(argc, argv);
auto w = std::make_shared<FaceTrackNoIR>();
diff --git a/facetracknoir/plugin-support.h b/facetracknoir/plugin-support.h
index 4394d1a0..1c63151a 100644
--- a/facetracknoir/plugin-support.h
+++ b/facetracknoir/plugin-support.h
@@ -3,7 +3,7 @@
#if defined(_WIN32)
# define CALLING_CONVENTION_SUFFIX_VOID_FUNCTION "@0"
# ifdef _MSC_VER
-# define MAYBE_STDCALL_UNDERSCORE "_"
+# error "No support for MSVC anymore"
#else
# define MAYBE_STDCALL_UNDERSCORE ""
# endif
@@ -12,12 +12,6 @@
# define MAYBE_STDCALL_UNDERSCORE ""
#endif
-#ifdef _MSC_VER
-# define virt_override
-#else
-# define virt_override override
-#endif
-
#include <cstdio>
#include <QWidget>