--- a/QTfrontend/CocoaInitializer.mm Mon Nov 19 00:49:24 2012 +0100
+++ b/QTfrontend/CocoaInitializer.mm Mon Nov 19 02:48:21 2012 +0100
@@ -33,8 +33,8 @@
CocoaInitializer::CocoaInitializer()
{
c = new CocoaInitializer::Private();
+ c->pool = [[NSAutoreleasePool alloc] init];
NSApplicationLoad();
- c->pool = [[NSAutoreleasePool alloc] init];
}
CocoaInitializer::~CocoaInitializer()
--- a/QTfrontend/M3Panel.h Mon Nov 19 00:49:24 2012 +0100
+++ b/QTfrontend/M3Panel.h Mon Nov 19 02:48:21 2012 +0100
@@ -31,7 +31,7 @@
private:
class Private;
- Private* c;
+ Private* m;
};
#endif
--- a/QTfrontend/M3Panel.mm Mon Nov 19 00:49:24 2012 +0100
+++ b/QTfrontend/M3Panel.mm Mon Nov 19 02:48:21 2012 +0100
@@ -29,19 +29,19 @@
M3Panel::M3Panel(void)
{
- c = new Private;
+ m = new M3Panel::Private();
- c->install = [[M3InstallController alloc] init];
- [c->install retain];
+ m->install = [[M3InstallController alloc] init];
+ [m->install retain];
}
M3Panel::~M3Panel()
{
- [c->install release];
- delete c;
+ [m->install release];
+ delete m;
}
void M3Panel::showInstallController()
{
- [c->install displayInstaller];
+ [m->install displayInstaller];
}
--- a/QTfrontend/SparkleAutoUpdater.mm Mon Nov 19 00:49:24 2012 +0100
+++ b/QTfrontend/SparkleAutoUpdater.mm Mon Nov 19 02:48:21 2012 +0100
@@ -31,7 +31,7 @@
SparkleAutoUpdater::SparkleAutoUpdater()
{
- d = new Private;
+ d = new SparkleAutoUpdater::Private();
d->updater = [SUUpdater sharedUpdater];
[d->updater retain];
--- a/hedgewars/CMakeLists.txt Mon Nov 19 00:49:24 2012 +0100
+++ b/hedgewars/CMakeLists.txt Mon Nov 19 02:48:21 2012 +0100
@@ -100,8 +100,6 @@
endif (APPLE)
endif(BUILD_ENGINE_LIBRARY)
-# doesn't work for some reason (doesn't find symbols)
-#set(pascal_flags "-k${LIBRARY_OUTPUT_PATH}/libphysfs.a" ${pascal_flags})
IF(FPC)
set(fpc_executable ${FPC})