2.8 branch: Fixes for mingw build. Merges 10963 and 10965 from trunk.

examples/CMakeLists.txt

@@ -162,9 +162,21 @@ IF(DYNAMIC_OPENSCENEGRAPH)
         ADD_SUBDIRECTORY(osgviewerWX)
     ENDIF(wxWidgets_FOUND)
 
-    IF   (QT_FOUND AND QT_QTOPENGL_LIBRARY)
-        ADD_SUBDIRECTORY(osgviewerQT)
-    ENDIF(QT_FOUND AND QT_QTOPENGL_LIBRARY)
+    IF   (QT_FOUND)
+        OPTION(BUILD_QT_EXAMPLES "Enable the build of the examples that depend on Qt" ON)
+
+        IF (BUILD_QT_EXAMPLES AND QT_QTOPENGL_LIBRARY)
+            ADD_SUBDIRECTORY(osgviewerQT)
+        ENDIF()
+
+        IF (BUILD_QT_EXAMPLES AND QT4_FOUND)
+            ADD_SUBDIRECTORY(osgviewerQtWidget)
+
+            IF (QT_QTWEBKIT_FOUND)
+                ADD_SUBDIRECTORY(osgQtBrowser)
+            ENDIF()
+        ENDIF()
+    ENDIF()
 
     IF   (FLTK_FOUND)
         ADD_SUBDIRECTORY(osgviewerFLTK)

examples/osgviewerSDL/CMakeLists.txt

@@ -1,20 +1,25 @@
+SET(TARGET_EXTERNAL_LIBRARIES ${SDL_LIBRARY} )
+
 IF("${SDL_LIBRARY}" MATCHES "SDLmain")
        # Found a precompiled SDLmain library.
        SET(TARGET_SRC osgviewerSDL.cpp)
-ELSE("${SDL_LIBRARY}" MATCHES "SDLmain")
+ELSE()
        # No SDLmain has been found.
        # Depending on platform, code may need to be provided for SDLmain.
        IF(APPLE)
                SET(TARGET_SRC osgviewerSDL.cpp SDLMainForMacOSX.m SDLMainForMacOSX.h)
-       ELSE(APPLE)
+       ELSE()
                # Unhandled case. No libsdlmain has been found and no code substitute.
                # Depending on platform (or SDL version),
                # this may or may not link successfully.
                SET(TARGET_SRC osgviewerSDL.cpp)
-       ENDIF(APPLE)
-ENDIF("${SDL_LIBRARY}" MATCHES "SDLmain")
+               SET(TARGET_EXTERNAL_LIBRARIES ${SDLMAIN_LIBRARY} ${TARGET_EXTERNAL_LIBRARIES} )
+       ENDIF()
+ENDIF()
 
-SET(TARGET_EXTERNAL_LIBRARIES ${SDL_LIBRARY} )
+IF (MINGW)
+    SET(TARGET_EXTERNAL_LIBRARIES mingw32 ${TARGET_EXTERNAL_LIBRARIES} winmm dinput ddraw dxguid)
+ENDIF()
 
 INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR} )