diff --git a/cmake/customthirdparty.cmake b/cmake/customthirdparty.cmake index 2056fe201..b3ec7d9d1 100644 --- a/cmake/customthirdparty.cmake +++ b/cmake/customthirdparty.cmake @@ -345,7 +345,11 @@ MACRO(SD_INSTALL_CUSTOM_3RDPARTY TARGET_NAME) # Plugins : Complete the list right below according to the actual needs. # TODO: Find a way to install them in the osgPlugins-xxx subdir (works as is, but ...) - SET(_OSG_PLUGIN_NAME_HINTS "glsl;jpeg;png;rgb;dds;osgtgz;ac;osg;ive") # ';'-separated list + SET(_OSG_PLUGIN_NAME_HINTS "osgdb_ac;osgdb_dds;osgdb_glsl") # ';'-separated list + LIST(APPEND _OSG_PLUGIN_NAME_HINTS "osgdb_ive;osgdb_jpeg;osgdb_osg") + LIST(APPEND _OSG_PLUGIN_NAME_HINTS "osgdb_osga;osgdb_osgtgz;osgdb_png;osgdb_rgb") + LIST(APPEND _OSG_PLUGIN_NAME_HINTS "osgdb_serializers_osg;osgdb_serializers_osgga;osgdb_serializers_osgparticle;osgdb_serializers_osgshadow;osgdb_serializers_osgviewer") + GET_FILENAME_COMPONENT(_OSG_PLUGINS_DIR "${_DLL_PATHNAME_}" PATH) FILE(GLOB_RECURSE _OSG_PLUGIN_NAMES "${_OSG_PLUGINS_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}") FOREACH(_NAME_HINT ${_OSG_PLUGIN_NAME_HINTS}) diff --git a/src/modules/graphic/osggraph/Car/OsgCockpit.cpp b/src/modules/graphic/osggraph/Car/OsgCockpit.cpp index 311eafaee..e1c935cb9 100644 --- a/src/modules/graphic/osggraph/Car/OsgCockpit.cpp +++ b/src/modules/graphic/osggraph/Car/OsgCockpit.cpp @@ -18,7 +18,9 @@ ***************************************************************************/ /* Portability don't build with MingW 4.8 */ -//#include +#ifdef _MSC_VER +#include +#endif // _MSC_VER #include "OsgLoader.h" #include "OsgCockpit.h" diff --git a/src/modules/graphic/osggraph/Car/OsgDriver.cpp b/src/modules/graphic/osggraph/Car/OsgDriver.cpp index 75746a3db..8f88aa024 100644 --- a/src/modules/graphic/osggraph/Car/OsgDriver.cpp +++ b/src/modules/graphic/osggraph/Car/OsgDriver.cpp @@ -18,7 +18,9 @@ ***************************************************************************/ /* Portability don't build with MingW 4.8 */ -//#include +#ifdef _MSC_VER +#include +#endif // _MSC_VER #include "OsgLoader.h" #include "OsgDriver.h" diff --git a/src/modules/graphic/osggraph/Car/OsgSteer.cpp b/src/modules/graphic/osggraph/Car/OsgSteer.cpp index 912a67051..3c3b9f1df 100644 --- a/src/modules/graphic/osggraph/Car/OsgSteer.cpp +++ b/src/modules/graphic/osggraph/Car/OsgSteer.cpp @@ -35,6 +35,7 @@ SDSteer::~SDSteer(void) osg::ref_ptr SDSteer::initSteer(tCarElt *car, void *handle, bool tracktype) { + return NULL; /*rcvShadowMask = 0x1; castShadowMask = 0x2; this->car = car; diff --git a/src/modules/graphic/osggraph/Car/OsgWheel.cpp b/src/modules/graphic/osggraph/Car/OsgWheel.cpp index 4b3ebf14d..e6108de74 100644 --- a/src/modules/graphic/osggraph/Car/OsgWheel.cpp +++ b/src/modules/graphic/osggraph/Car/OsgWheel.cpp @@ -18,7 +18,9 @@ ***************************************************************************/ /* Portability don't build with MingW 4.8 */ -//#include +#ifdef _MSC_VER +#include +#endif // _MSC_VER #include "OsgLoader.h" #include "OsgWheel.h" diff --git a/src/modules/graphic/osggraph/Car/OsgWing.cpp b/src/modules/graphic/osggraph/Car/OsgWing.cpp index 1d49262c7..a873b087e 100644 --- a/src/modules/graphic/osggraph/Car/OsgWing.cpp +++ b/src/modules/graphic/osggraph/Car/OsgWing.cpp @@ -18,7 +18,10 @@ ***************************************************************************/ /* Portability don't build with MingW 4.8 */ -//#include +#ifdef _MSC_VER +#include +#endif // _MSC_VER + #include #include "OsgLoader.h" diff --git a/src/modules/graphic/osggraph/Car/OsgWing3.cpp b/src/modules/graphic/osggraph/Car/OsgWing3.cpp index 73a889900..9a38a23da 100644 --- a/src/modules/graphic/osggraph/Car/OsgWing3.cpp +++ b/src/modules/graphic/osggraph/Car/OsgWing3.cpp @@ -18,7 +18,9 @@ ***************************************************************************/ /* Portability don't build with MingW 4.8 */ -//#include +#ifdef _MSC_VER +#include +#endif // _MSC_VER #include "OsgLoader.h" #include "OsgWing3.h" diff --git a/src/modules/graphic/osggraph/Scenery/OsgScenery.cpp b/src/modules/graphic/osggraph/Scenery/OsgScenery.cpp index 0a04f93c6..444841bdc 100644 --- a/src/modules/graphic/osggraph/Scenery/OsgScenery.cpp +++ b/src/modules/graphic/osggraph/Scenery/OsgScenery.cpp @@ -162,7 +162,7 @@ void SDScenery::LoadScene(tTrack *track) strPath+=buf; std::string strTPath = GetDataDir(); - snprintf(buf, 4096, "data/textures/"); + snprintf(buf, 255, "data/textures/"); strTPath += buf; osgDB::FilePathList pathList = osgDB::Registry::instance()->getDataFilePathList(); pathList.push_back(strPath);