Khaganat-NeL/khanat-opennel-code
1
0
Fork 0
Code Issues 21 Pull requests Packages Projects Releases 1 Wiki Activity

Fix Qt build on Windows

Browse source
This commit is contained in:
kaetemi 2014-01-21 12:50:23 +01:00
parent 3644657c89
commit 6d39fd64b3
3 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.hgignore
View file

@ -147,6 +147,9 @@ external_stlport
thumbs.db thumbs.db
Thumbs.db Thumbs.db
*.tpl.php *.tpl.php
.SyncID
.SyncIgnore
.SyncArchive
# build # build
code/nel/build/* code/nel/build/*

10
code/nel/tools/3d/object_viewer_qt/src/main.cpp
View file

@ -104,7 +104,11 @@ static inline QString msgCoreLoadFailure(const QString &why)
return QCoreApplication::translate("Application", "Failed to load Core plugin: %1").arg(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! // go nel!
new NLMISC::CApplicationContext; new NLMISC::CApplicationContext;
@ -129,7 +133,11 @@ sint main(int argc, char **argv)
nlinfo("Welcome to NeL Object Viewer Qt!"); nlinfo("Welcome to NeL Object Viewer Qt!");
} }
QApplication::setGraphicsSystem("raster"); QApplication::setGraphicsSystem("raster");
#ifdef NL_OS_WINDOWS
QApplication app(__argc, __argv);
#else // NL_OS_WINDOWS
QApplication app(argc, argv); QApplication app(argc, argv);
#endif // NL_OS_WINDOWS
QSplashScreen *splash = new QSplashScreen(); QSplashScreen *splash = new QSplashScreen();
splash->setPixmap(QPixmap(":/images/nel_ide_load.png")); splash->setPixmap(QPixmap(":/images/nel_ide_load.png"));
splash->show(); splash->show();

11
code/ryzom/tools/leveldesign/georges_editor_qt/src/main.cpp
View file

@ -87,9 +87,18 @@ void messageHandler(QtMsgType p_type, const char* p_msg)
# endif # endif
#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); QApplication app(argc, argv);
#endif // NL_OS_WINDOWS
QPixmap pixmap(":/images/georges_logo.png"); QPixmap pixmap(":/images/georges_logo.png");
NLQT::CGeorgesSplash splash; NLQT::CGeorgesSplash splash;
splash.show(); splash.show();