Mac add missing Qt framework

ETCLabs · May 7, 2018 · b3f6d20 · b3f6d20
1 parent 4d4cfc5
commit b3f6d20
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 18 deletions.
diff --git a/OSCWidgets.xcodeproj/project.pbxproj b/OSCWidgets.xcodeproj/project.pbxproj
diff --git a/OSCWidgets/EosPlatform.cpp b/OSCWidgets/EosPlatform.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Electronic Theatre Controls, Inc., http://www.etcconnect.com
+// Copyright (c) 2018 Electronic Theatre Controls, Inc., http://www.etcconnect.com
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/OSCWidgets/EosPlatform.h b/OSCWidgets/EosPlatform.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Electronic Theatre Controls, Inc., http://www.etcconnect.com
+// Copyright (c) 2018 Electronic Theatre Controls, Inc., http://www.etcconnect.com
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/OSCWidgets/EosPlatform_Mac.cpp b/OSCWidgets/EosPlatform_Mac.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Electronic Theatre Controls, Inc., http://www.etcconnect.com
+// Copyright (c) 2018 Electronic Theatre Controls, Inc., http://www.etcconnect.com
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -41,7 +41,10 @@ EosPlatform_Mac::~EosPlatform_Mac()
 bool EosPlatform_Mac::Initialize(std::string &error)
 {
 	if(m_Platform == 0)
+    {
 		m_Platform = Bridge_CreatePlatform(error);
+        Bridge_InitQtPlugins();
+    }
 
 	return (m_Platform != 0);
 }

diff --git a/OSCWidgets/EosPlatform_Mac.h b/OSCWidgets/EosPlatform_Mac.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Electronic Theatre Controls, Inc., http://www.etcconnect.com
+// Copyright (c) 2018 Electronic Theatre Controls, Inc., http://www.etcconnect.com
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/OSCWidgets/EosPlatform_Mac_Bridge.h b/OSCWidgets/EosPlatform_Mac_Bridge.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Electronic Theatre Controls, Inc., http://www.etcconnect.com
+// Copyright (c) 2018 Electronic Theatre Controls, Inc., http://www.etcconnect.com
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -29,6 +29,7 @@ void* Bridge_CreatePlatform(std::string &error);
 void Bridge_DestroyPlatform(void *platform);
 void* Bridge_BeginActivity(const std::string &reason, std::string &error);
 void Bridge_EndActivity(void *activity);
+void Bridge_InitQtPlugins();
 
 ////////////////////////////////////////////////////////////////////////////////
 

diff --git a/OSCWidgets/EosPlatform_Mac_Native.h b/OSCWidgets/EosPlatform_Mac_Native.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Electronic Theatre Controls, Inc., http://www.etcconnect.com
+// Copyright (c) 2018 Electronic Theatre Controls, Inc., http://www.etcconnect.com
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/OSCWidgets/EosPlatform_Mac_Native.mm b/OSCWidgets/EosPlatform_Mac_Native.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Electronic Theatre Controls, Inc., http://www.etcconnect.com
+// Copyright (c) 2018 Electronic Theatre Controls, Inc., http://www.etcconnect.com
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,6 +20,9 @@
 
 #import "EosPlatform_Mac_Native.h"
 #import "EosPlatform_Mac_Bridge.h"
+#import <QtWidgets/QApplication>
+#import <QtCore/QDir>
+#import <QtCore/QUrl>
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -112,3 +115,17 @@ + (void)EndActivity:(id)activity
 @end
 
 ////////////////////////////////////////////////////////////////////////////////
+
+void Bridge_InitQtPlugins()
+{
+    // only load plugins from our bundle
+    CFURLRef url = (CFURLRef)CFAutorelease((CFURLRef)CFBundleCopyBundleURL(CFBundleGetMainBundle()));
+    if(url != nil)
+    {
+        QDir dir( QUrl::fromCFURL(url).path() );
+        if( dir.cd("Contents/Plugins") )
+            QApplication::setLibraryPaths(QStringList() << dir.canonicalPath());
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/OSCWidgets/MainWindow.cpp b/OSCWidgets/MainWindow.cpp
@@ -27,7 +27,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#define APP_VERSION	"0.7"
+#define APP_VERSION	"0.8"
 
 #define MIN_OPACITY 10
 

diff --git a/OSCWidgets/main.cpp b/OSCWidgets/main.cpp
@@ -27,8 +27,6 @@
 #include "Utils.h"
 #include "EosPlatform.h"
 
-// TODO: image format plugins!
-
 ////////////////////////////////////////////////////////////////////////////////
 
 int main(int argc, char* argv[])
@@ -50,13 +48,6 @@ int main(int argc, char* argv[])
     }
 
 	QApplication app(argc, argv);
-
-#ifndef WIN32
-	QDir dir( app.applicationDirPath() );
-	dir.cdUp();
-	dir.cd("Plugins");
-	app.setLibraryPaths( QStringList(dir.canonicalPath()) );
-#endif
 
 	app.setDesktopSettingsAware(false);
 	app.setQuitOnLastWindowClosed(false);