diff -uwr C:\FGCVS\flightgear\source\CMakeLists.txt flightgear\CMakeLists.txt --- C:\FGCVS\flightgear\source\CMakeLists.txt Mon Nov 14 17:37:47 2011 +++ flightgear\CMakeLists.txt Fri Nov 18 15:20:32 2011 @@ -94,6 +94,8 @@ option(ENABLE_RTI "Set to ON to build SimGear with RTI support" OFF) option(WITH_FGPANEL "Set to ON to build the fgpanel application" ON) option(JPEG_FACTORY "Enable JPEG-factory 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) @@ -245,8 +247,13 @@ # foreach(warning 4244 4251 4267 4275 4290 4786 4305 4996) # SET(WARNING_FLAGS "${WARNING_FLAGS} /wd${warning}") # endforeach(warning) - - set(MSVC_FLAGS "-DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS") + 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 "-DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS ${ADDED_FLAGS}") if (${MSVC_VERSION} EQUAL 1600) set( MSVC_LD_FLAGS "/FORCE:MULTIPLE" ) endif (${MSVC_VERSION} EQUAL 1600) diff -uwr C:\FGCVS\flightgear\source\src\Main\bootstrap.cxx flightgear\src\Main\bootstrap.cxx --- C:\FGCVS\flightgear\source\src\Main\bootstrap.cxx Tue Oct 25 09:48:54 2011 +++ flightgear\src\Main\bootstrap.cxx Thu Nov 17 18:12:56 2011 @@ -196,10 +196,6 @@ signal(SIGPIPE, SIG_IGN); #endif -#ifdef PTW32_STATIC_LIB - // Initialise static pthread win32 lib - pthread_win32_process_attach_np (); -#endif _bootstrap_OSInit = 0; #if defined(__FreeBSD__) diff -uwr C:\FGCVS\flightgear\source\src\Main\fg_os_osgviewer.cxx flightgear\src\Main\fg_os_osgviewer.cxx --- C:\FGCVS\flightgear\source\src\Main\fg_os_osgviewer.cxx Sun Oct 09 16:38:11 2011 +++ flightgear\src\Main\fg_os_osgviewer.cxx Thu Nov 17 18:12:50 2011 @@ -70,11 +70,9 @@ USE_OSGPLUGIN(pnm); USE_OSGPLUGIN(rgb); USE_OSGPLUGIN(tga); +USE_OSGPLUGIN(png); #ifdef OSG_JPEG_ENABLED USE_OSGPLUGIN(jpeg); -#endif -#ifdef OSG_PNG_ENABLED - USE_OSGPLUGIN(png); #endif #ifdef OSG_TIFF_ENABLED USE_OSGPLUGIN(tiff);