Fixed internal osgQt for Windows.

OpenModelica · Sep 30, 2016 · c507399 · c507399
1 parent d04327e
commit c507399
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 21 deletions.
diff --git a/OMEdit/OMEditGUI/Animation/AnimationWindow.h b/OMEdit/OMEditGUI/Animation/AnimationWindow.h
@@ -50,20 +50,12 @@
 #include <osg/Vec3>
 #include <osgDB/ReadFile>
 #include <osgGA/MultiTouchTrackballManipulator>
+#include <../../osgQt/GraphicsWindowQt>
 #include <osg/Version>
 #include <osgViewer/CompositeViewer>
 #include <osgViewer/View>
 #include <osgViewer/ViewerEventHandlers>
 
-#if OPENSCENEGRAPH_MAJOR_VERSION>=3 && OPENSCENEGRAPH_MINOR_VERSION>=4
-  #include <osgQt/GraphicsWindowQt>
-#else
-  #include <../../osgQt/GraphicsWindowQt>
-#endif
-
-
-
-
 class MainWindow;
 class PlotWindowContainer;
 

diff --git a/OMEdit/OMEditGUI/OMEditGUI.pro b/OMEdit/OMEditGUI/OMEditGUI.pro
@@ -76,14 +76,14 @@ win32 {
     } else { # 64-bit
       LIBS += -L$$(OMDEV)/tools/msys/mingw64/lib/binutils -L$$(OMDEV)/tools/msys/mingw64/bin -L$$(OMDEV)/tools/msys/mingw64/lib
     }
-    LIBS += -limagehlp -lbfd -lintl -liberty -llibosg.dll -llibosgViewer.dll -llibosgQt.dll -llibOpenThreads.dll -llibosgDB.dll -llibosgGA.dll
+    LIBS += -limagehlp -lbfd -lintl -liberty -llibosg.dll -llibosgViewer.dll -llibOpenThreads.dll -llibosgDB.dll -llibosgGA.dll
   } else { # debug
     contains(QT_ARCH, i386) { # 32-bit
       LIBS += -L$$(OMDEV)/tools/msys/mingw32/lib
     } else { # 64-bit
       LIBS += -L$$(OMDEV)/tools/msys/mingw64/lib
     }
-    LIBS += -llibosgd.dll -llibosgViewerd.dll -llibosgQtd.dll -llibOpenThreadsd.dll -llibosgDBd.dll -llibosgGAd.dll
+    LIBS += -llibosgd.dll -llibosgViewerd.dll -llibOpenThreadsd.dll -llibosgDBd.dll -llibosgGAd.dll
   }
   LIBS += -L../OMEditGUI/Debugger/Parser -lGDBMIParser \
     -L$$(OMBUILDDIR)/lib/omc -lomantlr3 -lOMPlot -lomqwt \
@@ -105,9 +105,6 @@ win32 {
   CONFIG(release, debug|release) {
     QMAKE_LFLAGS_RELEASE += -rdynamic
   }
-  LIBS += -losgDB -losgViewer -losgUtil -losgGA -losgQt -losg -lOpenThreads
-	HEADERS +=  ../../osgQt/GraphicsWindowQt ../../osgQt/Export
-	SOURCES +=  ../../osgQt/GraphicsWindowQt.cpp
 }
 
 SOURCES += main.cpp \
@@ -132,6 +129,7 @@ SOURCES += main.cpp \
   Editors/MetaModelEditor.cpp \
   Editors/MetaModelicaEditor.cpp \
   Plotting/PlotWindowContainer.cpp \
+  ../../osgQt/GraphicsWindowQt.cpp \
   Animation/AnimationWindow.cpp \
   Animation/ExtraShapes.cpp \
   Animation/Visualizer.cpp \
@@ -201,6 +199,8 @@ HEADERS  += Util/Helper.h \
   Editors/MetaModelEditor.h \
   Editors/MetaModelicaEditor.h \
   #$$OPENMODELICAHOME/../OMCompiler/3rdParty/FMIL/build/fmilib.h \
+  ../../osgQt/GraphicsWindowQt \
+  ../../osgQt/Export \
   Animation/AnimationWindow.h \
   Animation/AnimationUtil.h \
   Animation/ExtraShapes.h \

diff --git a/osgQt/Export b/osgQt/Export
@@ -29,13 +29,14 @@
 #endif
 
 #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__)
-    #  if defined( OSG_LIBRARY_STATIC )
-        #    define OSGQT_EXPORT
-        #  elif defined( OSGQT_LIBRARY )
-        #    define OSGQT_EXPORT   __declspec(dllexport)
-        #  else
-        #    define OSGQT_EXPORT   __declspec(dllimport)
-        #endif
+//    #  if defined( OSG_LIBRARY_STATIC )
+//        #    define OSGQT_EXPORT
+//        #  elif defined( OSGQT_LIBRARY )
+//        #    define OSGQT_EXPORT   __declspec(dllexport)
+//        #  else
+//        #    define OSGQT_EXPORT   __declspec(dllimport)
+//        #endif
+        #define OSGQT_EXPORT
 #else
         #define OSGQT_EXPORT
 #endif