diff -uwr C:\FGCVS\simgear\source\CMakeLists.txt simgear\CMakeLists.txt --- C:\FGCVS\simgear\source\CMakeLists.txt Mon Nov 14 17:48:32 2011 +++ simgear\CMakeLists.txt Mon Nov 14 19:03:33 2011 @@ -51,6 +51,8 @@ option(JPEG_FACTORY "Enable JPEG-factory support" OFF) option(ENABLE_LIBSVN "Set to ON to build SimGear with libsvnclient support" ON) option(ENABLE_RTI "Set to ON to build SimGear with RTI support" OFF) +option(OSG_LIBRARY_STATIC "Set to ON to build SimGear with OSG static libraries" OFF) +option(FREEGLUT_STATIC "Set to ON to build SimGear with freeglut static libraries" OFF) if (MSVC) GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_SOURCE_DIR} PATH) @@ -195,8 +197,13 @@ # foreach(warning 4244 4251 4267 4275 4290 4786 4305 4996) # SET(WARNING_FLAGS "${WARNING_FLAGS} /wd${warning}") # endforeach(warning) - - set(MSVC_FLAGS "-DWIN32 -DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS /wd4996") + if(OSG_LIBRARY_STATIC) + set(ADDED_FLAGS "${ADDED_FLAGS} -DOSG_LIBRARY_STATIC") + endif(OSG_LIBRARY_STATIC) + if(FREEGLUT_STATIC) + set(ADDED_FLAGS "${ADDED_FLAGS} -DFREEGLUT_STATIC") + endif(FREEGLUT_STATIC) + set(MSVC_FLAGS "-DWIN32 -DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS /wd4996 ${ADDED_FLAGS}") endif(MSVC) # assumed on Windows