diff --git a/VisualStudio/Demos/osgparticle/osgparticle.dsp b/VisualStudio/Demos/osgparticle/osgparticle.dsp index 900a2b6df..b5bf5feaa 100644 --- a/VisualStudio/Demos/osgparticle/osgparticle.dsp +++ b/VisualStudio/Demos/osgparticle/osgparticle.dsp @@ -1,95 +1,190 @@ # Microsoft Developer Studio Project File - Name="Demo osgparticle" - Package Owner=<4> + # Microsoft Developer Studio Generated Build File, Format Version 6.00 + # ** DO NOT EDIT ** + + # TARGTYPE "Win32 (x86) Console Application" 0x0103 + + CFG=Demo osgparticle - 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 "osgparticle.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 "osgparticle.mak" CFG="Demo osgparticle - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Demo osgparticle - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "Demo osgparticle - Win32 Debug" (based on "Win32 (x86) Console Application") + !MESSAGE +!MESSAGE NMAKE /f "osgparticle.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 "osgparticle.mak" CFG="Demo osgparticle - Win32 Release" + +!MESSAGE + +!MESSAGE Possible choices for configuration are: + +!MESSAGE + +!MESSAGE "Demo osgparticle - Win32 Release" (based on "Win32 (x86) Console Application") + +!MESSAGE "Demo osgparticle - 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 osgparticle - 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/osgparticle.exe" /libpath:"../../../lib" + + !ELSEIF "$(CFG)" == "Demo osgparticle - 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 "FL_DLL" /D "WIN32" /D "_DEBUG" /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/osgparticled.exe" /pdbtype:sept /libpath:"../../../lib" + # SUBTRACT LINK32 /incremental:no + + !ENDIF + + # Begin Target + + # Name "Demo osgparticle - Win32 Release" + # Name "Demo osgparticle - Win32 Debug" + # Begin Source File + + SOURCE=..\..\..\src\Demos\osgparticle\osgparticle.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 + diff --git a/VisualStudio/VisualStudio.dsw b/VisualStudio/VisualStudio.dsw index 38bd25249..097a80ba6 100644 --- a/VisualStudio/VisualStudio.dsw +++ b/VisualStudio/VisualStudio.dsw @@ -1142,7 +1142,7 @@ Package=<4> -Project: "Demo sgv"=.\Demos\sgv\sgv.dsp - Package Owner=<4> +Project: "Demo osgparticle"=.\Demos\osgparticle\osgparticle.dsp - Package Owner=<4> diff --git a/VisualStudio/osgParticle/osgParticle.dsp b/VisualStudio/osgParticle/osgParticle.dsp index 5d6338867..7a64770fc 100644 --- a/VisualStudio/osgParticle/osgParticle.dsp +++ b/VisualStudio/osgParticle/osgParticle.dsp @@ -1,680 +1,1020 @@ # Microsoft Developer Studio Project File - Name="Core osgParticle" - Package Owner=<4> + # Microsoft Developer Studio Generated Build File, Format Version 6.00 + # ** DO NOT EDIT ** + + # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + + CFG=Core osgParticle - 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 "osgParticle.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 "osgParticle.mak" CFG="Core osgParticle - Win32 Release" + !MESSAGE + !MESSAGE Possible choices for configuration are: + !MESSAGE + !MESSAGE "Core osgParticle - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") + !MESSAGE "Core osgParticle - 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 osgParticle - 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 "FTGL_LIBRARY_STATIC" /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 "osgParticle_LIBRARY" /D "FTGL_LIBRARY_STATIC" /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 glu32.lib opengl32.lib /nologo /dll /pdb:none /machine:I386 /out:"../../bin/osgParticle.dll" /libpath:"../../lib" + + !ELSEIF "$(CFG)" == "Core osgParticle - 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 "FTGL_LIBRARY_STATIC" /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 "osgParticle_LIBRARY" /D "FTGL_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /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 opengl32.lib /nologo /dll /debug /machine:I386 /out:"../../bin/osgParticled.dll" /pdbtype:sept /libpath:"../../lib" + # SUBTRACT LINK32 /pdb:none + + !ENDIF + + # Begin Target + + # Name "Core osgParticle - Win32 Release" + # Name "Core osgParticle - Win32 Debug" + # Begin Group "Source Files" + + # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + # Begin Source File + + SOURCE=..\..\src\osgParticle\Emitter.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\FluidFrictionOperator.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\IO_AccelOperator.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\IO_CenteredPlacer.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\IO_Emitter.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\IO_FluidFrictionOperator.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\IO_ForceOperator.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\IO_LinearInterpolator.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\IO_ModularEmitter.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\IO_ModularProgram.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\IO_MultiSegmentPlacer.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\IO_Particle.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\IO_ParticleProcessor.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\IO_ParticleSystem.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\IO_ParticleSystemUpdater.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\IO_PointPlacer.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\IO_Program.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\IO_RadialShooter.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\IO_RandomRateCounter.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\IO_SectorPlacer.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\IO_SegmentPlacer.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\IO_VariableRateCounter.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\ModularEmitter.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\ModularProgram.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\MultiSegmentPlacer.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\Particle.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\ParticleProcessor.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\ParticleSystem.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\ParticleSystemUpdater.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\Program.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\src\osgParticle\Version.cpp + # End Source File + # End Group + # Begin Group "Header Files" + + # PROP Default_Filter ";h;hpp;hxx;hm;inl" + # Begin Source File + + SOURCE=..\..\include\osgParticle\AccelOperator + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\CenteredPlacer + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\Counter + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\Emitter + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\Export + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\FluidFrictionOperator + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\ForceOperator + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\Interpolator + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\LinearInterpolator + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\ModularEmitter + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\ModularProgram + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\MultiSegmentPlacer + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\Operator + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\Particle + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\ParticleProcessor + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\ParticleSystem + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\ParticleSystemUpdater + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\Placer + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\PointPlacer + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\Program + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\RadialShooter + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\RandomRateCounter + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\SectorPlacer + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\SegmentPlacer + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\Shooter + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\VariableRateCounter + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\Version + # End Source File + # Begin Source File + + SOURCE=..\..\include\osgParticle\range + # 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 +