Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix building of globe plugin on windows
  • Loading branch information
jef-n committed Oct 3, 2012
1 parent e71bcfc commit 1ed1188
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/plugins/globe/CMakeLists.txt
Expand Up @@ -29,7 +29,6 @@ SET (globe_plugin_MOC_HDRS
globe_plugin_dialog.h
osgEarthQt/Common
osgEarthQt/ViewerWidget
osgEarthUtil/Controls
)

SET (globe_plugin_RCCS globe_plugin.qrc)
Expand Down Expand Up @@ -60,6 +59,7 @@ TARGET_LINK_LIBRARIES(globeplugin
${QT_QTOPENGL_LIBRARY}
${OSGDB_LIBRARY}
${OSGGA_LIBRARY}
${OSGUTIL_LIBRARY}
${OSG_LIBRARY}
${OSGQT_LIBRARY}
${OSGVIEWER_LIBRARY}
Expand Down
4 changes: 3 additions & 1 deletion src/plugins/globe/CMakeModules/FindOSG.cmake
Expand Up @@ -106,10 +106,12 @@ FIND_OSG_LIBRARY( OSGVIEWER_LIBRARY_DEBUG osgViewerd )
FIND_OSG_LIBRARY( OSGGA_LIBRARY osgGA )
FIND_OSG_LIBRARY( OSGGA_LIBRARY_DEBUG osgGAd )

FIND_OSG_LIBRARY( OSGQT_LIBRARY osgQT )
FIND_OSG_LIBRARY( OSGQT_LIBRARY_DEBUG osgQTd )

FIND_OSG_LIBRARY( OSGWIDGET_LIBRARY osgWidget )
FIND_OSG_LIBRARY( OSGWIDGET_LIBRARY_DEBUG osgWidgetd )


FIND_OSG_LIBRARY( OPENTHREADS_LIBRARY OpenThreads )
FIND_OSG_LIBRARY( OPENTHREADS_LIBRARY_DEBUG OpenThreadsd )

Expand Down
3 changes: 3 additions & 0 deletions src/plugins/globe/osgEarthQt/ViewerWidget
Expand Up @@ -29,6 +29,9 @@

#include <QtCore/QTimer>

#undef OSGEARTHQT_EXPORT
#define OSGEARTHQT_EXPORT

namespace osgEarth { namespace QtGui
{
using namespace osgEarth;
Expand Down
3 changes: 3 additions & 0 deletions src/plugins/globe/osgEarthUtil/Controls
Expand Up @@ -34,6 +34,9 @@
#include <vector>
#include <queue>

#undef OSGEARTHUTIL_EXPORT
#define OSGEARTHUTIL_EXPORT

/**
* Controls - A simple 2D UI toolkit.
*
Expand Down

0 comments on commit 1ed1188

Please sign in to comment.