diff options
| author | Brian Helfrich <helfrich9000@gmail.com> | 2008-02-28 21:19:53 +0000 |
|---|---|---|
| committer | Brian Helfrich <helfrich9000@gmail.com> | 2008-02-28 21:19:53 +0000 |
| commit | 928fceeffc46a9ab37f9ef0b4539387c53b02f94 (patch) | |
| tree | f4d0fde72919eac148b7660f8e5123ea41a44751 | |
| parent | 3fabea6e0552465d8b5e8d8b1b3b5aa92e060f5b (diff) | |
| download | nanoengineer-928fceeffc46a9ab37f9ef0b4539387c53b02f94.tar.gz nanoengineer-928fceeffc46a9ab37f9ef0b4539387c53b02f94.zip | |
Tweaks to get things compiled on Win32.
15 files changed, 82 insertions, 62 deletions
diff --git a/cad/plugins/NanoVision-1/src/KDevelop/Interface/Interface.pro b/cad/plugins/NanoVision-1/src/KDevelop/Interface/Interface.pro index 65dde7ed2..256d3b1c5 100644 --- a/cad/plugins/NanoVision-1/src/KDevelop/Interface/Interface.pro +++ b/cad/plugins/NanoVision-1/src/KDevelop/Interface/Interface.pro @@ -1,8 +1,8 @@ LIBS += -L$(OPENBABEL_LIBPATH) \ - -lopenbabel \ -L../../../lib \ - -lNanorexUtility + -lNanorexUtility \ + -lopenbabel HEADERS += \ ../../../include/Nanorex/Interface/NXDataImportExportPlugin.h \ @@ -40,6 +40,8 @@ TEMPLATE = lib CONFIG += debug_and_release \ stl \ dll +win32 : CONFIG -= dll +win32 : CONFIG += staticlib TARGET = NanorexInterface diff --git a/cad/plugins/NanoVision-1/src/KDevelop/Plugins/HDF5_SimResultsImportExport/HDF5_SimResultsImportExport.pro b/cad/plugins/NanoVision-1/src/KDevelop/Plugins/HDF5_SimResultsImportExport/HDF5_SimResultsImportExport.pro index 1187afdc2..6ba8f8dd6 100644 --- a/cad/plugins/NanoVision-1/src/KDevelop/Plugins/HDF5_SimResultsImportExport/HDF5_SimResultsImportExport.pro +++ b/cad/plugins/NanoVision-1/src/KDevelop/Plugins/HDF5_SimResultsImportExport/HDF5_SimResultsImportExport.pro @@ -15,8 +15,8 @@ CONFIG += dll \ LIBS += -L../../../../lib \ -L$(OPENBABEL_LIBPATH) \ -L$(HDF5_SIMRESULTS_LIBPATH) \ --lNanorexUtility \ -lNanorexInterface \ +-lNanorexUtility \ -lopenbabel \ -lHDF5_SimResults \ -lhdf5 @@ -29,6 +29,6 @@ win32 : TARGETDEPS ~= s/.so/.a/g DESTDIR = ../../../../lib # Remove the "lib" from the start of the library -QMAKE_POST_LINK = echo $(DESTDIR)$(TARGET) | sed -e \'s/\\(.*\\)lib\\(.*\\)\\(\\.so\\)/\1\2\3/\' | xargs mv $(DESTDIR)$(TARGET) +unix : QMAKE_POST_LINK = echo $(DESTDIR)$(TARGET) | sed -e \'s/\\(.*\\)lib\\(.*\\)\\(\\.so\\)/\1\2\3/\' | xargs mv $(DESTDIR)$(TARGET) macx : QMAKE_POST_LINK ~= s/.so/.dylib/g diff --git a/cad/plugins/NanoVision-1/src/KDevelop/Plugins/NanorexMMPImportExport/NanorexMMPImportExport.pro b/cad/plugins/NanoVision-1/src/KDevelop/Plugins/NanorexMMPImportExport/NanorexMMPImportExport.pro index a5c3b3168..c73f36617 100644 --- a/cad/plugins/NanoVision-1/src/KDevelop/Plugins/NanorexMMPImportExport/NanorexMMPImportExport.pro +++ b/cad/plugins/NanoVision-1/src/KDevelop/Plugins/NanorexMMPImportExport/NanorexMMPImportExport.pro @@ -27,6 +27,6 @@ TARGET = NanorexMMPImportExport DESTDIR = ../../../../lib/ # Remove the "lib" from the start of the library -QMAKE_POST_LINK = echo $(DESTDIR)$(TARGET) | sed -e \'s/\\(.*\\)lib\\(.*\\)\\(\\.so\\)/\1\2\3/\' | xargs mv $(DESTDIR)$(TARGET) +unix : QMAKE_POST_LINK = echo $(DESTDIR)$(TARGET) | sed -e \'s/\\(.*\\)lib\\(.*\\)\\(\\.so\\)/\1\2\3/\' | xargs mv $(DESTDIR)$(TARGET) macx : QMAKE_POST_LINK ~= s/.so/.dylib/g diff --git a/cad/plugins/NanoVision-1/src/KDevelop/Plugins/OpenBabelImportExport/OpenBabelImportExport.pro b/cad/plugins/NanoVision-1/src/KDevelop/Plugins/OpenBabelImportExport/OpenBabelImportExport.pro index 15bee4ecc..66654135f 100644 --- a/cad/plugins/NanoVision-1/src/KDevelop/Plugins/OpenBabelImportExport/OpenBabelImportExport.pro +++ b/cad/plugins/NanoVision-1/src/KDevelop/Plugins/OpenBabelImportExport/OpenBabelImportExport.pro @@ -25,6 +25,6 @@ macx : TARGETDEPS ~= s/.so/.dylib/g win32 : TARGETDEPS ~= s/.so/.a/g # Remove the "lib" from the start of the library -QMAKE_POST_LINK = echo $(DESTDIR)$(TARGET) | sed -e \'s/\\(.*\\)lib\\(.*\\)\\(\\.so\\)/\1\2\3/\' | xargs mv $(DESTDIR)$(TARGET) +unix : QMAKE_POST_LINK = echo $(DESTDIR)$(TARGET) | sed -e \'s/\\(.*\\)lib\\(.*\\)\\(\\.so\\)/\1\2\3/\' | xargs mv $(DESTDIR)$(TARGET) macx : QMAKE_POST_LINK ~= s/.so/.dylib/g diff --git a/cad/plugins/NanoVision-1/src/KDevelop/Plugins/Plugins.pro b/cad/plugins/NanoVision-1/src/KDevelop/Plugins/Plugins.pro index 8d9538b34..4d3932d98 100644 --- a/cad/plugins/NanoVision-1/src/KDevelop/Plugins/Plugins.pro +++ b/cad/plugins/NanoVision-1/src/KDevelop/Plugins/Plugins.pro @@ -2,9 +2,9 @@ TEMPLATE = subdirs SUBDIRS += HDF5_SimResultsImportExport \ - RenderingEngines \ OpenBabelImportExport \ - NanorexMMPImportExport + NanorexMMPImportExport \ + RenderingEngines CONFIG += ordered diff --git a/cad/plugins/NanoVision-1/src/KDevelop/Plugins/RenderingEngines/OpenGL/NXOpenGLRenderingEngine/NXOpenGLRenderingEngine.pro b/cad/plugins/NanoVision-1/src/KDevelop/Plugins/RenderingEngines/OpenGL/NXOpenGLRenderingEngine/NXOpenGLRenderingEngine.pro index 95f55a91a..c82ed56ba 100644 --- a/cad/plugins/NanoVision-1/src/KDevelop/Plugins/RenderingEngines/OpenGL/NXOpenGLRenderingEngine/NXOpenGLRenderingEngine.pro +++ b/cad/plugins/NanoVision-1/src/KDevelop/Plugins/RenderingEngines/OpenGL/NXOpenGLRenderingEngine/NXOpenGLRenderingEngine.pro @@ -3,8 +3,8 @@ TEMPLATE = lib CONFIG += dll \ debug_and_release \ stl \ - opengl \ plugin +# opengl HEADERS += ../../../../../../include/Nanorex/Interface/NXAtomRenderData.h \ ../../../../../../include/Nanorex/Interface/NXBondRenderData.h \ @@ -23,18 +23,24 @@ INCLUDEPATH += ../../../../../../include \ ../../../../../../src/Plugins/RenderingEngines/OpenGL/GLT \ $(OPENBABEL_INCPATH) -LIBS += -lopenbabel \ +LIBS += -L$(OPENBABEL_LIBPATH) \ -L../../../../../../lib \ - -lGLT \ -lNXOpenGLSceneGraph \ -lNanorexInterface \ - -lNanorexUtility + -lNanorexUtility \ + -lGLT \ + -lopenbabel +# qmake puts these library declarations too early in the g++ command on win32 +win32 : LIBS += -lopengl32 -lglu32 -lgdi32 -luser32 + +CONFIG += opengl TARGETDEPS += ../../../../../../lib/libNanorexUtility.so \ ../../../../../../lib/libNanorexInterface.so \ ../../../../../../lib/libNXOpenGLSceneGraph.a \ ../../../../../../lib/libGLT.a -macx:TARGETDEPS ~= s/.so/.dylib/g +macx : TARGETDEPS ~= s/.so/.dylib/g +win32 : TARGETDEPS ~= s/.so/.a/g TARGET = NXOpenGLRenderingEngine @@ -45,6 +51,6 @@ SOURCES += ../../../../../Plugins/RenderingEngines/OpenGL/NXOpenGLRenderingEngin QMAKE_CXXFLAGS_DEBUG += -DNX_DEBUG # Remove the "lib" from the start of the library -QMAKE_POST_LINK = echo $(DESTDIR)$(TARGET) | sed -e \'s/\\(.*\\)lib\\(.*\\)\\(\\.so\\)/\1\2\3/\' | xargs mv $(DESTDIR)$(TARGET) +unix : QMAKE_POST_LINK = echo $(DESTDIR)$(TARGET) | sed -e \'s/\\(.*\\)lib\\(.*\\)\\(\\.so\\)/\1\2\3/\' | xargs mv $(DESTDIR)$(TARGET) macx : QMAKE_POST_LINK ~= s/.so/.dylib/g diff --git a/cad/plugins/NanoVision-1/src/KDevelop/Plugins/RenderingEngines/OpenGL/NXOpenGLSceneGraph/NXOpenGLSceneGraph.pro b/cad/plugins/NanoVision-1/src/KDevelop/Plugins/RenderingEngines/OpenGL/NXOpenGLSceneGraph/NXOpenGLSceneGraph.pro index 03604285d..ad66f2014 100644 --- a/cad/plugins/NanoVision-1/src/KDevelop/Plugins/RenderingEngines/OpenGL/NXOpenGLSceneGraph/NXOpenGLSceneGraph.pro +++ b/cad/plugins/NanoVision-1/src/KDevelop/Plugins/RenderingEngines/OpenGL/NXOpenGLSceneGraph/NXOpenGLSceneGraph.pro @@ -1,6 +1,7 @@ HEADERS += ../../../../../../include/Nanorex/Interface/NXOpenGLMaterial.h \ ../../../../../../include/Nanorex/Interface/NXOpenGLSceneGraph.h \ ../../../../../../include/Nanorex/Interface/NXSceneGraph.h + TEMPLATE = lib CONFIG += staticlib \ @@ -15,7 +16,8 @@ TARGET = NXOpenGLSceneGraph INCLUDEPATH += ../../../../../../include TARGETDEPS += ../../../../../../lib/libNanorexUtility.so -macx:TARGETDEPS ~= s/.so/.dylib/g +macx : TARGETDEPS ~= s/.so/.dylib/g +win32 : TARGETDEPS ~= s/.so/.a/g SOURCES += ../../../../../Plugins/RenderingEngines/OpenGL/NXOpenGLSceneGraph.cpp @@ -24,5 +26,6 @@ DESTDIR = ../../../../../../lib LIBS += -L../../../../../../lib \ -lNanorexInterface \ -lNanorexUtility + QMAKE_CXXFLAGS_DEBUG += -DNX_DEBUG diff --git a/cad/plugins/NanoVision-1/src/KDevelop/Plugins/RenderingEngines/OpenGL/Renderers/NXBallAndStickOpenGLRenderer/NXBallAndStickOpenGLRenderer.pro b/cad/plugins/NanoVision-1/src/KDevelop/Plugins/RenderingEngines/OpenGL/Renderers/NXBallAndStickOpenGLRenderer/NXBallAndStickOpenGLRenderer.pro index bfa85eddd..240a64563 100644 --- a/cad/plugins/NanoVision-1/src/KDevelop/Plugins/RenderingEngines/OpenGL/Renderers/NXBallAndStickOpenGLRenderer/NXBallAndStickOpenGLRenderer.pro +++ b/cad/plugins/NanoVision-1/src/KDevelop/Plugins/RenderingEngines/OpenGL/Renderers/NXBallAndStickOpenGLRenderer/NXBallAndStickOpenGLRenderer.pro @@ -21,6 +21,7 @@ TARGETDEPS += ../../../../../../../lib/libNanorexUtility.so \ ../../../../../../../lib/libNanorexInterface.so \ ../../../../../../../lib/libNXOpenGLRendererPlugin.a macx : TARGETDEPS ~= s/.so/.dylib/g +win32 : TARGETDEPS ~= s/.so/.a/g DESTDIR = ../../../../../../../lib @@ -32,7 +33,9 @@ LIBS += -L../../../../../../../lib \ -lNXOpenGLSceneGraph \ -lNanorexUtility \ -lNanorexInterface - +# qmake puts these library declarations too early in the g++ command on win32 +win32 : LIBS += -lopengl32 -lglu32 -lgdi32 -luser32 + SOURCES += ../../../../../../Plugins/RenderingEngines/OpenGL/Renderers/NXBallAndStickOpenGLRenderer.cpp TARGET = NXBallAndStickOpenGLRenderer @@ -40,6 +43,6 @@ TARGET = NXBallAndStickOpenGLRenderer QMAKE_CXXFLAGS_DEBUG += -DNX_DEBUG # Remove the "lib" from the start of the library -QMAKE_POST_LINK = echo $(DESTDIR)$(TARGET) | sed -e \'s/\\(.*\\)lib\\(.*\\)\\(\\.so\\)/\1\2\3/\' | xargs mv $(DESTDIR)$(TARGET) +unix : QMAKE_POST_LINK = echo $(DESTDIR)$(TARGET) | sed -e \'s/\\(.*\\)lib\\(.*\\)\\(\\.so\\)/\1\2\3/\' | xargs mv $(DESTDIR)$(TARGET) macx : QMAKE_POST_LINK ~= s/.so/.dylib/g diff --git a/cad/plugins/NanoVision-1/src/KDevelop/Testing/CppUnit/CppUnit.pro b/cad/plugins/NanoVision-1/src/KDevelop/Testing/CppUnit/CppUnit.pro index 6907f807c..30128cd73 100644 --- a/cad/plugins/NanoVision-1/src/KDevelop/Testing/CppUnit/CppUnit.pro +++ b/cad/plugins/NanoVision-1/src/KDevelop/Testing/CppUnit/CppUnit.pro @@ -6,22 +6,25 @@ SOURCES += ../../../Testing/CppUnit/CppUnit.cpp \ ../../../Utility/NXStringTokenizerTest.cpp \ ../../../Utility/NXUtilityTest.cpp \ ../../../Plugins/HDF5_SimResultsImportExport/HDF5_SimResultsImportExportTest.cpp \ - ../../../Interface/NXSceneGraphTest.cpp \ ../../../Plugins/OpenBabelImportExport/OpenBabelImportExportTest.cpp \ - ../../../Utility/NXPointTest.cpp + ../../../Utility/NXPointTest.cpp \ + ../../../Interface/NXSceneGraphTest.cpp TEMPLATE = app TARGET = CppUnit -LIBS += -lcppunit \ - -lopenbabel \ - -L../../../../lib \ +LIBS += -L../../../../lib \ + -L$(OPENBABEL_LIBPATH) \ + -L$(HDF5_SIMRESULTS_INCPATH) \ + -lNanorexInterface \ -lNanorexUtility \ - -lNanorexInterface + -lcppunit \ + -lopenbabel INCLUDEPATH += ../../../../include \ - $(OPENBABEL_INCPATH) + $(OPENBABEL_INCPATH) \ + $(HDF5_SIMRESULTS_INCPATH) HEADERS += ../../../Utility/NXCommandResultTest.h \ ../../../Utility/NXLoggerTest.h \ @@ -31,13 +34,13 @@ HEADERS += ../../../Utility/NXCommandResultTest.h \ ../../../Interface/NXNumbersTest.h \ ../../../Plugins/HDF5_SimResultsImportExport/HDF5_SimResultsImportExportTest.h \ ../../../Plugins/OpenBabelImportExport/OpenBabelImportExportTest.h \ - ../../../Interface/NXSceneGraphTest.h \ - ../../../Utility/NXPointTest.h + ../../../Utility/NXPointTest.h \ + ../../../Interface/NXSceneGraphTest.h TARGETDEPS += ../../../../lib/libNanorexUtility.so \ -../../../../lib/libNanorexInterface.so \ -../../../../lib/HDF5_SimResultsImportExport.so -macx:TARGETDEPS ~= s/.so/.dylib/g +../../../../lib/libNanorexInterface.so +macx : TARGETDEPS ~= s/.so/.dylib/g +win32 : TARGETDEPS ~= s/.so/.a/g DESTDIR = ../../../../bin diff --git a/cad/plugins/NanoVision-1/src/KDevelop/Testing/HDF5_Consumer/HDF5_Consumer.pro b/cad/plugins/NanoVision-1/src/KDevelop/Testing/HDF5_Consumer/HDF5_Consumer.pro index 474cc93e4..6d0be57b8 100644 --- a/cad/plugins/NanoVision-1/src/KDevelop/Testing/HDF5_Consumer/HDF5_Consumer.pro +++ b/cad/plugins/NanoVision-1/src/KDevelop/Testing/HDF5_Consumer/HDF5_Consumer.pro @@ -5,15 +5,16 @@ TEMPLATE = app INCLUDEPATH += $(OPENBABEL_INCPATH) \ ../../../../include -LIBS += -lopenbabel \ +LIBS += -L$(OPENBABEL_LIBPATH) \ -L../../../../lib \ -lNanorexInterface \ --lNanorexUtility +-lNanorexUtility \ +-lopenbabel -TARGETDEPS += ../../../../lib/HDF5_SimResultsImportExport.so \ -../../../../lib/libNanorexInterface.so \ +TARGETDEPS += ../../../../lib/libNanorexInterface.so \ ../../../../lib/libNanorexUtility.so -macx:TARGETDEPS ~= s/.so/.dylib/g +macx : TARGETDEPS ~= s/.so/.dylib/g +win32 : TARGETDEPS ~= s/.so/.a/g DESTDIR = ../../../../bin/ diff --git a/cad/plugins/NanoVision-1/src/KDevelop/Utility/Utility.pro b/cad/plugins/NanoVision-1/src/KDevelop/Utility/Utility.pro index 465b4bcef..c24ca9c9f 100644 --- a/cad/plugins/NanoVision-1/src/KDevelop/Utility/Utility.pro +++ b/cad/plugins/NanoVision-1/src/KDevelop/Utility/Utility.pro @@ -3,6 +3,8 @@ TEMPLATE = lib CONFIG += debug_and_release \ stl \ dll +win32 : CONFIG -= dll +win32 : CONFIG += staticlib INCLUDEPATH += ../../../include diff --git a/cad/plugins/NanoVision-1/src/KDevelop/nv1/nv1.pro b/cad/plugins/NanoVision-1/src/KDevelop/nv1/nv1.pro index 65cdcc881..cd24c2c47 100644 --- a/cad/plugins/NanoVision-1/src/KDevelop/nv1/nv1.pro +++ b/cad/plugins/NanoVision-1/src/KDevelop/nv1/nv1.pro @@ -9,14 +9,11 @@ opengl \ QT += opengl -LIBS += -lopenbabel \ +LIBS += -L../../../lib/ \ +-L$(OPENBABEL_LIBPATH) \ -lNanorexInterface \ -lNanorexUtility \ - -L../../../lib/ \ - -L../../../lib \ - -L/home/rmanoj/Nanorex/SVN/trunk/cad/plugins/NanoVision-1/lib - -macx : TARGETDEPS ~= s/.so/.dylib/g +-lopenbabel SOURCES += ../../DataWindow.cpp \ ../../LogHandlerWidget.cpp \ @@ -64,3 +61,5 @@ DESTDIR = ../../../bin # This tells qmake to not create a Mac bundle for this application. CONFIG -= app_bundle +#macx : TARGETDEPS ~= s/.so/.dylib/g + diff --git a/cad/plugins/NanoVision-1/src/Plugins/RenderingEngines/OpenGL/GLT/error.cpp b/cad/plugins/NanoVision-1/src/Plugins/RenderingEngines/OpenGL/GLT/error.cpp index e2dd89022..ccc16bf28 100644 --- a/cad/plugins/NanoVision-1/src/Plugins/RenderingEngines/OpenGL/GLT/error.cpp +++ b/cad/plugins/NanoVision-1/src/Plugins/RenderingEngines/OpenGL/GLT/error.cpp @@ -3,9 +3,9 @@ #include <string> using namespace std; -#ifdef GLT_WIN32 -#include <windows.h> -#endif +//#ifdef GLT_WIN32 +//#include <windows.h> +//#endif /*! \file \ingroup GLT @@ -22,15 +22,17 @@ using namespace std; void gltError(const std::string &message) { - #ifdef GLT_WIN32 - MessageBox(NULL,message.c_str(),"Runtime Error",MB_OK | MB_ICONERROR); - #endif + //#ifdef GLT_WIN32 + //MessageBox(NULL,message.c_str(),"Runtime Error",MB_OK | MB_ICONERROR); + //#endif + printf("GLT Error: %s\n", message.c_str()); } void gltWarning(const std::string &message) { - #ifdef GLT_WIN32 - MessageBox(NULL,message.c_str(),"Runtime Warning",MB_OK | MB_ICONWARNING); - #endif + //#ifdef GLT_WIN32 + //MessageBox(NULL,message.c_str(),"Runtime Warning",MB_OK | MB_ICONWARNING); + //#endif + printf("GLT Warning: %s\n", message.c_str()); } diff --git a/cad/plugins/NanoVision-1/src/Plugins/RenderingEngines/OpenGL/GLT/glt_config.h b/cad/plugins/NanoVision-1/src/Plugins/RenderingEngines/OpenGL/GLT/glt_config.h index 020c4850c..0de785de8 100644 --- a/cad/plugins/NanoVision-1/src/Plugins/RenderingEngines/OpenGL/GLT/glt_config.h +++ b/cad/plugins/NanoVision-1/src/Plugins/RenderingEngines/OpenGL/GLT/glt_config.h @@ -54,7 +54,7 @@ // Windows Config // -#if defined(_MSC_VER) || defined(__BORLANDC__) +#if defined(WIN32) || defined(__BORLANDC__) #define GLT_WIN32 #define GLT_LITTLE_ENDIAN diff --git a/cad/plugins/NanoVision-1/src/main.cpp b/cad/plugins/NanoVision-1/src/main.cpp index 7b5ab06bb..6ee473e40 100644 --- a/cad/plugins/NanoVision-1/src/main.cpp +++ b/cad/plugins/NanoVision-1/src/main.cpp @@ -11,9 +11,9 @@ int main(int argc, char *argv[]) { QApplication* app = new QApplication(argc, argv); // Show splashscreen - QPixmap pixmap(":/Icons/splashscreen.png"); - SplashScreen* splash = new SplashScreen(pixmap); - splash->show(); + //QPixmap pixmap(":/Icons/splashscreen.png"); + //SplashScreen* splash = new SplashScreen(pixmap); + //splash->show(); // Get user settings QSettings settings(QSettings::IniFormat, QSettings::UserScope, @@ -21,8 +21,8 @@ int main(int argc, char *argv[]) { // Start logger // - splash->showMessage("Starting logger..."); - splash->repaint(); + //splash->showMessage("Starting logger..."); + //splash->repaint(); int logLevel = 0; NXLogger* logger = new NXLogger(); @@ -56,13 +56,12 @@ int main(int argc, char *argv[]) { logger->addHandler(logHandlerWidget); // Initialize entity manager and load import/export plugins - splash->showMessage("Loading entity manager..."); - splash->repaint(); + //splash->showMessage("Loading entity manager..."); + //splash->repaint(); NXProperties* properties = new NXProperties(); QString pluginsSearchPath = settings.value("Miscellaneous/PluginsSearchPath").toString(); -printf("pSP=%s\n", qPrintable(pluginsSearchPath)); properties->setProperty("PluginsSearchPath", qPrintable(pluginsSearchPath)); settings.beginGroup("NXEntityManager"); QStringList keys = settings.allKeys(); @@ -78,13 +77,13 @@ printf("pSP=%s\n", qPrintable(pluginsSearchPath)); // Create main window nv1* mainWindow = new nv1(entityManager, logHandlerWidget); mainWindow->show(); - splash->repaint(); + //splash->repaint(); mainWindow->processCommandLine(argc, argv); - sleep(1); - splash->finish(mainWindow); - delete splash; + //sleep(1); + //splash->finish(mainWindow); + //delete splash; int appReturn = app->exec(); delete app; return appReturn; |