mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 01:09:50 +00:00
Fix Qt build on Windows
This commit is contained in:
parent
d449df1718
commit
207d7323ce
3 changed files with 22 additions and 2 deletions
|
@ -147,6 +147,9 @@ external_stlport
|
|||
thumbs.db
|
||||
Thumbs.db
|
||||
*.tpl.php
|
||||
.SyncID
|
||||
.SyncIgnore
|
||||
.SyncArchive
|
||||
|
||||
# build
|
||||
code/nel/build/*
|
||||
|
|
|
@ -104,7 +104,11 @@ static inline QString msgCoreLoadFailure(const QString &why)
|
|||
return QCoreApplication::translate("Application", "Failed to load Core plugin: %1").arg(why);
|
||||
}
|
||||
|
||||
sint main(int argc, char **argv)
|
||||
#ifdef NL_OS_WINDOWS
|
||||
int __stdcall WinMain(void *hInstance, void *hPrevInstance, void *lpCmdLine, int nShowCmd)
|
||||
#else // NL_OS_WINDOWS
|
||||
int main(int argc, char **argv)
|
||||
#endif // NL_OS_WINDOWS
|
||||
{
|
||||
// go nel!
|
||||
new NLMISC::CApplicationContext;
|
||||
|
@ -129,7 +133,11 @@ sint main(int argc, char **argv)
|
|||
nlinfo("Welcome to NeL Object Viewer Qt!");
|
||||
}
|
||||
QApplication::setGraphicsSystem("raster");
|
||||
#ifdef NL_OS_WINDOWS
|
||||
QApplication app(__argc, __argv);
|
||||
#else // NL_OS_WINDOWS
|
||||
QApplication app(argc, argv);
|
||||
#endif // NL_OS_WINDOWS
|
||||
QSplashScreen *splash = new QSplashScreen();
|
||||
splash->setPixmap(QPixmap(":/images/nel_ide_load.png"));
|
||||
splash->show();
|
||||
|
|
|
@ -87,9 +87,18 @@ void messageHandler(QtMsgType p_type, const char* p_msg)
|
|||
# endif
|
||||
#endif
|
||||
|
||||
sint main(int argc, char **argv)
|
||||
#ifdef NL_OS_WINDOWS
|
||||
int __stdcall WinMain(void *hInstance, void *hPrevInstance, void *lpCmdLine, int nShowCmd)
|
||||
#else // NL_OS_WINDOWS
|
||||
int main(int argc, char **argv)
|
||||
#endif // NL_OS_WINDOWS
|
||||
{
|
||||
#ifdef NL_OS_WINDOWS
|
||||
|
||||
QApplication app(__argc, __argv);
|
||||
#else // NL_OS_WINDOWS
|
||||
QApplication app(argc, argv);
|
||||
#endif // NL_OS_WINDOWS
|
||||
QPixmap pixmap(":/images/georges_logo.png");
|
||||
NLQT::CGeorgesSplash splash;
|
||||
splash.show();
|
||||
|
|
Loading…
Reference in a new issue