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

Fixes for VS6.0

Browse Source
This commit is contained in:
Robert Osfield
2003-12-24 19:28:39 +00:00
parent 1a99f78aee
commit 96a8fa1f21
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
VisualStudio/examples/osgphotoalbum/osgphotoalbum.dsp
View File

@@ -86,7 +86,7 @@ RSC=rc.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /Zm200 /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -102,7 +102,7 @@ LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osgphotoalbum.exe" /libpath:"../../../lib"
# ADD LINK32 glu32.lib opengl32.lib Producer.lib OpenThreadsWin32.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osgphotoalbum.exe" /libpath:"../../../lib"
@@ -134,7 +134,7 @@ LINK32=link.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MDd /W3 /Gm /vd0 /GR /GX /Zi /Od /I "../../../include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /YX /FD /c
# ADD CPP /nologo /MDd /W3 /Gm /vd0 /GR /GX /Zi /Od /I "../../../include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /YX /FD /Zm200 /c
# SUBTRACT CPP /Fr
@@ -152,7 +152,7 @@ LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osgphotoalbumd.exe" /pdbtype:sept /libpath:"../../../lib"
# ADD LINK32 glu32.lib opengl32.lib Producerd.lib OpenThreadsWin32d.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osgphotoalbumd.exe" /pdbtype:sept /libpath:"../../../lib"
# SUBTRACT LINK32 /incremental:no

2
src/osg/Referenced.cpp
View File

@@ -21,7 +21,7 @@ static std::auto_ptr<DeleteHandler> s_deleteHandler(0);
void Referenced::setDeleteHandler(DeleteHandler* handler)
{
s_deleteHandler.reset(handler);
// s_deleteHandler.reset(handler);
}
DeleteHandler* Referenced::getDeleteHandler()

2
src/osgPlugins/osg/FragmentProgram.cpp
View File

@@ -39,7 +39,7 @@ bool FragmentProgram_readLocalData(Object& obj, Input& fr)
while (!fr.eof() && fr[0].getNoNestedBrackets() >= entry) {
if (fr[0].getStr()) {
code.append(std::string(fr[0].getStr()));
code.push_back('\n');
code += '\n';
}
++fr;
}

3
src/osgPlugins/osg/VertexProgram.cpp
View File

@@ -39,7 +39,8 @@ bool VertexProgram_readLocalData(Object& obj, Input& fr)
while (!fr.eof() && fr[0].getNoNestedBrackets() >= entry) {
if (fr[0].getStr()) {
code.append(std::string(fr[0].getStr()));
code.push_back('\n');
code += '\n'
;
}
++fr;
}

2
src/osgPlugins/txp/TileMapper.cpp
View File

@@ -27,7 +27,7 @@ void TileMapper::removePagedLOD(int x, int y, int lod)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
TileMap::iterator itr = _tileMap.find(TileTriple(x,y,lod));
if (itr!=_tileMap.end()) return _tileMap.erase(itr);
if (itr!=_tileMap.end()) _tileMap.erase(itr);
}
void TileMapper::prunePagedLOD()