diff --git a/CMakeLists.txt b/CMakeLists.txt index 037450ef0..bbe351bff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,13 +123,15 @@ FIND_PACKAGE(SDL) FIND_PACKAGE(Inventor) FIND_PACKAGE(Qt3) FIND_PACKAGE(Qt4) -FIND_PACKAGE(wxWidgets) FIND_PACKAGE(Jasper) FIND_PACKAGE(COLLADA) FIND_PACKAGE(Xine) FIND_PACKAGE(OpenVRML) FIND_PACKAGE(Performer) +SET(wxWidgets_USE_LIBS base core gl net) +FIND_PACKAGE(wxWidgets) + # Platform specific: # (We can approach this one of two ways. We can try to FIND everything # and simply check if we found the packages before actually building diff --git a/examples/osgsimpleviewerWX/CMakeLists.txt b/examples/osgsimpleviewerWX/CMakeLists.txt index b3c1d0db9..586922bb3 100644 --- a/examples/osgsimpleviewerWX/CMakeLists.txt +++ b/examples/osgsimpleviewerWX/CMakeLists.txt @@ -3,7 +3,11 @@ SET(TARGET_SRC osgsimpleviewerWX.cpp ) SET(TARGET_H osgsimpleviewerWX.h ) SET(TARGET_ADDED_LIBRARIES ${wxWidgets_LIBRARIES} ) + INCLUDE_DIRECTORIES(${wxWidgets_INCLUDE_DIRS} ) +ADD_DEFINITIONS( ${wxWidgets_DEFINITIONS} ) + + #### end var setup ### SETUP_EXAMPLE(osgsimpleviewerWX) diff --git a/examples/osgsimpleviewerWX/osgsimpleviewerWX.cpp b/examples/osgsimpleviewerWX/osgsimpleviewerWX.cpp index e8c1f047c..cb760ad23 100644 --- a/examples/osgsimpleviewerWX/osgsimpleviewerWX.cpp +++ b/examples/osgsimpleviewerWX/osgsimpleviewerWX.cpp @@ -9,7 +9,7 @@ #include "wx/wx.h" #endif -#include "wxOsgSample.h" +#include "osgsimpleviewerWX.h" #include #include #include