Fixed conditional compilation so that it trigs for all APPLE based OS…

…es instead of just OSX.
Larswad · Jun 3, 2014 · dcfac51 · dcfac51
1 parent f53d57d
commit dcfac51
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/d64driver.hpp b/d64driver.hpp
@@ -39,7 +39,7 @@ class D64 : public FileDriverBase
 
 	const QStringList& extension() const
 	{
-#if !(defined(TARGET_OS_X) || defined(_MSC_VER))
+#if !(defined(__APPLE__) || defined(_MSC_VER))
 		static const QStringList ext({ "D64" });
 #else
 		static QStringList ext;

diff --git a/m2idriver.hpp b/m2idriver.hpp
@@ -11,7 +11,7 @@ class M2I : public FileDriverBase
 
 	const QStringList& extension() const
 	{
-#if !(defined(TARGET_OS_X) || defined(_MSC_VER))
+#if !(defined(__APPLE__) || defined(_MSC_VER))
 		static const QStringList ext({ "M2I" });
 #else
 		static QStringList ext;

diff --git a/main.cpp b/main.cpp
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 	// Configure our "looks". Take the most preferred one, but take into accout what may exist on this platform.
 	foreach(QString style, QStyleFactory::keys())
 		qDebug() << "style: " << style;
-#if !(defined(TARGET_OS_X) || defined(_MSC_VER))
+#if !(defined(__APPLE__) || defined(_MSC_VER))
 	QStringList preferredStyles({ "WindowsXP", "Fusion", "CleanLooks", "Windows"});
 #else
 	QStringList preferredStyles;
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
 // This works even if the font is not registered in system globally.
 static bool addEmbeddedFonts()
 {
-#if !(defined(TARGET_OS_X) || defined(_MSC_VER))
+#if !(defined(__APPLE__) || defined(_MSC_VER))
 	QStringList list({ "PetMe64.ttf" , "PetMe2X.ttf" , "PetMe1282Y.ttf" });
 #else
 	// NOTE: QT5 for OSX has bug that won't let us use c++11 features. Special compile here until fixed.

diff --git a/t64driver.hpp b/t64driver.hpp
@@ -13,7 +13,7 @@ class T64 : public FileDriverBase
 
 	const QStringList& extension() const
 	{
-#if !(defined(TARGET_OS_X) || defined(_MSC_VER))
+#if !(defined(__APPLE__) || defined(_MSC_VER))
 		static const QStringList ext({ "T64" });
 #else
 		static QStringList ext;

diff --git a/x00fs.hpp b/x00fs.hpp
@@ -24,7 +24,7 @@ class x00FS : public NativeFS
 
 	const QStringList& extension() const
 	{
-#if !(defined(TARGET_OS_X) || defined(_MSC_VER))
+#if !(defined(__APPLE__) || defined(_MSC_VER))
 		static const QStringList ext( { "P00", "R00", "S00" } );
 #else
 		static QStringList ext;