gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-01-03 16:47:53 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice

Browse Source
This commit is contained in:
Max-Wilhelm Bruker
2011-09-30 19:03:28 +02:00
parent 4bdb9e1ddc c5bde61526
commit 963e8f0d90
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cockatrice/cockatrice.pro
View File

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

4
cockatrice/src/carddatabase.cpp
View File

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

11
cockatrice/src/main.cpp
View File

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

2
cockatrice/src/window_deckeditor.cpp
View File

@@ -395,7 +395,7 @@ void WndDeckEditor::actPrintDeck()
void WndDeckEditor::actEditSets()
{
WndSets *w = new WndSets(this);
WndSets *w = new WndSets;
w->setWindowModality(Qt::WindowModal);
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
macx {
CONFIG += x86 ppc
# CONFIG += x86 ppc
CONFIG += x86_64 release
LIBS += -bind_at_load
}