FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged Alberto Luaces commit "Avoid that mingw cross-compilation choosing X11 as the windowing system" from the OpenSceneGraph-3.6 branch

Browse Source
This commit is contained in:
Robert Osfield 2019-07-16 11:49:32 +01:00
parent 305210c417
commit 8607ac24eb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -42,6 +42,8 @@ IF(APPLE)
MESSAGE(STATUS "OSG_OSX_VERSION=${OSG_OSX_VERSION}")
ENDIF()
PROJECT(OpenSceneGraph)
# Set OSX architecture flags here, since they must be specified before
# creating the actual OSG project.
# Note that the CMAKE_OSX_* variables are not well documented in
@ -52,7 +54,7 @@ ENDIF()
IF(ANDROID)
SET(OSG_WINDOWING_SYSTEM "None" CACHE STRING "Windowing system type for graphics window creation; options: None.")
ELSEIF(WIN32)
ELSEIF(WIN32 OR MINGW)
SET(OSG_WINDOWING_SYSTEM "Win32" CACHE STRING "Windowing system type for graphics window creation; options: Win32 or None.")
ELSEIF(APPLE)
# custom option to flag an iOS build
@ -120,7 +122,6 @@ ELSE()
SET(OSG_WINDOWING_SYSTEM "X11" CACHE STRING "Windowing system type for graphics window creation; options: X11 or None.")
ENDIF()
PROJECT(OpenSceneGraph)
SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})