From 8a5c6d510281dcdeb4932a90f96f80ad849dfde7 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 13 Apr 2002 22:19:29 +0000 Subject: [PATCH] Clean up for VisualStudio build --- VisualStudio/Demos/hangglide/hangglide.dsp | 155 +------ .../Demos/osgbillboard/osgbillboard.dsp | 102 +---- VisualStudio/Demos/osgconv/osgconv.dsp | 106 +---- VisualStudio/Demos/osgcopy/osgcopy.dsp | 102 +---- VisualStudio/Demos/osgcube/osgcube.dsp | 102 +---- .../Demos/osgimpostor/osgimpostor.dsp | 102 +---- VisualStudio/Demos/osgreflect/osgreflect.dsp | 102 +---- VisualStudio/Demos/osgscribe/osgscribe.dsp | 102 +---- .../Demos/osgstereoimage/osgstereoimage.dsp | 102 +---- VisualStudio/Demos/osgtext/osgtext.dsp | 104 +---- VisualStudio/Demos/osgtexture/osgtexture.dsp | 102 +---- VisualStudio/Demos/osgversion/osgversion.dsp | 102 +---- VisualStudio/Demos/osgviews/osgviews.dsp | 102 +---- VisualStudio/Demos/sgv/sgv.dsp | 102 +---- VisualStudio/osg/osg.dsp | 35 +- VisualStudio/osgDB/osgDB.dsp | 223 +--------- VisualStudio/osgGLUT/osgGLUT.dsp | 19 +- VisualStudio/osgPlugins/bmp/bmp.dsp | 7 +- VisualStudio/osgPlugins/dw/dw.dsp | 120 +---- VisualStudio/osgPlugins/dx/dx.dsp | 7 +- VisualStudio/osgPlugins/flt/flt.dsp | 421 +----------------- VisualStudio/osgPlugins/gif/gif.dsp | 6 +- VisualStudio/osgPlugins/jpeg/jpeg.dsp | 116 +---- VisualStudio/osgPlugins/lib3ds/lib3ds.dsp | 274 +----------- VisualStudio/osgPlugins/lwo/lwo.dsp | 128 +----- VisualStudio/osgPlugins/obj/obj.dsp | 124 +----- VisualStudio/osgPlugins/osg/dot_osg.dsp | 11 +- VisualStudio/osgPlugins/osgtgz/osgtgz.dsp | 116 +---- VisualStudio/osgPlugins/pic/pic.dsp | 116 +---- VisualStudio/osgPlugins/png/png.dsp | 7 +- VisualStudio/osgPlugins/rgb/rgb.dsp | 116 +---- VisualStudio/osgPlugins/tgz/tgz.dsp | 116 +---- VisualStudio/osgPlugins/tiff/tiff.dsp | 116 +---- VisualStudio/osgPlugins/txp/txp.dsp | 6 +- VisualStudio/osgPlugins/zip/zip.dsp | 116 +---- VisualStudio/osgText/osgText.dsp | 23 +- VisualStudio/osgUtil/osgUtil.dsp | 31 +- include/osg/GeoSet | 2 +- include/osgText/Text | 8 +- src/osgPlugins/dx/AreaGeoSetTriangulator.cpp | 4 +- src/osgPlugins/dx/DXWriter.cpp | 25 +- src/osgPlugins/flt/FltFile.h | 3 +- src/osgPlugins/flt/flt.h | 4 + src/osgPlugins/txp/TrPageArchive.h | 13 +- 44 files changed, 190 insertions(+), 3610 deletions(-) diff --git a/VisualStudio/Demos/hangglide/hangglide.dsp b/VisualStudio/Demos/hangglide/hangglide.dsp index 0b3334ce8..23646eab7 100755 --- a/VisualStudio/Demos/hangglide/hangglide.dsp +++ b/VisualStudio/Demos/hangglide/hangglide.dsp @@ -1,297 +1,148 @@ -# Microsoft Developer Studio Project File - Name="hangglide" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="Demo hangglide" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Console Application" 0x0103 - - -CFG=hangglide - Win32 Debug - +CFG=Demo hangglide - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "hangglide.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "hangglide.mak" CFG="Demo hangglide - Win32 Debug" - +!MESSAGE NMAKE /f "hangglide.mak" CFG="Demo hangglide - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "Demo hangglide - Win32 Release" (based on "Win32 (x86) Console Application") - !MESSAGE "Demo hangglide - Win32 Debug" (based on "Win32 (x86) Console Application") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - RSC=rc.exe - - !IF "$(CFG)" == "Demo hangglide - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "Release" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /machine:I386 - # ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/hangglide.exe" /libpath:"../../../lib" - - !ELSEIF "$(CFG)" == "Demo hangglide - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "Debug" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 "WIN32" /D "_DEBUG" /D "FL_DLL" /YX /FD /c - # SUBTRACT CPP /Fr - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /debug /machine:I386 /pdbtype:sept - # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/hangglided.exe" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /incremental:no - - !ENDIF - - # Begin Target - - # Name "Demo hangglide - Win32 Release" - # Name "Demo hangglide - Win32 Debug" - # Begin Group "Source Files" - - # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - # Begin Source File - - SOURCE=..\..\..\Src\Demos\hangglide\Base.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\Demos\hangglide\GliderManipulator.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\Demos\hangglide\hangglide.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\Demos\hangglide\Hat.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\Demos\hangglide\ReaderWriterFLY.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\Demos\hangglide\Sky.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\Demos\hangglide\Tank.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\Demos\hangglide\Terrain.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\Demos\hangglide\Trees.cpp - # End Source File - # End Group - # Begin Group "Header Files" - - # PROP Default_Filter ";h;hpp;hxx;hm;inl" - # Begin Source File - - SOURCE=..\..\..\Src\Demos\hangglide\GliderManipulator.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\Demos\hangglide\Hat.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\Demos\hangglide\terrain_data.h - # End Source File - # End Group - # Begin Group "Resource Files" - - # PROP Default_Filter "" - # End Group - # End Target - # End Project - - \ No newline at end of file diff --git a/VisualStudio/Demos/osgbillboard/osgbillboard.dsp b/VisualStudio/Demos/osgbillboard/osgbillboard.dsp index e93a7f244..e11b5a3c4 100755 --- a/VisualStudio/Demos/osgbillboard/osgbillboard.dsp +++ b/VisualStudio/Demos/osgbillboard/osgbillboard.dsp @@ -1,191 +1,95 @@ -# Microsoft Developer Studio Project File - Name="osgbillboard" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="Demo osgbillboard" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Console Application" 0x0103 - - -CFG=osgbillboard - Win32 Debug - +CFG=Demo osgbillboard - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "osgbillboard.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "osgbillboard.mak" CFG="Demo osgbillboard - Win32 Debug" - +!MESSAGE NMAKE /f "osgbillboard.mak" CFG="Demo osgbillboard - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "Demo osgbillboard - Win32 Release" (based on "Win32 (x86) Console Application") - !MESSAGE "Demo osgbillboard - Win32 Debug" (based on "Win32 (x86) Console Application") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - RSC=rc.exe - - !IF "$(CFG)" == "Demo osgbillboard - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "Release" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /machine:I386 - # ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osgbillboard.exe" /libpath:"../../../lib" - - !ELSEIF "$(CFG)" == "Demo osgbillboard - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "Debug" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 "WIN32" /D "_DEBUG" /D "FL_DLL" /FR /YX /FD /c - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /debug /machine:I386 /pdbtype:sept - # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osgbillboardd.exe" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /incremental:no - - !ENDIF - - # Begin Target - - # Name "Demo osgbillboard - Win32 Release" - # Name "Demo osgbillboard - Win32 Debug" - # Begin Source File - - SOURCE=..\..\..\src\Demos\osgbillboard\osgbillboard.cpp - # End Source File - # End Target - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Project - - \ No newline at end of file diff --git a/VisualStudio/Demos/osgconv/osgconv.dsp b/VisualStudio/Demos/osgconv/osgconv.dsp index 983f77ad2..81461de9c 100755 --- a/VisualStudio/Demos/osgconv/osgconv.dsp +++ b/VisualStudio/Demos/osgconv/osgconv.dsp @@ -1,199 +1,99 @@ -# Microsoft Developer Studio Project File - Name="osgconv" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="Demo osgconv" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Console Application" 0x0103 - - -CFG=osgconv - Win32 Debug - +CFG=Demo osgconv - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "osgconv.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "osgconv.mak" CFG="Demo osgconv - Win32 Debug" - +!MESSAGE NMAKE /f "osgconv.mak" CFG="Demo osgconv - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "Demo osgconv - Win32 Release" (based on "Win32 (x86) Console Application") - !MESSAGE "Demo osgconv - Win32 Debug" (based on "Win32 (x86) Console Application") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - RSC=rc.exe - - !IF "$(CFG)" == "Demo osgconv - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "Release" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /machine:I386 - # ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osgconv.exe" /libpath:"../../../lib" - - !ELSEIF "$(CFG)" == "Demo osgconv - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "Debug" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 "WIN32" /D "_DEBUG" /D "FL_DLL" /FR /YX /FD /c - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /debug /machine:I386 /pdbtype:sept - # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osgconvd.exe" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /incremental:no - - !ENDIF - - # Begin Target - - # Name "Demo osgconv - Win32 Release" - # Name "Demo osgconv - Win32 Debug" - # Begin Source File - - SOURCE=..\..\..\src\Demos\osgconv\OrientationConverter.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\Demos\osgconv\osgconv.cpp - # End Source File - # End Target - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Project - - \ No newline at end of file diff --git a/VisualStudio/Demos/osgcopy/osgcopy.dsp b/VisualStudio/Demos/osgcopy/osgcopy.dsp index c62c6cbd4..4c1422c3f 100755 --- a/VisualStudio/Demos/osgcopy/osgcopy.dsp +++ b/VisualStudio/Demos/osgcopy/osgcopy.dsp @@ -1,191 +1,95 @@ -# Microsoft Developer Studio Project File - Name="osgcopy" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="Demo osgcopy" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Console Application" 0x0103 - - -CFG=osgcopy - Win32 Debug - +CFG=Demo osgcopy - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "osgcopy.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "osgcopy.mak" CFG="Demo osgcopy - Win32 Debug" - +!MESSAGE NMAKE /f "osgcopy.mak" CFG="Demo osgcopy - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "Demo osgcopy - Win32 Release" (based on "Win32 (x86) Console Application") - !MESSAGE "Demo osgcopy - Win32 Debug" (based on "Win32 (x86) Console Application") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - RSC=rc.exe - - !IF "$(CFG)" == "Demo osgcopy - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "Release" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /machine:I386 - # ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osgcopy.exe" /libpath:"../../../lib" - - !ELSEIF "$(CFG)" == "Demo osgcopy - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "Debug" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 "WIN32" /D "_DEBUG" /D "FL_DLL" /FR /YX /FD /c - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /debug /machine:I386 /pdbtype:sept - # ADD LINK32 glut32.lib glu32.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osgcopyd.exe" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /incremental:no - - !ENDIF - - # Begin Target - - # Name "Demo osgcopy - Win32 Release" - # Name "Demo osgcopy - Win32 Debug" - # Begin Source File - - SOURCE=..\..\..\src\Demos\osgcopy\osgcopy.cpp - # End Source File - # End Target - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Project - - \ No newline at end of file diff --git a/VisualStudio/Demos/osgcube/osgcube.dsp b/VisualStudio/Demos/osgcube/osgcube.dsp index 3e075f772..bdf788ff6 100755 --- a/VisualStudio/Demos/osgcube/osgcube.dsp +++ b/VisualStudio/Demos/osgcube/osgcube.dsp @@ -1,191 +1,95 @@ -# Microsoft Developer Studio Project File - Name="osgcube" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="Demo osgcube" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Console Application" 0x0103 - - -CFG=osgcube - Win32 Debug - +CFG=Demo osgcube - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "osgcube.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "osgcube.mak" CFG="Demo osgcube - Win32 Debug" - +!MESSAGE NMAKE /f "osgcube.mak" CFG="Demo osgcube - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "Demo osgcube - Win32 Release" (based on "Win32 (x86) Console Application") - !MESSAGE "Demo osgcube - Win32 Debug" (based on "Win32 (x86) Console Application") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - RSC=rc.exe - - !IF "$(CFG)" == "Demo osgcube - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "Release" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /machine:I386 - # ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osgcube.exe" /libpath:"../../../lib" - - !ELSEIF "$(CFG)" == "Demo osgcube - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "Debug" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 "WIN32" /D "_DEBUG" /D "FL_DLL" /FR /YX /FD /c - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /debug /machine:I386 /pdbtype:sept - # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osgcubed.exe" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /incremental:no - - !ENDIF - - # Begin Target - - # Name "Demo osgcube - Win32 Release" - # Name "Demo osgcube - Win32 Debug" - # Begin Source File - - SOURCE=..\..\..\src\Demos\osgcube\osgcube.cpp - # End Source File - # End Target - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Project - - \ No newline at end of file diff --git a/VisualStudio/Demos/osgimpostor/osgimpostor.dsp b/VisualStudio/Demos/osgimpostor/osgimpostor.dsp index 3c7083946..64fd83119 100755 --- a/VisualStudio/Demos/osgimpostor/osgimpostor.dsp +++ b/VisualStudio/Demos/osgimpostor/osgimpostor.dsp @@ -1,191 +1,95 @@ -# Microsoft Developer Studio Project File - Name="osgimpostor" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="Demo osgimpostor" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Console Application" 0x0103 - - -CFG=osgimpostor - Win32 Debug - +CFG=Demo osgimpostor - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "osgimpostor.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "osgimpostor.mak" CFG="Demo osgimpostor - Win32 Debug" - +!MESSAGE NMAKE /f "osgimpostor.mak" CFG="Demo osgimpostor - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "Demo osgimpostor - Win32 Release" (based on "Win32 (x86) Console Application") - !MESSAGE "Demo osgimpostor - Win32 Debug" (based on "Win32 (x86) Console Application") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - RSC=rc.exe - - !IF "$(CFG)" == "Demo osgimpostor - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "Release" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /machine:I386 - # ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osgimpostor.exe" /libpath:"../../../lib" - - !ELSEIF "$(CFG)" == "Demo osgimpostor - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "Debug" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 "WIN32" /D "_DEBUG" /D "FL_DLL" /FR /YX /FD /c - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /debug /machine:I386 /pdbtype:sept - # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osgimpostord.exe" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /incremental:no - - !ENDIF - - # Begin Target - - # Name "Demo osgimpostor - Win32 Release" - # Name "Demo osgimpostor - Win32 Debug" - # Begin Source File - - SOURCE=..\..\..\src\Demos\osgimpostor\osgimpostor.cpp - # End Source File - # End Target - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Project - - \ No newline at end of file diff --git a/VisualStudio/Demos/osgreflect/osgreflect.dsp b/VisualStudio/Demos/osgreflect/osgreflect.dsp index c772039ee..4ea5537c5 100755 --- a/VisualStudio/Demos/osgreflect/osgreflect.dsp +++ b/VisualStudio/Demos/osgreflect/osgreflect.dsp @@ -1,191 +1,95 @@ -# Microsoft Developer Studio Project File - Name="osgreflect" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="Demo osgreflect" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Console Application" 0x0103 - - -CFG=osgreflect - Win32 Debug - +CFG=Demo osgreflect - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "osgreflect.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "osgreflect.mak" CFG="Demo osgreflect - Win32 Debug" - +!MESSAGE NMAKE /f "osgreflect.mak" CFG="Demo osgreflect - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "Demo osgreflect - Win32 Release" (based on "Win32 (x86) Console Application") - !MESSAGE "Demo osgreflect - Win32 Debug" (based on "Win32 (x86) Console Application") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - RSC=rc.exe - - !IF "$(CFG)" == "Demo osgreflect - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "Release" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /machine:I386 - # ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osgreflect.exe" /libpath:"../../../lib" - - !ELSEIF "$(CFG)" == "Demo osgreflect - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "Debug" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 "WIN32" /D "_DEBUG" /D "FL_DLL" /FR /YX /FD /c - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /debug /machine:I386 /pdbtype:sept - # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osgreflectd.exe" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /incremental:no - - !ENDIF - - # Begin Target - - # Name "Demo osgreflect - Win32 Release" - # Name "Demo osgreflect - Win32 Debug" - # Begin Source File - - SOURCE=..\..\..\src\Demos\osgreflect\osgreflect.cpp - # End Source File - # End Target - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Project - - \ No newline at end of file diff --git a/VisualStudio/Demos/osgscribe/osgscribe.dsp b/VisualStudio/Demos/osgscribe/osgscribe.dsp index ca21e2088..5783f622b 100755 --- a/VisualStudio/Demos/osgscribe/osgscribe.dsp +++ b/VisualStudio/Demos/osgscribe/osgscribe.dsp @@ -1,191 +1,95 @@ -# Microsoft Developer Studio Project File - Name="osgscribe" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="Demo osgscribe" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Console Application" 0x0103 - - -CFG=osgscribe - Win32 Debug - +CFG=Demo osgscribe - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "osgscribe.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "osgscribe.mak" CFG="Demo osgscribe - Win32 Debug" - +!MESSAGE NMAKE /f "osgscribe.mak" CFG="Demo osgscribe - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "Demo osgscribe - Win32 Release" (based on "Win32 (x86) Console Application") - !MESSAGE "Demo osgscribe - Win32 Debug" (based on "Win32 (x86) Console Application") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - RSC=rc.exe - - !IF "$(CFG)" == "Demo osgscribe - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "Release" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /machine:I386 - # ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osgscribe.exe" /libpath:"../../../lib" - - !ELSEIF "$(CFG)" == "Demo osgscribe - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "Debug" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 "WIN32" /D "_DEBUG" /D "FL_DLL" /FR /YX /FD /c - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /debug /machine:I386 /pdbtype:sept - # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osgscribed.exe" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /incremental:no - - !ENDIF - - # Begin Target - - # Name "Demo osgscribe - Win32 Release" - # Name "Demo osgscribe - Win32 Debug" - # Begin Source File - - SOURCE=..\..\..\src\Demos\osgscribe\osgscribe.cpp - # End Source File - # End Target - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Project - - \ No newline at end of file diff --git a/VisualStudio/Demos/osgstereoimage/osgstereoimage.dsp b/VisualStudio/Demos/osgstereoimage/osgstereoimage.dsp index 46f397594..e46bcc267 100755 --- a/VisualStudio/Demos/osgstereoimage/osgstereoimage.dsp +++ b/VisualStudio/Demos/osgstereoimage/osgstereoimage.dsp @@ -1,191 +1,95 @@ -# Microsoft Developer Studio Project File - Name="osgstereoimage" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="Demo osgstereoimage" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Console Application" 0x0103 - - -CFG=osgstereoimage - Win32 Debug - +CFG=Demo osgstereoimage - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "osgstereoimage.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "osgstereoimage.mak" CFG="Demo osgstereoimage - Win32 Debug" - +!MESSAGE NMAKE /f "osgstereoimage.mak" CFG="Demo osgstereoimage - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "Demo osgstereoimage - Win32 Release" (based on "Win32 (x86) Console Application") - !MESSAGE "Demo osgstereoimage - Win32 Debug" (based on "Win32 (x86) Console Application") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - RSC=rc.exe - - !IF "$(CFG)" == "Demo osgstereoimage - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "Release" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /machine:I386 - # ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osgstereoimage.exe" /libpath:"../../../lib" - - !ELSEIF "$(CFG)" == "Demo osgstereoimage - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "Debug" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 "WIN32" /D "_DEBUG" /D "FL_DLL" /FR /YX /FD /c - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /debug /machine:I386 /pdbtype:sept - # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osgstereoimaged.exe" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /incremental:no - - !ENDIF - - # Begin Target - - # Name "Demo osgstereoimage - Win32 Release" - # Name "Demo osgstereoimage - Win32 Debug" - # Begin Source File - - SOURCE=..\..\..\src\Demos\osgstereoimage\osgstereoimage.cpp - # End Source File - # End Target - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Project - - \ No newline at end of file diff --git a/VisualStudio/Demos/osgtext/osgtext.dsp b/VisualStudio/Demos/osgtext/osgtext.dsp index f432182ac..d9ff2b28f 100644 --- a/VisualStudio/Demos/osgtext/osgtext.dsp +++ b/VisualStudio/Demos/osgtext/osgtext.dsp @@ -1,191 +1,95 @@ -# Microsoft Developer Studio Project File - Name="osgtext" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="Demo osgtext" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Console Application" 0x0103 - - -CFG=osgtext - Win32 Debug - +CFG=Demo osgtext - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "osgtext.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "osgtext.mak" CFG="Demo osgtext - Win32 Debug" - +!MESSAGE NMAKE /f "osgtext.mak" CFG="Demo osgtext - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "Demo osgtext - Win32 Release" (based on "Win32 (x86) Console Application") - !MESSAGE "Demo osgtext - Win32 Debug" (based on "Win32 (x86) Console Application") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - RSC=rc.exe - - !IF "$(CFG)" == "Demo osgtext - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "Release" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /machine:I386 - # ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osgtext.exe" /libpath:"../../../lib" - - !ELSEIF "$(CFG)" == "Demo osgtext - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "Debug" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 "WIN32" /D "_DEBUG" /D "FL_DLL" /FR /YX /FD /c - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /debug /machine:I386 /pdbtype:sept - -# ADD LINK32 glut32.lib glu32.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osgtextd.exe" /pdbtype:sept /libpath:"../../../lib" - +# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osgtextd.exe" /pdbtype:sept /libpath:"../../../lib" # SUBTRACT LINK32 /incremental:no - - !ENDIF - - # Begin Target - - # Name "Demo osgtext - Win32 Release" - # Name "Demo osgtext - Win32 Debug" - # Begin Source File - - SOURCE=..\..\..\src\Demos\osgtext\main.cpp - # End Source File - # End Target - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Project - - \ No newline at end of file diff --git a/VisualStudio/Demos/osgtexture/osgtexture.dsp b/VisualStudio/Demos/osgtexture/osgtexture.dsp index 7de38998f..5c506c25c 100755 --- a/VisualStudio/Demos/osgtexture/osgtexture.dsp +++ b/VisualStudio/Demos/osgtexture/osgtexture.dsp @@ -1,191 +1,95 @@ -# Microsoft Developer Studio Project File - Name="osgtexture" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="Demo osgtexture" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Console Application" 0x0103 - - -CFG=osgtexture - Win32 Debug - +CFG=Demo osgtexture - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "osgtexture.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "osgtexture.mak" CFG="Demo osgtexture - Win32 Debug" - +!MESSAGE NMAKE /f "osgtexture.mak" CFG="Demo osgtexture - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "Demo osgtexture - Win32 Release" (based on "Win32 (x86) Console Application") - !MESSAGE "Demo osgtexture - Win32 Debug" (based on "Win32 (x86) Console Application") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - RSC=rc.exe - - !IF "$(CFG)" == "Demo osgtexture - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "Release" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /machine:I386 - # ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osgtexture.exe" /libpath:"../../../lib" - - !ELSEIF "$(CFG)" == "Demo osgtexture - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "Debug" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 "WIN32" /D "_DEBUG" /D "FL_DLL" /FR /YX /FD /c - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /debug /machine:I386 /pdbtype:sept - # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osgtextured.exe" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /incremental:no - - !ENDIF - - # Begin Target - - # Name "Demo osgtexture - Win32 Release" - # Name "Demo osgtexture - Win32 Debug" - # Begin Source File - - SOURCE=..\..\..\src\Demos\osgtexture\osgtexture.cpp - # End Source File - # End Target - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Project - - \ No newline at end of file diff --git a/VisualStudio/Demos/osgversion/osgversion.dsp b/VisualStudio/Demos/osgversion/osgversion.dsp index 97cc68ef2..9a75cd374 100755 --- a/VisualStudio/Demos/osgversion/osgversion.dsp +++ b/VisualStudio/Demos/osgversion/osgversion.dsp @@ -1,191 +1,95 @@ -# Microsoft Developer Studio Project File - Name="osgversion" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="Demo osgversion" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Console Application" 0x0103 - - -CFG=osgversion - Win32 Debug - +CFG=Demo osgversion - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "osgversion.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "osgversion.mak" CFG="Demo osgversion - Win32 Debug" - +!MESSAGE NMAKE /f "osgversion.mak" CFG="Demo osgversion - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "Demo osgversion - Win32 Release" (based on "Win32 (x86) Console Application") - !MESSAGE "Demo osgversion - Win32 Debug" (based on "Win32 (x86) Console Application") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - RSC=rc.exe - - !IF "$(CFG)" == "Demo osgversion - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "Release" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /machine:I386 - # ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osgversion.exe" /libpath:"../../../lib" - - !ELSEIF "$(CFG)" == "Demo osgversion - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "Debug" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 "WIN32" /D "_DEBUG" /D "FL_DLL" /FR /YX /FD /c - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /debug /machine:I386 /pdbtype:sept - # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osgversiond.exe" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /incremental:no - - !ENDIF - - # Begin Target - - # Name "Demo osgversion - Win32 Release" - # Name "Demo osgversion - Win32 Debug" - # Begin Source File - - SOURCE=..\..\..\src\Demos\osgversion\osgversion.cpp - # End Source File - # End Target - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Project - - \ No newline at end of file diff --git a/VisualStudio/Demos/osgviews/osgviews.dsp b/VisualStudio/Demos/osgviews/osgviews.dsp index 4d5692e6b..13a26bc67 100755 --- a/VisualStudio/Demos/osgviews/osgviews.dsp +++ b/VisualStudio/Demos/osgviews/osgviews.dsp @@ -1,191 +1,95 @@ -# Microsoft Developer Studio Project File - Name="osgviews" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="Demo osgviews" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Console Application" 0x0103 - - -CFG=osgviews - Win32 Debug - +CFG=Demo osgviews - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "osgviews.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "osgviews.mak" CFG="Demo osgviews - Win32 Debug" - +!MESSAGE NMAKE /f "osgviews.mak" CFG="Demo osgviews - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "Demo osgviews - Win32 Release" (based on "Win32 (x86) Console Application") - !MESSAGE "Demo osgviews - Win32 Debug" (based on "Win32 (x86) Console Application") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - RSC=rc.exe - - !IF "$(CFG)" == "Demo osgviews - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "Release" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /machine:I386 - # ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osgviews.exe" /libpath:"../../../lib" - - !ELSEIF "$(CFG)" == "Demo osgviews - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "Debug" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 "WIN32" /D "_DEBUG" /D "FL_DLL" /FR /YX /FD /c - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /debug /machine:I386 /pdbtype:sept - # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osgviewsd.exe" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /incremental:no - - !ENDIF - - # Begin Target - - # Name "Demo osgviews - Win32 Release" - # Name "Demo osgviews - Win32 Debug" - # Begin Source File - - SOURCE=..\..\..\src\Demos\osgviews\osgviews.cpp - # End Source File - # End Target - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Project - - \ No newline at end of file diff --git a/VisualStudio/Demos/sgv/sgv.dsp b/VisualStudio/Demos/sgv/sgv.dsp index 28142e6c3..d75ac877e 100755 --- a/VisualStudio/Demos/sgv/sgv.dsp +++ b/VisualStudio/Demos/sgv/sgv.dsp @@ -1,191 +1,95 @@ -# Microsoft Developer Studio Project File - Name="sgv" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="Demo sgv" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Console Application" 0x0103 - - -CFG=sgv - Win32 Debug - +CFG=Demo sgv - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "sgv.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "sgv.mak" CFG="Demo sgv - Win32 Debug" - +!MESSAGE NMAKE /f "sgv.mak" CFG="Demo sgv - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "Demo sgv - Win32 Release" (based on "Win32 (x86) Console Application") - !MESSAGE "Demo sgv - Win32 Debug" (based on "Win32 (x86) Console Application") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - RSC=rc.exe - - !IF "$(CFG)" == "Demo sgv - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "Release" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /machine:I386 - # ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/sgv.exe" /libpath:"../../../lib" - - !ELSEIF "$(CFG)" == "Demo sgv - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "Debug" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 "WIN32" /D "_DEBUG" /D "FL_DLL" /FR /YX /FD /c - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /subsystem:console /debug /machine:I386 /pdbtype:sept - # ADD LINK32 glut32.lib glu32.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/sgvd.exe" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /incremental:no - - !ENDIF - - # Begin Target - - # Name "Demo sgv - Win32 Release" - # Name "Demo sgv - Win32 Debug" - # Begin Source File - - SOURCE=..\..\..\src\Demos\sgv\sgv.cpp - # End Source File - # End Target - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Project - - \ No newline at end of file diff --git a/VisualStudio/osg/osg.dsp b/VisualStudio/osg/osg.dsp index 116c06c88..faa21e615 100755 --- a/VisualStudio/osg/osg.dsp +++ b/VisualStudio/osg/osg.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="osg" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="Core osg" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=osg - Win32 Debug +CFG=Core osg - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=osg - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "osg.mak" CFG="Core osg - Win32 Debug" +!MESSAGE NMAKE /f "osg.mak" CFG="Core osg - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -141,6 +141,10 @@ SOURCE=..\..\src\osg\Depth.cpp # End Source File # Begin Source File +SOURCE=..\..\src\osg\DisplaySettings.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\osg\Drawable.cpp # End Source File # Begin Source File @@ -229,11 +233,11 @@ SOURCE=..\..\src\osg\Material.cpp # End Source File # Begin Source File -SOURCE=..\..\src\osg\MemoryManager.cpp +SOURCE=..\..\src\osg\Matrix.cpp # End Source File # Begin Source File -SOURCE=..\..\src\osg\Matrix.cpp +SOURCE=..\..\src\osg\MemoryManager.cpp # End Source File # Begin Source File @@ -339,10 +343,6 @@ SOURCE=..\..\src\osg\Version.cpp SOURCE=..\..\src\osg\Viewport.cpp # End Source File -# Begin Source File - -SOURCE=..\..\src\osg\DisplaySettings.cpp -# End Source File # End Group # Begin Group "Header Files" @@ -405,6 +405,10 @@ SOURCE=..\..\Include\Osg\Depth # End Source File # Begin Source File +SOURCE=..\..\include\osg\DisplaySettings +# End Source File +# Begin Source File + SOURCE=..\..\Include\Osg\Drawable # End Source File # Begin Source File @@ -501,10 +505,6 @@ SOURCE=..\..\Include\Osg\Material # End Source File # Begin Source File -SOURCE=..\..\Include\Osg\MemoryManager -# End Source File -# Begin Source File - SOURCE=..\..\include\osg\Math # End Source File # Begin Source File @@ -521,6 +521,10 @@ SOURCE=..\..\include\osg\MemoryAdapter # End Source File # Begin Source File +SOURCE=..\..\Include\Osg\MemoryManager +# End Source File +# Begin Source File + SOURCE=..\..\Include\Osg\Node # End Source File # Begin Source File @@ -659,10 +663,6 @@ SOURCE=..\..\Include\Osg\Version SOURCE=..\..\include\osg\Viewport # End Source File -# Begin Source File - -SOURCE=..\..\include\osg\DisplaySettings -# End Source File # End Group # Begin Group "Resource Files" @@ -670,4 +670,3 @@ SOURCE=..\..\include\osg\DisplaySettings # End Group # End Target # End Project - \ No newline at end of file diff --git a/VisualStudio/osgDB/osgDB.dsp b/VisualStudio/osgDB/osgDB.dsp index 58bcfcf86..7d0faf35a 100755 --- a/VisualStudio/osgDB/osgDB.dsp +++ b/VisualStudio/osgDB/osgDB.dsp @@ -1,433 +1,216 @@ -# Microsoft Developer Studio Project File - Name="osgDB" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="Core osgDB" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - - -CFG=osgDB - Win32 Debug - +CFG=Core osgDB - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "osgDB.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "osgDB.mak" CFG="Core osgDB - Win32 Debug" - +!MESSAGE NMAKE /f "osgDB.mak" CFG="Core osgDB - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "Core osgDB - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE "Core osgDB - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe - - !IF "$(CFG)" == "Core osgDB - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "../../lib" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "../../lib" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGDB_LIBRARY" /D "WIN32" /D "_WINDOWS" /YX /FD /c - # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /nologo /dll /pdb:none /machine:I386 /out:"../../bin/osgDB.dll" /libpath:"../../lib" - - !ELSEIF "$(CFG)" == "Core osgDB - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "../../lib" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "_DEBUG" /D "OSGDB_LIBRARY" /D "WIN32" /D "_WINDOWS" /YX /FD /GZ /c - # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"../../bin/osgDBd.dll" /pdbtype:sept /libpath:"../../lib" - # SUBTRACT LINK32 /pdb:none - - !ENDIF - - # Begin Target - - # Name "Core osgDB - Win32 Release" - # Name "Core osgDB - Win32 Debug" - # Begin Group "Source Files" - - # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - # Begin Source File - - SOURCE=..\..\Src\osgDB\DotOsgWrapper.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\Src\osgDB\DynamicLibrary.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\Src\osgDB\Field.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\Src\osgDB\FieldReader.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\Src\osgDB\FieldReaderIterator.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\Src\osgDB\FileNameUtils.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\Src\osgDB\FileUtils.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\Src\osgDB\Input.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\Src\osgDB\Output.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\Src\osgDB\ReadFile.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\Src\osgDB\Registry.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\Src\osgDB\Version.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\Src\osgDB\WriteFile.cpp - # End Source File - # End Group - # Begin Group "Header Files" - - # PROP Default_Filter ";h;hpp;hxx;hm;inl" - # Begin Source File - - SOURCE=..\..\Include\osgDB\DotOsgWrapper - # End Source File - # Begin Source File - - SOURCE=..\..\Include\osgDB\DynamicLibrary - # End Source File - # Begin Source File - - SOURCE=..\..\Include\osgDB\Export - # End Source File - # Begin Source File - - SOURCE=..\..\Include\osgDB\Field - # End Source File - # Begin Source File - - SOURCE=..\..\Include\osgDB\FieldReader - # End Source File - # Begin Source File - - SOURCE=..\..\Include\osgDB\FieldReaderIterator - # End Source File - # Begin Source File - - SOURCE=..\..\Include\osgDB\FileNameUtils - # End Source File - # Begin Source File - - SOURCE=..\..\include\osgDB\FileUtils - # End Source File - # Begin Source File - - SOURCE=..\..\Include\osgDB\Input - # End Source File - # Begin Source File - - SOURCE=..\..\Include\osgDB\Output - # End Source File - # Begin Source File - - SOURCE=..\..\include\osgDB\ReaderWriter - # End Source File - # Begin Source File - - SOURCE=..\..\Include\osgDB\ReadFile - # End Source File - # Begin Source File - - SOURCE=..\..\Include\osgDB\Registry - # End Source File - # Begin Source File - - SOURCE=..\..\Include\osgDB\Version - # End Source File - # Begin Source File - - SOURCE=..\..\Include\osgDB\WriteFile - # End Source File - # End Group - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Target - # End Project - - \ No newline at end of file diff --git a/VisualStudio/osgGLUT/osgGLUT.dsp b/VisualStudio/osgGLUT/osgGLUT.dsp index e1d6ef61f..a7ea5ee03 100755 --- a/VisualStudio/osgGLUT/osgGLUT.dsp +++ b/VisualStudio/osgGLUT/osgGLUT.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="osgGLUT" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="Core osgGLUT" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=osgGLUT - Win32 Debug +CFG=Core osgGLUT - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=osgGLUT - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "osgGLUT.mak" CFG="Core osgGLUT - Win32 Debug" +!MESSAGE NMAKE /f "osgGLUT.mak" CFG="Core osgGLUT - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -101,11 +101,11 @@ SOURCE=..\..\src\osgGLUT\Version.cpp # End Source File # Begin Source File -SOURCE=..\..\src\osgGLUT\Window.cpp +SOURCE=..\..\src\osgGLUT\Viewer.cpp # End Source File # Begin Source File -SOURCE=..\..\src\osgGLUT\Viewer.cpp +SOURCE=..\..\src\osgGLUT\Window.cpp # End Source File # End Group # Begin Group "Header Files" @@ -125,16 +125,16 @@ SOURCE=..\..\Include\osgGLUT\GLUTEventAdapter # End Source File # Begin Source File -SOURCE=..\..\Include\osgGLUT\Window -# End Source File -# Begin Source File - SOURCE=..\..\Include\osgGLUT\Version # End Source File # Begin Source File SOURCE=..\..\Include\osgGLUT\Viewer # End Source File +# Begin Source File + +SOURCE=..\..\Include\osgGLUT\Window +# End Source File # End Group # Begin Group "Resource Files" @@ -142,4 +142,3 @@ SOURCE=..\..\Include\osgGLUT\Viewer # End Group # End Target # End Project - \ No newline at end of file diff --git a/VisualStudio/osgPlugins/bmp/bmp.dsp b/VisualStudio/osgPlugins/bmp/bmp.dsp index 4e50000b7..c7760bf67 100644 --- a/VisualStudio/osgPlugins/bmp/bmp.dsp +++ b/VisualStudio/osgPlugins/bmp/bmp.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="bmp" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="osgPlugin bmp" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=bmp - Win32 Debug +CFG=osgPlugin bmp - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=bmp - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "bmp.mak" CFG="osgPlugin bmp - Win32 Debug" +!MESSAGE NMAKE /f "bmp.mak" CFG="osgPlugin bmp - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -107,4 +107,3 @@ SOURCE=..\..\..\src\osgPlugins\bmp\ReaderWriterBMP.cpp # End Group # End Target # End Project - \ No newline at end of file diff --git a/VisualStudio/osgPlugins/dw/dw.dsp b/VisualStudio/osgPlugins/dw/dw.dsp index adfedbc65..49a5b0c8b 100644 --- a/VisualStudio/osgPlugins/dw/dw.dsp +++ b/VisualStudio/osgPlugins/dw/dw.dsp @@ -1,227 +1,113 @@ -# Microsoft Developer Studio Project File - Name="dw" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="osgPlugin dw" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - - -CFG=dw - Win32 Debug - +CFG=osgPlugin dw - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "dw.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "dw.mak" CFG="osgPlugin dw - Win32 Debug" - +!MESSAGE NMAKE /f "dw.mak" CFG="osgPlugin dw - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "osgPlugin dw - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE "osgPlugin dw - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe - - !IF "$(CFG)" == "osgPlugin dw - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c - # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /nologo /dll /pdb:none /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_dw.dll" /libpath:"../../../lib" - # SUBTRACT LINK32 /nodefaultlib - - !ELSEIF "$(CFG)" == "osgPlugin dw - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c - # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_dwd.dll" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /pdb:none - - !ENDIF - - # Begin Target - - # Name "osgPlugin dw - Win32 Release" - # Name "osgPlugin dw - Win32 Debug" - # Begin Group "Source Files" - - # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\dw\ReaderWriterDW.cpp - # End Source File - # End Group - # Begin Group "Header Files" - - # PROP Default_Filter "" - # End Group - # End Target - # Begin Group "Header Files No. 1" - - # PROP Default_Filter "h;hpp;hxx;hm;inl" - # End Group - # Begin Group "Resource Files" - - # PROP Default_Filter "" - # End Group - # End Project - - \ No newline at end of file diff --git a/VisualStudio/osgPlugins/dx/dx.dsp b/VisualStudio/osgPlugins/dx/dx.dsp index 575488436..6a148b639 100755 --- a/VisualStudio/osgPlugins/dx/dx.dsp +++ b/VisualStudio/osgPlugins/dx/dx.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="dx" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="osgPlugin dx" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=dx - Win32 Debug +CFG=osgPlugin dx - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=dx - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "dx.mak" CFG="osgPlugin dx - Win32 Debug" +!MESSAGE NMAKE /f "dx.mak" CFG="osgPlugin dx - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -135,4 +135,3 @@ SOURCE=..\..\..\src\osgPlugins\dx\StateSetStr.h # End Group # End Target # End Project - \ No newline at end of file diff --git a/VisualStudio/osgPlugins/flt/flt.dsp b/VisualStudio/osgPlugins/flt/flt.dsp index 451a9c4ac..aed839fc3 100644 --- a/VisualStudio/osgPlugins/flt/flt.dsp +++ b/VisualStudio/osgPlugins/flt/flt.dsp @@ -1,817 +1,408 @@ -# Microsoft Developer Studio Project File - Name="flt" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="osgPlugin flt" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - - -CFG=flt - Win32 Debug - +CFG=osgPlugin flt - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "flt.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "flt.mak" CFG="osgPlugin flt - Win32 Debug" - +!MESSAGE NMAKE /f "flt.mak" CFG="osgPlugin flt - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "osgPlugin flt - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE "osgPlugin flt - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe - - !IF "$(CFG)" == "osgPlugin flt - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "Release" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FLT_LIBRARY" /YX /FD /c - # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x414 /d "NDEBUG" - # ADD RSC /l 0x417 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /nologo /dll /pdb:none /machine:I386 /out:"../../../bin/osgdb_flt.dll" /libpath:"../../../lib" - - !ELSEIF "$(CFG)" == "osgPlugin flt - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FLT_LIBRARY" /YX /FD /GZ /c - # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x414 /d "_DEBUG" - # ADD RSC /l 0x417 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /nologo /dll /pdb:"../../../bin/osgdb_fltd.pdb" /debug /machine:I386 /out:"../../../bin/osgdb_fltd.dll" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /pdb:none /incremental:no - - !ENDIF - - # Begin Target - - # Name "osgPlugin flt - Win32 Release" - # Name "osgPlugin flt - Win32 Debug" - # Begin Group "Source Files" - - # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\BoundingVolumeRecords.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\ColorPaletteRecord.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\CommentRecord.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\ControlRecord.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\DofRecord.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\ExtensionRecord.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\ExternalRecord.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\FaceRecord.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\flt.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\flt2osg.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\FltFile.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\GeoSetBuilder.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\GroupRecord.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\HeaderRecord.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\Input.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\InstanceRecords.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\LightPointRecord.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\LightSourcePaletteRecord.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\LightSourceRecord.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\LodRecord.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\LongIDRecord.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\MaterialPaletteRecord.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\ObjectRecord.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\OldMaterialPaletteRecord.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\OldVertexRecords.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\Pool.cpp - # End Source File - # Begin Source File - - -SOURCE=..\..\..\src\osgPlugins\flt\ReaderWriterFLT.cpp - -# End Source File - -# Begin Source File - - - SOURCE=..\..\..\src\osgPlugins\flt\ReaderWriterATTR.cpp - # End Source File - # Begin Source File - +SOURCE=..\..\..\src\osgPlugins\flt\ReaderWriterFLT.cpp +# End Source File +# Begin Source File SOURCE=..\..\..\src\osgPlugins\flt\Record.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\RecordVisitor.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\Registry.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\SwitchRecord.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\TextureMappingPaletteRecord.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\TexturePaletteRecord.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\TransformationRecords.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\UnknownRecord.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\VertexPoolRecords.cpp - # End Source File - # End Group - # Begin Group "Header Files" - - # PROP Default_Filter "h;hpp;hxx;hm;inl;" - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\BoundingVolumeRecords.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\ColorPaletteRecord.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\CommentRecord.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\ControlRecord.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\DofRecord.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\ExtensionRecord.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\ExternalRecord.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\FaceRecord.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\flt.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\flt2osg.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\FltFile.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\FltRecords.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\GeoSetBuilder.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\GroupRecord.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\HeaderRecord.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\Input.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\InstanceRecords.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\LightPointRecord.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\LightSourcePaletteRecord.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\LightSourceRecord.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\LodRecord.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\LongIDRecord.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\MaterialPaletteRecord.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\ObjectRecord.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\OldMaterialPaletteRecord.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\OldVertexRecords.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\opcodes.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\Pool.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\ReaderWriterFLT.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\Record.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\RecordVisitor.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\Registry.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\SwitchRecord.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\TextureMappingPaletteRecord.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\TexturePaletteRecord.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\TransformationRecords.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\UnknownRecord.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\VertexPoolRecords.h - # End Source File - # End Group - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\flt\license.txt - # End Source File - # End Group - # End Target - # End Project - - \ No newline at end of file diff --git a/VisualStudio/osgPlugins/gif/gif.dsp b/VisualStudio/osgPlugins/gif/gif.dsp index 9dd4a9bcd..8b028ca16 100755 --- a/VisualStudio/osgPlugins/gif/gif.dsp +++ b/VisualStudio/osgPlugins/gif/gif.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="gif" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="osgPlugin gif" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=gif - Win32 Debug +CFG=osgPlugin gif - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=gif - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "gif.mak" CFG="osgPlugin gif - Win32 Debug" +!MESSAGE NMAKE /f "gif.mak" CFG="osgPlugin gif - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE diff --git a/VisualStudio/osgPlugins/jpeg/jpeg.dsp b/VisualStudio/osgPlugins/jpeg/jpeg.dsp index bb28dba72..f0c97ff1f 100755 --- a/VisualStudio/osgPlugins/jpeg/jpeg.dsp +++ b/VisualStudio/osgPlugins/jpeg/jpeg.dsp @@ -1,219 +1,109 @@ -# Microsoft Developer Studio Project File - Name="jpeg" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="osgPlugin jpeg" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - - -CFG=jpeg - Win32 Debug - +CFG=osgPlugin jpeg - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "jpeg.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "jpeg.mak" CFG="osgPlugin jpeg - Win32 Debug" - +!MESSAGE NMAKE /f "jpeg.mak" CFG="osgPlugin jpeg - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "osgPlugin jpeg - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE "osgPlugin jpeg - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe - - !IF "$(CFG)" == "osgPlugin jpeg - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c - # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 libjpeg.lib /nologo /dll /pdb:none /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_jpeg.dll" /libpath:"../../../lib" - # SUBTRACT LINK32 /nodefaultlib - - !ELSEIF "$(CFG)" == "osgPlugin jpeg - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c - # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 libjpeg.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_jpegd.dll" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /nodefaultlib - - !ENDIF - - # Begin Target - - # Name "osgPlugin jpeg - Win32 Release" - # Name "osgPlugin jpeg - Win32 Debug" - # Begin Group "Source Files" - - # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\jpeg\ReaderWriterJPEG.cpp - # End Source File - # End Group - # Begin Group "Header Files" - - # PROP Default_Filter "h;hpp;hxx;hm;inl" - # End Group - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Target - # End Project - - \ No newline at end of file diff --git a/VisualStudio/osgPlugins/lib3ds/lib3ds.dsp b/VisualStudio/osgPlugins/lib3ds/lib3ds.dsp index 7e41d904a..de366f638 100644 --- a/VisualStudio/osgPlugins/lib3ds/lib3ds.dsp +++ b/VisualStudio/osgPlugins/lib3ds/lib3ds.dsp @@ -1,539 +1,269 @@ # Microsoft Developer Studio Project File - Name="osgPlugin 3ds" - Package Owner=<4> - # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - - -CFG=3ds - Win32 Debug - +CFG=osgPlugin 3ds - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "lib3ds.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "lib3ds.mak" CFG="osgPlugin 3ds - Win32 Debug" - +!MESSAGE NMAKE /f "lib3ds.mak" CFG="osgPlugin 3ds - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "osgPlugin 3ds - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE "osgPlugin 3ds - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe - - !IF "$(CFG)" == "osgPlugin 3ds - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 "../../../src/osgPlugins/lib3ds" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c - # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /nologo /dll /pdb:none /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_3ds.dll" /libpath:"../../../lib" - # SUBTRACT LINK32 /nodefaultlib - - !ELSEIF "$(CFG)" == "osgPlugin 3ds - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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 "../../../src/osgPlugins/lib3ds" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c - # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_3dsd.dll" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /nodefaultlib - - !ENDIF - - # Begin Target - - # Name "osgPlugin 3ds - Win32 Release" - # Name "osgPlugin 3ds - Win32 Debug" - # Begin Group "Source Files" - - # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\atmosphere.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\background.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Camera.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Chunk.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Ease.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\File.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Lib3ds_float.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Light.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Material.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Matrix.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Mesh.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Node.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Quat.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\ReaderWriter3DS.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\readwrite.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Shadow.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Tcb.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Tracks.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Vector.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Viewport.cpp - # End Source File - # End Group - # Begin Group "Header Files" - - # PROP Default_Filter "h;hpp;hxx;hm;inl" - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\atmosphere.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\background.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Camera.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Chunk.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\chunktable.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Ease.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\File.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Lib3ds_float.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Light.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Material.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Matrix.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Mesh.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Node.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Quat.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\readwrite.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Shadow.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Tcb.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Tracks.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Types.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Vector.h - # End Source File - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Viewport.h - # End Source File - # End Group - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Target - # End Project - - \ No newline at end of file diff --git a/VisualStudio/osgPlugins/lwo/lwo.dsp b/VisualStudio/osgPlugins/lwo/lwo.dsp index 4f584f658..9b54bd076 100644 --- a/VisualStudio/osgPlugins/lwo/lwo.dsp +++ b/VisualStudio/osgPlugins/lwo/lwo.dsp @@ -1,243 +1,121 @@ -# Microsoft Developer Studio Project File - Name="lwo" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="osgPlugin lwo" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - - -CFG=lwo - Win32 Debug - +CFG=osgPlugin lwo - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "lwo.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "lwo.mak" CFG="osgPlugin lwo - Win32 Debug" - +!MESSAGE NMAKE /f "lwo.mak" CFG="osgPlugin lwo - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "osgPlugin lwo - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE "osgPlugin lwo - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe - - !IF "$(CFG)" == "osgPlugin lwo - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c - # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /nologo /dll /pdb:none /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_lwo.dll" /libpath:"../../../lib" - # SUBTRACT LINK32 /nodefaultlib - - !ELSEIF "$(CFG)" == "osgPlugin lwo - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c - # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_lwod.dll" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /pdb:none - - !ENDIF - - # Begin Target - - # Name "osgPlugin lwo - Win32 Release" - # Name "osgPlugin lwo - Win32 Debug" - # Begin Group "Source Files" - - # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\lwo\lw.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\lwo\ReaderWriterLWO.cpp - # End Source File - # End Group - # Begin Group "Header Files" - - # PROP Default_Filter "" - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\lwo\lw.h - # End Source File - # End Group - # End Target - # Begin Group "Header Files No. 1" - - # PROP Default_Filter "h;hpp;hxx;hm;inl" - # End Group - # Begin Group "Resource Files" - - # PROP Default_Filter "" - # End Group - # End Project - - \ No newline at end of file diff --git a/VisualStudio/osgPlugins/obj/obj.dsp b/VisualStudio/osgPlugins/obj/obj.dsp index a524b095b..d5694579a 100644 --- a/VisualStudio/osgPlugins/obj/obj.dsp +++ b/VisualStudio/osgPlugins/obj/obj.dsp @@ -1,235 +1,117 @@ -# Microsoft Developer Studio Project File - Name="obj" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="osgPlugin obj" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - - -CFG=obj - Win32 Debug - +CFG=osgPlugin obj - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "obj.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "obj.mak" CFG="osgPlugin obj - Win32 Debug" - +!MESSAGE NMAKE /f "obj.mak" CFG="osgPlugin obj - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "osgPlugin obj - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE "osgPlugin obj - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe - - !IF "$(CFG)" == "osgPlugin obj - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c - # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /nologo /dll /pdb:none /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_obj.dll" /libpath:"../../../lib" - # SUBTRACT LINK32 /nodefaultlib - - !ELSEIF "$(CFG)" == "osgPlugin obj - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c - # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_objd.dll" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /nodefaultlib - - !ENDIF - - # Begin Target - - # Name "osgPlugin obj - Win32 Release" - # Name "osgPlugin obj - Win32 Debug" - # Begin Group "Source Files" - - # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\obj\glm.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\obj\ReaderWriterOBJ.cpp - # End Source File - # End Group - # Begin Group "Header Files" - - # PROP Default_Filter "h;hpp;hxx;hm;inl" - # Begin Source File - - SOURCE=..\..\..\Src\osgPlugins\obj\glm.h - # End Source File - # End Group - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Target - # End Project - - \ No newline at end of file diff --git a/VisualStudio/osgPlugins/osg/dot_osg.dsp b/VisualStudio/osgPlugins/osg/dot_osg.dsp index 27df07e6b..57b9af9ae 100755 --- a/VisualStudio/osgPlugins/osg/dot_osg.dsp +++ b/VisualStudio/osgPlugins/osg/dot_osg.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="dot_osg" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="osgPlugin osg" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=dot_osg - Win32 Debug +CFG=osgPlugin osg - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=dot_osg - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "dot_osg.mak" CFG="osgPlugin osg - Win32 Debug" +!MESSAGE NMAKE /f "dot_osg.mak" CFG="osgPlugin osg - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -170,11 +170,11 @@ SOURCE=..\..\..\src\osgPlugins\osg\LightSource.cpp # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\osg\LineWidth.cpp +SOURCE=..\..\..\src\osgPlugins\osg\LineStipple.cpp # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\osg\LineStipple.cpp +SOURCE=..\..\..\src\osgPlugins\osg\LineWidth.cpp # End Source File # Begin Source File @@ -267,4 +267,3 @@ SOURCE=..\..\..\src\osgPlugins\osg\Transparency.cpp # End Group # End Target # End Project - \ No newline at end of file diff --git a/VisualStudio/osgPlugins/osgtgz/osgtgz.dsp b/VisualStudio/osgPlugins/osgtgz/osgtgz.dsp index 9eda2406e..cd6d0ddf4 100644 --- a/VisualStudio/osgPlugins/osgtgz/osgtgz.dsp +++ b/VisualStudio/osgPlugins/osgtgz/osgtgz.dsp @@ -1,219 +1,109 @@ -# Microsoft Developer Studio Project File - Name="osgtgz" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="osgPlugin osgtgz" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - - -CFG=osgtgz - Win32 Debug - +CFG=osgPlugin osgtgz - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "osgtgz.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "osgtgz.mak" CFG="osgPlugin osgtgz - Win32 Debug" - +!MESSAGE NMAKE /f "osgtgz.mak" CFG="osgPlugin osgtgz - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "osgPlugin osgtgz - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE "osgPlugin osgtgz - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe - - !IF "$(CFG)" == "osgPlugin osgtgz - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c - # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /nologo /dll /pdb:none /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_osgtgz.dll" /libpath:"../../../lib" - # SUBTRACT LINK32 /nodefaultlib - - !ELSEIF "$(CFG)" == "osgPlugin osgtgz - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c - # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_osgtgzd.dll" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /nodefaultlib - - !ENDIF - - # Begin Target - - # Name "osgPlugin osgtgz - Win32 Release" - # Name "osgPlugin osgtgz - Win32 Debug" - # Begin Group "Source Files" - - # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\osgtgz\ReaderWriterOSGTGZ.cpp - # End Source File - # End Group - # Begin Group "Header Files" - - # PROP Default_Filter "h;hpp;hxx;hm;inl" - # End Group - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Target - # End Project - - \ No newline at end of file diff --git a/VisualStudio/osgPlugins/pic/pic.dsp b/VisualStudio/osgPlugins/pic/pic.dsp index 556659840..cca6648a3 100755 --- a/VisualStudio/osgPlugins/pic/pic.dsp +++ b/VisualStudio/osgPlugins/pic/pic.dsp @@ -1,219 +1,109 @@ -# Microsoft Developer Studio Project File - Name="pic" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="osgPlugin pic" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - - -CFG=pic - Win32 Debug - +CFG=osgPlugin pic - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "pic.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "pic.mak" CFG="osgPlugin pic - Win32 Debug" - +!MESSAGE NMAKE /f "pic.mak" CFG="osgPlugin pic - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "osgPlugin pic - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE "osgPlugin pic - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe - - !IF "$(CFG)" == "osgPlugin pic - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c - # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /nologo /dll /pdb:none /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_pic.dll" /libpath:"../../../lib" - # SUBTRACT LINK32 /nodefaultlib - - !ELSEIF "$(CFG)" == "osgPlugin pic - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c - # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_picd.dll" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /nodefaultlib - - !ENDIF - - # Begin Target - - # Name "osgPlugin pic - Win32 Release" - # Name "osgPlugin pic - Win32 Debug" - # Begin Group "Source Files" - - # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\pic\ReaderWriterPIC.cpp - # End Source File - # End Group - # Begin Group "Header Files" - - # PROP Default_Filter "h;hpp;hxx;hm;inl" - # End Group - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Target - # End Project - - \ No newline at end of file diff --git a/VisualStudio/osgPlugins/png/png.dsp b/VisualStudio/osgPlugins/png/png.dsp index 54000cbc7..b603c80b6 100755 --- a/VisualStudio/osgPlugins/png/png.dsp +++ b/VisualStudio/osgPlugins/png/png.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="png" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="osgPlugin png" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=png - Win32 Debug +CFG=osgPlugin png - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=png - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "png.mak" CFG="osgPlugin png - Win32 Debug" +!MESSAGE NMAKE /f "png.mak" CFG="osgPlugin png - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -107,4 +107,3 @@ SOURCE=..\..\..\src\osgPlugins\png\ReaderWriterPNG.cpp # End Group # End Target # End Project - \ No newline at end of file diff --git a/VisualStudio/osgPlugins/rgb/rgb.dsp b/VisualStudio/osgPlugins/rgb/rgb.dsp index 8e8f6979c..c60832a72 100644 --- a/VisualStudio/osgPlugins/rgb/rgb.dsp +++ b/VisualStudio/osgPlugins/rgb/rgb.dsp @@ -1,219 +1,109 @@ -# Microsoft Developer Studio Project File - Name="rgb" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="osgPlugin rgb" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - - -CFG=rgb - Win32 Debug - +CFG=osgPlugin rgb - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "rgb.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "rgb.mak" CFG="osgPlugin rgb - Win32 Debug" - +!MESSAGE NMAKE /f "rgb.mak" CFG="osgPlugin rgb - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "osgPlugin rgb - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE "osgPlugin rgb - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe - - !IF "$(CFG)" == "osgPlugin rgb - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c - # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /nologo /dll /pdb:none /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_rgb.dll" /libpath:"../../../lib" - # SUBTRACT LINK32 /nodefaultlib - - !ELSEIF "$(CFG)" == "osgPlugin rgb - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c - # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_rgbd.dll" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /nodefaultlib - - !ENDIF - - # Begin Target - - # Name "osgPlugin rgb - Win32 Release" - # Name "osgPlugin rgb - Win32 Debug" - # Begin Group "Source Files" - - # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\rgb\ReaderWriterRGB.cpp - # End Source File - # End Group - # Begin Group "Header Files" - - # PROP Default_Filter "h;hpp;hxx;hm;inl" - # End Group - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Target - # End Project - - \ No newline at end of file diff --git a/VisualStudio/osgPlugins/tgz/tgz.dsp b/VisualStudio/osgPlugins/tgz/tgz.dsp index 8020555f7..1ae10ae67 100644 --- a/VisualStudio/osgPlugins/tgz/tgz.dsp +++ b/VisualStudio/osgPlugins/tgz/tgz.dsp @@ -1,219 +1,109 @@ -# Microsoft Developer Studio Project File - Name="tgz" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="osgPlugin tgz" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - - -CFG=tgz - Win32 Debug - +CFG=osgPlugin tgz - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "tgz.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "tgz.mak" CFG="osgPlugin tgz - Win32 Debug" - +!MESSAGE NMAKE /f "tgz.mak" CFG="osgPlugin tgz - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "osgPlugin tgz - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE "osgPlugin tgz - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe - - !IF "$(CFG)" == "osgPlugin tgz - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c - # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /nologo /dll /pdb:none /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_tgz.dll" /libpath:"../../../lib" - # SUBTRACT LINK32 /nodefaultlib - - !ELSEIF "$(CFG)" == "osgPlugin tgz - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c - # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_tgzd.dll" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /nodefaultlib - - !ENDIF - - # Begin Target - - # Name "osgPlugin tgz - Win32 Release" - # Name "osgPlugin tgz - Win32 Debug" - # Begin Group "Source Files" - - # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\tgz\ReaderWriterTGZ.cpp - # End Source File - # End Group - # Begin Group "Header Files" - - # PROP Default_Filter "h;hpp;hxx;hm;inl" - # End Group - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Target - # End Project - - \ No newline at end of file diff --git a/VisualStudio/osgPlugins/tiff/tiff.dsp b/VisualStudio/osgPlugins/tiff/tiff.dsp index 7249695ef..1f6fcc226 100755 --- a/VisualStudio/osgPlugins/tiff/tiff.dsp +++ b/VisualStudio/osgPlugins/tiff/tiff.dsp @@ -1,219 +1,109 @@ -# Microsoft Developer Studio Project File - Name="tiff" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="osgPlugin tiff" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - - -CFG=tiff - Win32 Debug - +CFG=osgPlugin tiff - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "tiff.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "tiff.mak" CFG="osgPlugin tiff - Win32 Debug" - +!MESSAGE NMAKE /f "tiff.mak" CFG="osgPlugin tiff - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "osgPlugin tiff - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE "osgPlugin tiff - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe - - !IF "$(CFG)" == "osgPlugin tiff - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c - # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 libtiff.lib /nologo /dll /pdb:none /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_tiff.dll" /libpath:"../../../lib" - # SUBTRACT LINK32 /nodefaultlib - - !ELSEIF "$(CFG)" == "osgPlugin tiff - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c - # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 libtiff.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_tiffd.dll" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /pdb:none - - !ENDIF - - # Begin Target - - # Name "osgPlugin tiff - Win32 Release" - # Name "osgPlugin tiff - Win32 Debug" - # Begin Group "Source Files" - - # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\tiff\ReaderWriterTIFF.cpp - # End Source File - # End Group - # Begin Group "Header Files" - - # PROP Default_Filter "h;hpp;hxx;hm;inl" - # End Group - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Target - # End Project - - \ No newline at end of file diff --git a/VisualStudio/osgPlugins/txp/txp.dsp b/VisualStudio/osgPlugins/txp/txp.dsp index 626d8acb8..2a2964bd9 100644 --- a/VisualStudio/osgPlugins/txp/txp.dsp +++ b/VisualStudio/osgPlugins/txp/txp.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="txp" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="osgPlugin txp" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=txp - Win32 Debug +CFG=osgPlugin txp - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=txp - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "txp.mak" CFG="osgPlugin txp - Win32 Debug" +!MESSAGE NMAKE /f "txp.mak" CFG="osgPlugin txp - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE diff --git a/VisualStudio/osgPlugins/zip/zip.dsp b/VisualStudio/osgPlugins/zip/zip.dsp index 146da2f63..21ae2e55f 100644 --- a/VisualStudio/osgPlugins/zip/zip.dsp +++ b/VisualStudio/osgPlugins/zip/zip.dsp @@ -1,219 +1,109 @@ -# Microsoft Developer Studio Project File - Name="zip" - Package Owner=<4> - +# Microsoft Developer Studio Project File - Name="osgPlugin zip" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - - -CFG=zip - Win32 Debug - +CFG=osgPlugin zip - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, - !MESSAGE use the Export Makefile command and run - !MESSAGE - !MESSAGE NMAKE /f "zip.mak". - !MESSAGE - !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - !MESSAGE - -!MESSAGE NMAKE /f "zip.mak" CFG="osgPlugin zip - Win32 Debug" - +!MESSAGE NMAKE /f "zip.mak" CFG="osgPlugin zip - Win32 Release" !MESSAGE - !MESSAGE Possible choices for configuration are: - !MESSAGE - !MESSAGE "osgPlugin zip - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE "osgPlugin zip - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE - - # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe - - !IF "$(CFG)" == "osgPlugin zip - Win32 Release" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c - # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "NDEBUG" - # ADD RSC /l 0x809 /d "NDEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /nologo /dll /pdb:none /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_zip.dll" /libpath:"../../../lib" - # SUBTRACT LINK32 /nodefaultlib - - !ELSEIF "$(CFG)" == "osgPlugin zip - Win32 Debug" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "../../../lib" - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # 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" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c - # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x809 /d "_DEBUG" - # ADD RSC /l 0x809 /d "_DEBUG" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # 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 /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_zipd.dll" /pdbtype:sept /libpath:"../../../lib" - # SUBTRACT LINK32 /nodefaultlib - - !ENDIF - - # Begin Target - - # Name "osgPlugin zip - Win32 Release" - # Name "osgPlugin zip - Win32 Debug" - # Begin Group "Source Files" - - # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - # Begin Source File - - SOURCE=..\..\..\src\osgPlugins\zip\ReaderWriterZIP.cpp - # End Source File - # End Group - # Begin Group "Header Files" - - # PROP Default_Filter "h;hpp;hxx;hm;inl" - # End Group - # Begin Group "Resource Files" - - # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - # End Group - # End Target - # End Project - - \ No newline at end of file diff --git a/VisualStudio/osgText/osgText.dsp b/VisualStudio/osgText/osgText.dsp index 91a2a84ad..e7033d928 100644 --- a/VisualStudio/osgText/osgText.dsp +++ b/VisualStudio/osgText/osgText.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="osgText" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="Core osgText" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=osgText - Win32 Debug +CFG=Core osgText - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=osgText - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "osgText.mak" CFG="Core osgText - Win32 Debug" +!MESSAGE NMAKE /f "osgText.mak" CFG="Core osgText - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -93,6 +93,10 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File +SOURCE=..\..\src\osgText\Font.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\osgText\FTBitmapGlyph.cpp # End Source File # Begin Source File @@ -165,10 +169,6 @@ SOURCE=..\..\src\osgText\FTVectoriser.cpp # End Source File # Begin Source File -SOURCE=..\..\src\osgText\Font.cpp -# End Source File -# Begin Source File - SOURCE=..\..\src\osgText\Paragraph.cpp # End Source File # Begin Source File @@ -189,6 +189,10 @@ SOURCE=..\..\include\osgText\Export # End Source File # Begin Source File +SOURCE=..\..\include\osgText\Font +# End Source File +# Begin Source File + SOURCE=..\..\src\osgText\FTBitmapGlyph.h # End Source File # Begin Source File @@ -265,10 +269,6 @@ SOURCE=..\..\src\osgText\FTVectoriser.h # End Source File # Begin Source File -SOURCE=..\..\include\osgText\Font -# End Source File -# Begin Source File - SOURCE=..\..\include\osgText\Paragraph # End Source File # Begin Source File @@ -286,4 +286,3 @@ SOURCE=..\..\include\osgText\Version # End Group # End Target # End Project - \ No newline at end of file diff --git a/VisualStudio/osgUtil/osgUtil.dsp b/VisualStudio/osgUtil/osgUtil.dsp index e815b3232..3f7f863d4 100755 --- a/VisualStudio/osgUtil/osgUtil.dsp +++ b/VisualStudio/osgUtil/osgUtil.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="osgUtil" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="Core osgUtil" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=osgUtil - Win32 Debug +CFG=Core osgUtil - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=osgUtil - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "osgUtil.mak" CFG="Core osgUtil - Win32 Debug" +!MESSAGE NMAKE /f "osgUtil.mak" CFG="Core osgUtil - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -117,6 +117,10 @@ SOURCE=..\..\src\osgUtil\DisplayListVisitor.cpp # End Source File # Begin Source File +SOURCE=..\..\src\osgUtil\DisplayRequirementsVisitor.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\osgUtil\DriveManipulator.cpp # End Source File # Begin Source File @@ -185,11 +189,11 @@ SOURCE=..\..\src\osgUtil\Tesselator.cpp # End Source File # Begin Source File -SOURCE=..\..\src\osgUtil\TransformCallback.cpp +SOURCE=..\..\src\osgUtil\TrackballManipulator.cpp # End Source File # Begin Source File -SOURCE=..\..\src\osgUtil\TrackballManipulator.cpp +SOURCE=..\..\src\osgUtil\TransformCallback.cpp # End Source File # Begin Source File @@ -199,10 +203,6 @@ SOURCE=..\..\src\osgUtil\TriStripVisitor.cpp SOURCE=..\..\src\osgUtil\Version.cpp # End Source File -# Begin Source File - -SOURCE=..\..\src\osgUtil\DisplayRequirementsVisitor.cpp -# End Source File # End Group # Begin Group "Header Files" @@ -233,6 +233,10 @@ SOURCE=..\..\Include\osgUtil\DisplayListVisitor # End Source File # Begin Source File +SOURCE=..\..\Include\osgUtil\DisplayRequirementsVisitor +# End Source File +# Begin Source File + SOURCE=..\..\include\osgUtil\DriveManipulator # End Source File # Begin Source File @@ -317,11 +321,11 @@ SOURCE=..\..\include\osgUtil\Tesselator # End Source File # Begin Source File -SOURCE=..\..\include\osgUtil\TransformCallback +SOURCE=..\..\include\osgUtil\TrackballManipulator # End Source File # Begin Source File -SOURCE=..\..\include\osgUtil\TrackballManipulator +SOURCE=..\..\include\osgUtil\TransformCallback # End Source File # Begin Source File @@ -331,10 +335,6 @@ SOURCE=..\..\include\osgUtil\TriStripVisitor SOURCE=..\..\Include\osgUtil\Version # End Source File -# Begin Source File - -SOURCE=..\..\Include\osgUtil\DisplayRequirementsVisitor -# End Source File # End Group # Begin Group "Resource Files" @@ -342,4 +342,3 @@ SOURCE=..\..\Include\osgUtil\DisplayRequirementsVisitor # End Group # End Target # End Project - \ No newline at end of file diff --git a/include/osg/GeoSet b/include/osg/GeoSet index c37ca28a3..abd45b3ff 100644 --- a/include/osg/GeoSet +++ b/include/osg/GeoSet @@ -5,10 +5,10 @@ #ifndef OSG_GEOSET #define OSG_GEOSET 1 +#include #include #include #include -#include namespace osg { diff --git a/include/osgText/Text b/include/osgText/Text index fe05def60..51948934f 100644 --- a/include/osgText/Text +++ b/include/osgText/Text @@ -20,17 +20,15 @@ #ifndef OSGTEXT_TEXT #define OSGTEXT_TEXT 1 -#include - -#include #include +#include #include #include -// http://homepages.paradise.net.nz/henryj/code/ - #include +#include + namespace osgText { class OSGTEXT_EXPORT Text : public osg::Drawable diff --git a/src/osgPlugins/dx/AreaGeoSetTriangulator.cpp b/src/osgPlugins/dx/AreaGeoSetTriangulator.cpp index bcda7a710..49f51ed48 100644 --- a/src/osgPlugins/dx/AreaGeoSetTriangulator.cpp +++ b/src/osgPlugins/dx/AreaGeoSetTriangulator.cpp @@ -1,6 +1,8 @@ +#include + #include #include -#include + #include "AreaGeoSetTriangulator.h" namespace dx { diff --git a/src/osgPlugins/dx/DXWriter.cpp b/src/osgPlugins/dx/DXWriter.cpp index 6fdadc68d..ad71eeabe 100644 --- a/src/osgPlugins/dx/DXWriter.cpp +++ b/src/osgPlugins/dx/DXWriter.cpp @@ -94,17 +94,6 @@ // // DXWriter.h -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -120,6 +109,20 @@ #include #include #include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + #include "DXWriter.h" #include "AreaGeoSetTriangulator.h" #include "StateSetStr.h" diff --git a/src/osgPlugins/flt/FltFile.h b/src/osgPlugins/flt/FltFile.h index da4a73a62..19b0fd14c 100644 --- a/src/osgPlugins/flt/FltFile.h +++ b/src/osgPlugins/flt/FltFile.h @@ -3,12 +3,11 @@ #ifndef __FLT_FILE_H #define __FLT_FILE_H +#include #include #include -#include - #include "Pool.h" #include "HeaderRecord.h" diff --git a/src/osgPlugins/flt/flt.h b/src/osgPlugins/flt/flt.h index 4650d64bd..36a4084ea 100644 --- a/src/osgPlugins/flt/flt.h +++ b/src/osgPlugins/flt/flt.h @@ -2,6 +2,10 @@ #ifndef __FLT_H #define __FLT_H +// include osg/Export simply for the Win32 #pragma to stop VisualStudio barffing +// nonesense, other than that there is no need for it... +#include + #include #include diff --git a/src/osgPlugins/txp/TrPageArchive.h b/src/osgPlugins/txp/TrPageArchive.h index aa82cb196..8f3d0b0ca 100644 --- a/src/osgPlugins/txp/TrPageArchive.h +++ b/src/osgPlugins/txp/TrPageArchive.h @@ -24,14 +24,17 @@ #define _TRPAGEARCHIVE_H_ + +#include "trpage_sys.h" +#include "trpage_read.h" + +#include "TrPageParser.h" + +#include + #include #include #include // for auto_ptr -#include "trpage_sys.h" -#include "trpage_read.h" -#include - -#include "TrPageParser.h" namespace txp {