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

Fixes for Win32 compilation.

Browse Source
This commit is contained in:
Robert Osfield
2001-10-16 16:48:19 +00:00
parent 8aefce4524
commit ada36c3462
5 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
VisualStudio/osgPlugins/png/png.dsp
View File

@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
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 /dll /machine:I386
# ADD LINK32 libpng.lib zlib.lib /nologo /dll /pdb:none /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_png.dll" /libpath:"../../../lib"
# ADD LINK32 libpng.lib zlibstat.lib /nologo /dll /pdb:none /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_png.dll" /libpath:"../../../lib"
# SUBTRACT LINK32 /nodefaultlib
!ELSEIF "$(CFG)" == "png - Win32 Debug"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
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 /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 libpng.lib zlib.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_pngd.dll" /pdbtype:sept /libpath:"../../../lib"
# ADD LINK32 libpng.lib zlibstat.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_pngd.dll" /pdbtype:sept /libpath:"../../../lib"
# SUBTRACT LINK32 /nodefaultlib
!ENDIF

2
include/osg/FrameStamp
View File

@@ -7,7 +7,7 @@
#include <osg/Referenced>
#ifdef __sgi
#if defined(__sgi) || defined(WIN32)
#include <time.h>
#else
#include <ctime>

2
include/osg/Vec2
View File

@@ -148,8 +148,6 @@ class Vec2
return( norm );
}
inline operator float * (void) { return _v; }
friend inline ostream& operator << (ostream& output, const Vec2& vec)
{
output << vec._v[0] << " "

2
include/osg/Vec3
View File

@@ -167,8 +167,6 @@ class Vec3
return( norm );
}
inline operator float * (void) { return _v; }
friend inline ostream& operator << (ostream& output, const Vec3& vec);
}; // end of class Vec3

10
include/osg/Vec4
View File

@@ -36,11 +36,11 @@ class Vec4
float _v[4];
inline const bool operator == (const Vec4& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1] && _v[2]==v._v[2] && _v[3]==v._v[3]; }
inline const bool operator == (const Vec4& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1] && _v[2]==v._v[2] && _v[3]==v._v[3]; }
inline const bool operator != (const Vec4& v) const { return _v[0]!=v._v[0] || _v[1]!=v._v[1] || _v[2]!=v._v[2] || _v[3]!=v._v[3]; }
inline const bool operator != (const Vec4& v) const { return _v[0]!=v._v[0] || _v[1]!=v._v[1] || _v[2]!=v._v[2] || _v[3]!=v._v[3]; }
inline const bool operator < (const Vec4& v) const
inline const bool operator < (const Vec4& v) const
{
if (_v[0]<v._v[0]) return true;
else if (_v[0]>v._v[0]) return false;
@@ -178,9 +178,7 @@ class Vec4
return( norm );
}
inline operator float * (void) { return _v; }
friend inline ostream& operator << (ostream& output, const Vec4& vec)
friend inline ostream& operator << (ostream& output, const Vec4& vec)
{
output << vec._v[0] << " "
<< vec._v[1] << " "