OS X: Fixed “macro redefined” warning

11 years ago · dfa900e4e3
parent 0494fa543f
commit dfa900e4e3
2 changed files with 8 additions and 4 deletions
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@ -4,10 +4,12 @@
 #include <QMessageBox>
 #include <QDir>

-#ifdef __APPLE__
+#ifdef MAC_OS_X_VERSION_MIN_REQUIRED
+#undef MAC_OS_X_VERSION_MIN_REQUIRED
 // We need to do this because of Qt: https://bugreports.qt-project.org/browse/QTBUG-22154
 #define MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
-#endif
+#endif // MAC_OS_X_VERSION_MIN_REQUIRED
+
 #include <SDL.h>

 #include <cstdlib>
--- a/apps/launcher/main.cpp
+++ b/apps/launcher/main.cpp
@ -3,10 +3,12 @@
 #include <QDir>
 #include <QDebug>

-#ifdef __APPLE__
+#ifdef MAC_OS_X_VERSION_MIN_REQUIRED
+#undef MAC_OS_X_VERSION_MIN_REQUIRED
 // We need to do this because of Qt: https://bugreports.qt-project.org/browse/QTBUG-22154
 #define MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
-#endif
+#endif // MAC_OS_X_VERSION_MIN_REQUIRED
+
 #include <SDL.h>

 #include "maindialog.hpp"