mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-07 05:53:59 -07:00
Merge branch 'master' into ci/use-ninja-win
This commit is contained in:
commit
6bb43e25da
2 changed files with 10 additions and 6 deletions
|
|
@ -214,6 +214,7 @@ int main(int argc, char *argv[])
|
|||
#endif
|
||||
|
||||
#ifdef Q_OS_MAC
|
||||
|
||||
translationPath = qApp->applicationDirPath() + "/../Resources/translations";
|
||||
#elif defined(Q_OS_WIN)
|
||||
translationPath = qApp->applicationDirPath() + "/translations";
|
||||
|
|
@ -237,6 +238,7 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
|
||||
rng = new RNG_SFMT;
|
||||
const auto bla = 42;
|
||||
themeManager = new ThemeManager;
|
||||
soundEngine = new SoundEngine;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue