aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Mac fixes

Browse source
This commit is contained in:
a b 2011-09-27 22:33:45 +02:00
parent b33b3778f0
commit c4bd38dbdc
5 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/cockatrice.pro
View file

@ -1,5 +1,5 @@
TEMPLATE = app TEMPLATE = app
TARGET = TARGET = cockatrice
DEPENDPATH += . src ../common DEPENDPATH += . src ../common
INCLUDEPATH += . src ../common INCLUDEPATH += . src ../common
MOC_DIR = build MOC_DIR = build
@ -202,6 +202,6 @@ win32 {
} }
macx { macx {
ICON = resources/appicon.icns ICON = resources/appicon.icns
CONFIG += x86 ppc CONFIG += x86_64 release
LIBS += -bind_at_load LIBS += -bind_at_load
} }

4
cockatrice/src/carddatabase.cpp
View file

@ -238,7 +238,7 @@ void PictureLoadingThread::run()
pictureLoader->setPicsPath(picsPath); pictureLoader->setPicsPath(picsPath);
pictureLoader->setPicDownload(picDownload); pictureLoader->setPicDownload(picDownload);
usleep(100); usleep(10000);
initWaitCondition.wakeAll(); initWaitCondition.wakeAll();
exec(); exec();
@ -715,4 +715,4 @@ void CardDatabase::picsPathChanged()
{ {
loadingThread->getPictureLoader()->setPicsPath(settingsCache->getPicsPath()); loadingThread->getPictureLoader()->setPicsPath(settingsCache->getPicsPath());
clearPixmapCache(); clearPixmapCache();
} }

11
cockatrice/src/main.cpp
View file

@ -73,11 +73,11 @@ int main(int argc, char *argv[])
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
QDir baseDir(app.applicationDirPath()); QDir baseDir(app.applicationDirPath());
baseDir.cdUp(); baseDir.cdUp();
baseDir.cdUp();
baseDir.cdUp();
QDir pluginsDir = baseDir; QDir pluginsDir = baseDir;
pluginsDir.cd("PlugIns"); pluginsDir.cd("PlugIns");
app.addLibraryPath(pluginsDir.absolutePath()); app.addLibraryPath(pluginsDir.absolutePath());
baseDir.cdUp();
baseDir.cdUp();
#endif #endif
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
app.addLibraryPath(app.applicationDirPath() + "/plugins"); app.addLibraryPath(app.applicationDirPath() + "/plugins");
@ -116,8 +116,10 @@ int main(int argc, char *argv[])
} }
if (startMainProgram) { if (startMainProgram) {
qDebug("main(): starting main program");
soundEngine = new SoundEngine; soundEngine = new SoundEngine;
qDebug("main(): SoundEngine constructor finished");
MainWindow ui; MainWindow ui;
qDebug("main(): MainWindow constructor finished"); qDebug("main(): MainWindow constructor finished");
@ -129,7 +131,8 @@ int main(int argc, char *argv[])
app.exec(); app.exec();
} }
qDebug("Event loop finished, terminating...");
delete db; delete db;
delete settingsCache; delete settingsCache;
delete rng; delete rng;

2
cockatrice/src/window_deckeditor.cpp
View file

@ -395,7 +395,7 @@ void WndDeckEditor::actPrintDeck()
void WndDeckEditor::actEditSets() void WndDeckEditor::actEditSets()
{ {
WndSets *w = new WndSets(this); WndSets *w = new WndSets;
w->setWindowModality(Qt::WindowModal); w->setWindowModality(Qt::WindowModal);
w->show(); w->show();
} }

3
oracle/oracle.pro
View file

@ -10,6 +10,7 @@ HEADERS += src/oracleimporter.h src/window_main.h ../cockatrice/src/carddatabase
SOURCES += src/main.cpp src/oracleimporter.cpp src/window_main.cpp ../cockatrice/src/carddatabase.cpp ../cockatrice/src/settingscache.cpp SOURCES += src/main.cpp src/oracleimporter.cpp src/window_main.cpp ../cockatrice/src/carddatabase.cpp ../cockatrice/src/settingscache.cpp
macx { macx {
CONFIG += x86 ppc # CONFIG += x86 ppc
CONFIG += x86_64 release
LIBS += -bind_at_load LIBS += -bind_at_load
} }