From Mike Weiblen, updates to dsp to improveme formatting and include OpenThreads

This commit is contained in:
Robert Osfield
2004-07-23 10:03:18 +00:00
parent 7c05fe8906
commit 2fec211fea
110 changed files with 939 additions and 3973 deletions

View File

@@ -42,8 +42,9 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGUTIL_LIBRARY" /D "_WINDOWS" /D "WIN32" /YX /FD /Zm200 /c
# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGUTIL_LIBRARY" /D "_WINDOWS" /D "WIN32" /YX /FD /Zm200 /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -53,7 +54,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 glu32.lib opengl32.lib /nologo /dll /pdb:none /machine:I386 /out:"../../bin/osgUtil.dll" /libpath:"../../lib"
# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /pdb:none /machine:I386 /out:"../../bin/osgUtil.dll" /libpath:"../../lib" /libpath:"../../../OpenThreads/lib/win32" /libpath:"../../../Producer/lib" /libpath:"../../../3rdParty/lib"
!ELSEIF "$(CFG)" == "Core osgUtil - Win32 Debug"
@@ -68,8 +69,9 @@ LINK32=link.exe
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /vmg /vd0 /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /D "_DEBUG" /D "OSGUTIL_LIBRARY" /D "_WINDOWS" /D "WIN32" /YX /FD /GZ /Zm200 /c
# ADD CPP /nologo /MDd /W3 /Gm /vmg /vd0 /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "_DEBUG" /D "OSGUTIL_LIBRARY" /D "_WINDOWS" /D "WIN32" /YX /FD /GZ /Zm200 /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -79,7 +81,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 glu32.lib opengl32.lib /nologo /dll /debug /machine:I386 /out:"../../bin/osgUtild.dll" /pdbtype:sept /libpath:"../../lib"
# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"../../bin/osgUtild.dll" /pdbtype:sept /libpath:"../../lib" /libpath:"../../../OpenThreads/lib/win32" /libpath:"../../../Producer/lib" /libpath:"../../../3rdParty/lib"
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -105,11 +107,11 @@ SOURCE=..\..\src\osgUtil\DelaunayTriangulator.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgUtil\GLObjectsVisitor.cpp
SOURCE=..\..\src\osgUtil\DisplayRequirementsVisitor.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\osgUtil\DisplayRequirementsVisitor.cpp
SOURCE=..\..\src\osgUtil\GLObjectsVisitor.cpp
# End Source File
# Begin Source File
@@ -217,10 +219,6 @@ SOURCE=..\..\Include\osgUtil\DelaunayTriangulator
# End Source File
# Begin Source File
SOURCE=..\..\Include\osgUtil\GLObjectsVisitor
# End Source File
# Begin Source File
SOURCE=..\..\Include\osgUtil\DisplayRequirementsVisitor
# End Source File
# Begin Source File
@@ -229,6 +227,10 @@ SOURCE=..\..\Include\osgUtil\Export
# End Source File
# Begin Source File
SOURCE=..\..\Include\osgUtil\GLObjectsVisitor
# End Source File
# Begin Source File
SOURCE=..\..\include\osgUtil\HalfWayMapGenerator
# End Source File
# Begin Source File