Fixes for Visual Studio OSG build
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5922 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 118ee2e46dd7226bc33e805b8f996b2b6fcb7831 Former-commit-id: 7024a180599c85a2b1b35eeb4c62ff701b38701f
This commit is contained in:
parent
fc51dce5a6
commit
701eae46e7
8 changed files with 23 additions and 7 deletions
|
@ -345,7 +345,11 @@ MACRO(SD_INSTALL_CUSTOM_3RDPARTY TARGET_NAME)
|
||||||
|
|
||||||
# Plugins : Complete the list right below according to the actual needs.
|
# 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 ...)
|
# 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)
|
GET_FILENAME_COMPONENT(_OSG_PLUGINS_DIR "${_DLL_PATHNAME_}" PATH)
|
||||||
FILE(GLOB_RECURSE _OSG_PLUGIN_NAMES "${_OSG_PLUGINS_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}")
|
FILE(GLOB_RECURSE _OSG_PLUGIN_NAMES "${_OSG_PLUGINS_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}")
|
||||||
FOREACH(_NAME_HINT ${_OSG_PLUGIN_NAME_HINTS})
|
FOREACH(_NAME_HINT ${_OSG_PLUGIN_NAME_HINTS})
|
||||||
|
|
|
@ -18,7 +18,9 @@
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/* Portability don't build with MingW 4.8 */
|
/* Portability don't build with MingW 4.8 */
|
||||||
//#include <portability.h>
|
#ifdef _MSC_VER
|
||||||
|
#include <portability.h>
|
||||||
|
#endif // _MSC_VER
|
||||||
|
|
||||||
#include "OsgLoader.h"
|
#include "OsgLoader.h"
|
||||||
#include "OsgCockpit.h"
|
#include "OsgCockpit.h"
|
||||||
|
|
|
@ -18,7 +18,9 @@
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/* Portability don't build with MingW 4.8 */
|
/* Portability don't build with MingW 4.8 */
|
||||||
//#include <portability.h>
|
#ifdef _MSC_VER
|
||||||
|
#include <portability.h>
|
||||||
|
#endif // _MSC_VER
|
||||||
|
|
||||||
#include "OsgLoader.h"
|
#include "OsgLoader.h"
|
||||||
#include "OsgDriver.h"
|
#include "OsgDriver.h"
|
||||||
|
|
|
@ -35,6 +35,7 @@ SDSteer::~SDSteer(void)
|
||||||
|
|
||||||
osg::ref_ptr<osg::Node> SDSteer::initSteer(tCarElt *car, void *handle, bool tracktype)
|
osg::ref_ptr<osg::Node> SDSteer::initSteer(tCarElt *car, void *handle, bool tracktype)
|
||||||
{
|
{
|
||||||
|
return NULL;
|
||||||
/*rcvShadowMask = 0x1;
|
/*rcvShadowMask = 0x1;
|
||||||
castShadowMask = 0x2;
|
castShadowMask = 0x2;
|
||||||
this->car = car;
|
this->car = car;
|
||||||
|
|
|
@ -18,7 +18,9 @@
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/* Portability don't build with MingW 4.8 */
|
/* Portability don't build with MingW 4.8 */
|
||||||
//#include <portability.h>
|
#ifdef _MSC_VER
|
||||||
|
#include <portability.h>
|
||||||
|
#endif // _MSC_VER
|
||||||
|
|
||||||
#include "OsgLoader.h"
|
#include "OsgLoader.h"
|
||||||
#include "OsgWheel.h"
|
#include "OsgWheel.h"
|
||||||
|
|
|
@ -18,7 +18,10 @@
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/* Portability don't build with MingW 4.8 */
|
/* Portability don't build with MingW 4.8 */
|
||||||
//#include <portability.h>
|
#ifdef _MSC_VER
|
||||||
|
#include <portability.h>
|
||||||
|
#endif // _MSC_VER
|
||||||
|
|
||||||
#include <osgDB/WriteFile>
|
#include <osgDB/WriteFile>
|
||||||
|
|
||||||
#include "OsgLoader.h"
|
#include "OsgLoader.h"
|
||||||
|
|
|
@ -18,7 +18,9 @@
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/* Portability don't build with MingW 4.8 */
|
/* Portability don't build with MingW 4.8 */
|
||||||
//#include <portability.h>
|
#ifdef _MSC_VER
|
||||||
|
#include <portability.h>
|
||||||
|
#endif // _MSC_VER
|
||||||
|
|
||||||
#include "OsgLoader.h"
|
#include "OsgLoader.h"
|
||||||
#include "OsgWing3.h"
|
#include "OsgWing3.h"
|
||||||
|
|
|
@ -162,7 +162,7 @@ void SDScenery::LoadScene(tTrack *track)
|
||||||
strPath+=buf;
|
strPath+=buf;
|
||||||
|
|
||||||
std::string strTPath = GetDataDir();
|
std::string strTPath = GetDataDir();
|
||||||
snprintf(buf, 4096, "data/textures/");
|
snprintf(buf, 255, "data/textures/");
|
||||||
strTPath += buf;
|
strTPath += buf;
|
||||||
osgDB::FilePathList pathList = osgDB::Registry::instance()->getDataFilePathList();
|
osgDB::FilePathList pathList = osgDB::Registry::instance()->getDataFilePathList();
|
||||||
pathList.push_back(strPath);
|
pathList.push_back(strPath);
|
||||||
|
|
Loading…
Reference in a new issue