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

Windows build error and warning fixes

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14626 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield 2014-12-19 11:00:31 +00:00
parent c6013c721e
commit 4945e03bcb
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/osg/DisplaySettings.cpp
View File

@ -24,6 +24,7 @@ using namespace osg;
using namespace std;
#if defined(WIN32) && !defined(__CYGWIN__)
#include<Windows.h>
extern "C" { _declspec(dllexport) DWORD NvOptimusEnablement=0x00000001; }
#else
extern "C" { int NvOptimusEnablement=0x00000001; }

2
src/osgPlugins/dae/daeReader.h
View File

@ -253,7 +253,7 @@ public:
typedef std::map< int, osg::Array*, std::less<int> > ArrayMap;
typedef std::multimap< osgAnimation::Target*, osg::ref_ptr<ChannelPart> > TargetChannelPartMap;
typedef std::multimap<std::pair<const domMesh*, unsigned>, std::pair<osg::ref_ptr<osg::Geometry>, GLuint> > OldToNewIndexMap;
typedef std::multimap<std::pair<const domMesh*, size_t>, std::pair<osg::ref_ptr<osg::Geometry>, GLuint> > OldToNewIndexMap;
private:
bool processDocument( const std::string& );