build: fixed MacOS bundle to include all libraries and frameworks
Follwed instructions for Qt from: http://qt-project.org/doc/qt-4.8/deployment-mac.html fortune cookie message = Smile! A smile will make you younger.
This commit is contained in:
+2
-2
@@ -3,7 +3,7 @@
|
||||
#include <QApplication>
|
||||
|
||||
#include "Application.h"
|
||||
#include "includes.h" // defines 'void setup()'
|
||||
#include "includes.h" // defines 'void setup(int argc, char *argv[])'
|
||||
#include "qt/utility/utilityQt.h"
|
||||
#include "qt/view/QtViewFactory.h"
|
||||
#include "utility/logging/ConsoleLogger.h"
|
||||
@@ -20,7 +20,7 @@ void init()
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
setup();
|
||||
setup(argc, argv);
|
||||
|
||||
QApplication qtApp(argc, argv);
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef INCLUDES_H
|
||||
#define INCLUDES_H
|
||||
|
||||
void setup();
|
||||
void setup(int argc, char *argv[]);
|
||||
|
||||
// platform specific include
|
||||
#include "platform_includes/@PLATFORM_INCLUDE@"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef INCLUDES_DEFAULT_H
|
||||
#define INCLUDES_DEFAULT_H
|
||||
|
||||
void setup()
|
||||
void setup(int argc, char *argv[])
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -2,8 +2,9 @@
|
||||
#define INCLUDES_MAC_H
|
||||
|
||||
#include <CoreFoundation/CoreFoundation.h>
|
||||
#include <QDir>
|
||||
|
||||
void setup()
|
||||
void setup(int argc, char *argv[])
|
||||
{
|
||||
// ----------------------------------------------------------------------------
|
||||
// This makes relative paths work in C++ in Xcode by changing directory to the Resources folder inside the .app bundle
|
||||
@@ -29,6 +30,18 @@ void setup()
|
||||
}
|
||||
CFRelease(resourcesURL);
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// This makes the mac bundle search in the right place for the cocoa plugin
|
||||
// source: http://qt-project.org/doc/qt-4.8/deployment-mac.html
|
||||
QDir dir(argv[0]);
|
||||
if (dir.cd("../../PlugIns"))
|
||||
{
|
||||
QCoreApplication::setLibraryPaths(QStringList(dir.absolutePath()));
|
||||
// printf("after change, libraryPaths=(%s)\n", QCoreApplication::libraryPaths().join(",").toUtf8().data());
|
||||
}
|
||||
// ----------------------------------------------------------------------------
|
||||
}
|
||||
|
||||
#endif // INCLUDES_MAC_H
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include "vld.h"
|
||||
|
||||
void setup()
|
||||
void setup(int argc, char *argv[])
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user