diff --git a/Make/makedirdefs b/Make/makedirdefs index f0c7e5457..e97ef82c9 100644 --- a/Make/makedirdefs +++ b/Make/makedirdefs @@ -23,6 +23,8 @@ SRC_DIRS = \ PLUGIN_DIRS = \ osg\ + osgParticle\ + osgText\ rgb\ lib3ds\ flt\ diff --git a/VisualStudio/VisualStudio.dsw b/VisualStudio/VisualStudio.dsw index d76e3ad89..be31f3873 100644 --- a/VisualStudio/VisualStudio.dsw +++ b/VisualStudio/VisualStudio.dsw @@ -1,2342 +1,1214 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - ############################################################################### - - Project: "Core osg"=.\osg\osg.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - }}} - - ############################################################################### - - Project: "Core osgDB"=.\osgDB\osgDB.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - }}} - - ############################################################################### - - Project: "Core osgGA"=.\osgGA\osgGA.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Core osgGLUT"=.\osgGLUT\osgGLUT.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - }}} - - ############################################################################### - - Project: "Core osgText"=.\osgText\osgText.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - }}} - - ############################################################################### - - Project: "Core osgParticle"=.\osgParticle\osgParticle.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - }}} - - ############################################################################### - - Project: "Core osgUtil"=.\osgUtil\osgUtil.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osghangglide"=.\Demos\osghangglide\osghangglide.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osgbillboard"=.\Demos\osgbillboard\osgbillboard.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osgcallback"=.\Demos\osgcallback\osgcallback.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osgclip"=.\Demos\osgclip\osgclip.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osgcluster"=.\Demos\osgcluster\osgcluster.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osgconv"=.\Demos\osgconv\osgconv.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osgcopy"=.\Demos\osgcopy\osgcopy.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osgcube"=.\Demos\osgcube\osgcube.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osggeometry"=.\Demos\osggeometry\osggeometry.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osghud"=.\Demos\osghud\osghud.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgText - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osgimpostor"=.\Demos\osgimpostor\osgimpostor.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osgmultitexture"=.\Demos\osgmultitexture\osgmultitexture.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osgoccluder"=.\Demos\osgoccluder\osgoccluder.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osgprerender"=.\Demos\osgprerender\osgprerender.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osgreflect"=.\Demos\osgreflect\osgreflect.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osgscribe"=.\Demos\osgscribe\osgscribe.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osgsequence"=.\Demos\osgsequence\osgsequence.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osgstereoimage"=.\Demos\osgstereoimage\osgstereoimage.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osgtext"=.\Demos\osgtext\osgtextdemo.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgText - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osgtexture"=.\Demos\osgtexture\osgtexture.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osgversion"=.\Demos\osgversion\osgversion.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osglight"=.\Demos\osglight\osglight.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osgviews"=.\Demos\osgviews\osgviews.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo sgv"=.\Demos\sgv\sgv.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "Demo osgparticle"=.\Demos\osgparticle\osgparticledemo.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgParticle - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "osgPlugin 3ds"=.\osgPlugins\lib3ds\lib3ds.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - }}} - - ############################################################################### - - Project: "osgPlugin bmp"=.\osgPlugins\bmp\bmp.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - }}} - - ############################################################################### - - Project: "osgPlugin dw"=.\osgPlugins\dw\dw.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - }}} - - ############################################################################### - - Project: "osgPlugin dx"=.\osgPlugins\dx\dx.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - }}} - - ############################################################################### - - Project: "osgPlugin flt"=.\osgPlugins\flt\flt.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "osgPlugin iv"=.\osgPlugins\iv\iv.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "osgPlugin gif"=.\osgPlugins\gif\gif.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - }}} - - ############################################################################### - - Project: "osgPlugin jpeg"=.\osgPlugins\jpeg\jpeg.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - }}} - - ############################################################################### - - Project: "osgPlugin lwo"=.\osgPlugins\lwo\lwo.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - }}} - - ############################################################################### - - Project: "osgPlugin obj"=.\osgPlugins\obj\obj.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - }}} - - ############################################################################### - - Project: "osgPlugin osg"=.\osgPlugins\osg\dot_osg.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - }}} - - ############################################################################### +Project: "osgPlugin osgParticle"=.\osgPlugins\osgParticle\dot_osgParticle.dsp - Package Owner=<4> +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core osg + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgDB + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgParticle + End Project Dependency +}}} + +############################################################################### + +Project: "osgPlugin osgText"=.\osgPlugins\osgText\dot_osgText.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core osg + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgDB + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgText + End Project Dependency +}}} + +############################################################################### Project: "osgPlugin osgtgz"=.\osgPlugins\osgtgz\osgtgz.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - }}} - - ############################################################################### - - Project: "osgPlugin pic"=.\osgPlugins\pic\pic.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - }}} - - ############################################################################### - - Project: "osgPlugin png"=.\osgPlugins\png\png.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - }}} - - ############################################################################### - - Project: "osgPlugin rgb"=.\osgPlugins\rgb\rgb.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - }}} - - ############################################################################### - - Project: "osgPlugin tga"=.\osgPlugins\tga\tga.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - }}} - - ############################################################################### - - Project: "osgPlugin tgz"=.\osgPlugins\tgz\tgz.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - }}} - - ############################################################################### - - Project: "osgPlugin tiff"=.\osgPlugins\tiff\tiff.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - }}} - - ############################################################################### - - Project: "osgPlugin txp"=.\osgPlugins\txp\txp.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - }}} - - ############################################################################### - - Project: "osgPlugin zip"=.\osgPlugins\zip\zip.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - }}} - - ############################################################################### - - Global: - - Package=<5> - {{{ - }}} - - Package=<3> - {{{ - }}} - - ############################################################################### - - diff --git a/VisualStudio/osgParticle/osgParticle.dsp b/VisualStudio/osgParticle/osgParticle.dsp index 3f3b74511..55700269f 100644 --- a/VisualStudio/osgParticle/osgParticle.dsp +++ b/VisualStudio/osgParticle/osgParticle.dsp @@ -1,680 +1,260 @@ # 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 "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 "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 "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 "_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 - diff --git a/VisualStudio/osgPlugins/osgParticle/dot_osgParticle.dsp b/VisualStudio/osgPlugins/osgParticle/dot_osgParticle.dsp new file mode 100644 index 000000000..040184310 --- /dev/null +++ b/VisualStudio/osgPlugins/osgParticle/dot_osgParticle.dsp @@ -0,0 +1,265 @@ +# 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=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 +!MESSAGE NMAKE /f "dot_osg.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 "dot_osg.mak" CFG="osgPlugin osg - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "osgPlugin osg - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "osgPlugin osg - 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 osg - 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_osg.dll" /libpath:"../../../lib" +# SUBTRACT LINK32 /nodefaultlib + +!ELSEIF "$(CFG)" == "osgPlugin osg - 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 "_WINDOWS" /D "_MBCS" /D "_USRDLL" /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 /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_osgd.dll" /pdbtype:sept /libpath:"../../../lib" +# SUBTRACT LINK32 /pdb:none /nodefaultlib + +!ENDIF + +# Begin Target + +# Name "osgPlugin osg - Win32 Release" +# Name "osgPlugin osg - 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\osgParticle\IO_AccelOperator.cpp + +# End Source File + +# Begin Source File + + + +SOURCE=..\..\src\osgPlugins\osgParticle\IO_CenteredPlacer.cpp + +# End Source File + +# Begin Source File + + + +SOURCE=..\..\src\osgPlugins\osgParticle\IO_Emitter.cpp + +# End Source File + +# Begin Source File + + + +SOURCE=..\..\src\osgPlugins\osgParticle\IO_FluidFrictionOperator.cpp + +# End Source File + +# Begin Source File + + + +SOURCE=..\..\src\osgPlugins\osgParticle\IO_ForceOperator.cpp + +# End Source File + +# Begin Source File + + + +SOURCE=..\..\src\osgPlugins\osgParticle\IO_LinearInterpolator.cpp + +# End Source File + +# Begin Source File + + + +SOURCE=..\..\src\osgPlugins\osgParticle\IO_ModularEmitter.cpp + +# End Source File + +# Begin Source File + + + +SOURCE=..\..\src\osgPlugins\osgParticle\IO_ModularProgram.cpp + +# End Source File + +# Begin Source File + + + +SOURCE=..\..\src\osgPlugins\osgParticle\IO_MultiSegmentPlacer.cpp + +# End Source File + +# Begin Source File + + + +SOURCE=..\..\src\osgPlugins\osgParticle\IO_Particle.cpp + +# End Source File + +# Begin Source File + + + +SOURCE=..\..\src\osgPlugins\osgParticle\IO_ParticleProcessor.cpp + +# End Source File + +# Begin Source File + + + +SOURCE=..\..\src\osgPlugins\osgParticle\IO_ParticleSystem.cpp + +# End Source File + +# Begin Source File + + + +SOURCE=..\..\src\osgPlugins\osgParticle\IO_ParticleSystemUpdater.cpp + +# End Source File + +# Begin Source File + + + +SOURCE=..\..\src\osgPlugins\osgParticle\IO_PointPlacer.cpp + +# End Source File + +# Begin Source File + + + +SOURCE=..\..\src\osgPlugins\osgParticle\IO_Program.cpp + +# End Source File + +# Begin Source File + + + +SOURCE=..\..\src\osgPlugins\osgParticle\IO_RadialShooter.cpp + +# End Source File + +# Begin Source File + + + +SOURCE=..\..\src\osgPlugins\osgParticle\IO_RandomRateCounter.cpp + +# End Source File + +# Begin Source File + + + +SOURCE=..\..\src\osgPlugins\osgParticle\IO_SectorPlacer.cpp + +# End Source File + +# Begin Source File + + + +SOURCE=..\..\src\osgPlugins\osgParticle\IO_SegmentPlacer.cpp + +# End Source File + +# Begin Source File + + + +SOURCE=..\..\src\osgPlugins\osgParticle\IO_VariableRateCounter.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 diff --git a/VisualStudio/osgPlugins/osgText/dot_osgText.dsp b/VisualStudio/osgPlugins/osgText/dot_osgText.dsp new file mode 100644 index 000000000..cf2777569 --- /dev/null +++ b/VisualStudio/osgPlugins/osgText/dot_osgText.dsp @@ -0,0 +1,117 @@ +# 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=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 +!MESSAGE NMAKE /f "dot_osg.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 "dot_osg.mak" CFG="osgPlugin osg - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "osgPlugin osg - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "osgPlugin osg - 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 osg - 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_osg.dll" /libpath:"../../../lib" +# SUBTRACT LINK32 /nodefaultlib + +!ELSEIF "$(CFG)" == "osgPlugin osg - 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 "_WINDOWS" /D "_MBCS" /D "_USRDLL" /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 /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgdb_osgd.dll" /pdbtype:sept /libpath:"../../../lib" +# SUBTRACT LINK32 /pdb:none /nodefaultlib + +!ENDIF + +# Begin Target + +# Name "osgPlugin osg - Win32 Release" +# Name "osgPlugin osg - 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\osgText\IO_Font.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgPlugins\osgText\IO_Paragraph.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osgPlugins\osgText\IO_Text.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 diff --git a/VisualStudio/osgText/osgText.dsp b/VisualStudio/osgText/osgText.dsp index ba7851ceb..48374fda9 100644 --- a/VisualStudio/osgText/osgText.dsp +++ b/VisualStudio/osgText/osgText.dsp @@ -169,18 +169,6 @@ SOURCE=..\..\src\osgText\FTVectoriser.cpp # End Source File # Begin Source File -SOURCE=..\..\src\osgText\IO_Font.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\osgText\IO_Paragraph.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\osgText\IO_Text.cpp -# End Source File -# Begin Source File - SOURCE=..\..\src\osgText\Paragraph.cpp # End Source File # Begin Source File diff --git a/src/osgDB/Registry.cpp b/src/osgDB/Registry.cpp index 5b7b152c9..c4fe5d54a 100644 --- a/src/osgDB/Registry.cpp +++ b/src/osgDB/Registry.cpp @@ -810,7 +810,19 @@ bool Registry::writeObject(const osg::Object& obj,Output& fw) std::string classname = obj.className(); DotOsgWrapperMap::iterator itr = _classNameWrapperMap.find(classname); - if (itr!=_classNameWrapperMap.end()) + + + if (itr==_classNameWrapperMap.end()) + { + // first try the standard nodekit library. + std::string nodeKitLibraryName = createLibraryNameForNodeKit(obj.libraryName()); + if (loadLibrary(nodeKitLibraryName)) return writeObject(obj,fw); + + // otherwise try the osgdb_ plugin library. + std::string pluginLibraryName = createLibraryNameForExt(obj.libraryName()); + if (loadLibrary(pluginLibraryName)) return writeObject(obj,fw); + } + else { @@ -862,7 +874,7 @@ bool Registry::writeObject(const osg::Object& obj,Output& fw) return true; } - + return false; } diff --git a/src/osgParticle/Makefile b/src/osgParticle/Makefile index fb1fb13eb..754035595 100644 --- a/src/osgParticle/Makefile +++ b/src/osgParticle/Makefile @@ -2,38 +2,17 @@ TOPDIR = ../.. include $(TOPDIR)/Make/makedefs CXXFILES =\ - Emitter.cpp\ - FluidFrictionOperator.cpp\ - IO_AccelOperator.cpp\ - IO_CenteredPlacer.cpp\ - IO_Emitter.cpp\ - IO_FluidFrictionOperator.cpp\ - IO_ForceOperator.cpp\ - IO_LinearInterpolator.cpp\ - IO_ModularEmitter.cpp\ - IO_ModularProgram.cpp\ - IO_MultiSegmentPlacer.cpp\ - IO_Particle.cpp\ - IO_ParticleProcessor.cpp\ - IO_ParticleSystem.cpp\ - IO_ParticleSystemUpdater.cpp\ - IO_PointPlacer.cpp\ - IO_Program.cpp\ - IO_RadialShooter.cpp\ - IO_RandomRateCounter.cpp\ - IO_SectorPlacer.cpp\ - IO_SegmentPlacer.cpp\ - IO_VariableRateCounter.cpp\ - ModularEmitter.cpp\ - ModularProgram.cpp\ - MultiSegmentPlacer.cpp\ - Particle.cpp\ - ParticleProcessor.cpp\ - ParticleSystem.cpp\ - ParticleSystemUpdater.cpp\ - Program.cpp\ - Version.cpp\ - + Emitter.cpp\ + FluidFrictionOperator.cpp\ + ModularEmitter.cpp\ + ModularProgram.cpp\ + MultiSegmentPlacer.cpp\ + Particle.cpp\ + ParticleProcessor.cpp\ + ParticleSystem.cpp\ + ParticleSystemUpdater.cpp\ + Program.cpp\ + Version.cpp\ LIBS += -losg -losgDB -losgUtil $(GL_LIBS) $(OTHER_LIBS) $(DYNAMICLIBRARYLIB) diff --git a/src/osgParticle/IO_AccelOperator.cpp b/src/osgPlugins/osgParticle/IO_AccelOperator.cpp similarity index 100% rename from src/osgParticle/IO_AccelOperator.cpp rename to src/osgPlugins/osgParticle/IO_AccelOperator.cpp diff --git a/src/osgParticle/IO_CenteredPlacer.cpp b/src/osgPlugins/osgParticle/IO_CenteredPlacer.cpp similarity index 100% rename from src/osgParticle/IO_CenteredPlacer.cpp rename to src/osgPlugins/osgParticle/IO_CenteredPlacer.cpp diff --git a/src/osgParticle/IO_Emitter.cpp b/src/osgPlugins/osgParticle/IO_Emitter.cpp similarity index 100% rename from src/osgParticle/IO_Emitter.cpp rename to src/osgPlugins/osgParticle/IO_Emitter.cpp diff --git a/src/osgParticle/IO_FluidFrictionOperator.cpp b/src/osgPlugins/osgParticle/IO_FluidFrictionOperator.cpp similarity index 100% rename from src/osgParticle/IO_FluidFrictionOperator.cpp rename to src/osgPlugins/osgParticle/IO_FluidFrictionOperator.cpp diff --git a/src/osgParticle/IO_ForceOperator.cpp b/src/osgPlugins/osgParticle/IO_ForceOperator.cpp similarity index 100% rename from src/osgParticle/IO_ForceOperator.cpp rename to src/osgPlugins/osgParticle/IO_ForceOperator.cpp diff --git a/src/osgParticle/IO_LinearInterpolator.cpp b/src/osgPlugins/osgParticle/IO_LinearInterpolator.cpp similarity index 100% rename from src/osgParticle/IO_LinearInterpolator.cpp rename to src/osgPlugins/osgParticle/IO_LinearInterpolator.cpp diff --git a/src/osgParticle/IO_ModularEmitter.cpp b/src/osgPlugins/osgParticle/IO_ModularEmitter.cpp similarity index 100% rename from src/osgParticle/IO_ModularEmitter.cpp rename to src/osgPlugins/osgParticle/IO_ModularEmitter.cpp diff --git a/src/osgParticle/IO_ModularProgram.cpp b/src/osgPlugins/osgParticle/IO_ModularProgram.cpp similarity index 100% rename from src/osgParticle/IO_ModularProgram.cpp rename to src/osgPlugins/osgParticle/IO_ModularProgram.cpp diff --git a/src/osgParticle/IO_MultiSegmentPlacer.cpp b/src/osgPlugins/osgParticle/IO_MultiSegmentPlacer.cpp similarity index 100% rename from src/osgParticle/IO_MultiSegmentPlacer.cpp rename to src/osgPlugins/osgParticle/IO_MultiSegmentPlacer.cpp diff --git a/src/osgParticle/IO_Particle.cpp b/src/osgPlugins/osgParticle/IO_Particle.cpp similarity index 100% rename from src/osgParticle/IO_Particle.cpp rename to src/osgPlugins/osgParticle/IO_Particle.cpp diff --git a/src/osgParticle/IO_ParticleProcessor.cpp b/src/osgPlugins/osgParticle/IO_ParticleProcessor.cpp similarity index 100% rename from src/osgParticle/IO_ParticleProcessor.cpp rename to src/osgPlugins/osgParticle/IO_ParticleProcessor.cpp diff --git a/src/osgParticle/IO_ParticleSystem.cpp b/src/osgPlugins/osgParticle/IO_ParticleSystem.cpp similarity index 100% rename from src/osgParticle/IO_ParticleSystem.cpp rename to src/osgPlugins/osgParticle/IO_ParticleSystem.cpp diff --git a/src/osgParticle/IO_ParticleSystemUpdater.cpp b/src/osgPlugins/osgParticle/IO_ParticleSystemUpdater.cpp similarity index 100% rename from src/osgParticle/IO_ParticleSystemUpdater.cpp rename to src/osgPlugins/osgParticle/IO_ParticleSystemUpdater.cpp diff --git a/src/osgParticle/IO_PointPlacer.cpp b/src/osgPlugins/osgParticle/IO_PointPlacer.cpp similarity index 100% rename from src/osgParticle/IO_PointPlacer.cpp rename to src/osgPlugins/osgParticle/IO_PointPlacer.cpp diff --git a/src/osgParticle/IO_Program.cpp b/src/osgPlugins/osgParticle/IO_Program.cpp similarity index 100% rename from src/osgParticle/IO_Program.cpp rename to src/osgPlugins/osgParticle/IO_Program.cpp diff --git a/src/osgParticle/IO_RadialShooter.cpp b/src/osgPlugins/osgParticle/IO_RadialShooter.cpp similarity index 100% rename from src/osgParticle/IO_RadialShooter.cpp rename to src/osgPlugins/osgParticle/IO_RadialShooter.cpp diff --git a/src/osgParticle/IO_RandomRateCounter.cpp b/src/osgPlugins/osgParticle/IO_RandomRateCounter.cpp similarity index 100% rename from src/osgParticle/IO_RandomRateCounter.cpp rename to src/osgPlugins/osgParticle/IO_RandomRateCounter.cpp diff --git a/src/osgParticle/IO_SectorPlacer.cpp b/src/osgPlugins/osgParticle/IO_SectorPlacer.cpp similarity index 100% rename from src/osgParticle/IO_SectorPlacer.cpp rename to src/osgPlugins/osgParticle/IO_SectorPlacer.cpp diff --git a/src/osgParticle/IO_SegmentPlacer.cpp b/src/osgPlugins/osgParticle/IO_SegmentPlacer.cpp similarity index 100% rename from src/osgParticle/IO_SegmentPlacer.cpp rename to src/osgPlugins/osgParticle/IO_SegmentPlacer.cpp diff --git a/src/osgParticle/IO_VariableRateCounter.cpp b/src/osgPlugins/osgParticle/IO_VariableRateCounter.cpp similarity index 100% rename from src/osgParticle/IO_VariableRateCounter.cpp rename to src/osgPlugins/osgParticle/IO_VariableRateCounter.cpp diff --git a/src/osgPlugins/osgParticle/Makefile b/src/osgPlugins/osgParticle/Makefile new file mode 100644 index 000000000..d8a953ca2 --- /dev/null +++ b/src/osgPlugins/osgParticle/Makefile @@ -0,0 +1,33 @@ +TOPDIR = ../../.. +include $(TOPDIR)/Make/makedefs + +CXXFILES =\ + IO_AccelOperator.cpp\ + IO_CenteredPlacer.cpp\ + IO_Emitter.cpp\ + IO_FluidFrictionOperator.cpp\ + IO_ForceOperator.cpp\ + IO_LinearInterpolator.cpp\ + IO_ModularEmitter.cpp\ + IO_ModularProgram.cpp\ + IO_MultiSegmentPlacer.cpp\ + IO_Particle.cpp\ + IO_ParticleProcessor.cpp\ + IO_ParticleSystem.cpp\ + IO_ParticleSystemUpdater.cpp\ + IO_PointPlacer.cpp\ + IO_Program.cpp\ + IO_RadialShooter.cpp\ + IO_RandomRateCounter.cpp\ + IO_SectorPlacer.cpp\ + IO_SegmentPlacer.cpp\ + IO_VariableRateCounter.cpp\ + + +LIBS += -losgParticle $(OSG_LIBS) $(OTHER_LIBS) + +TARGET_BASENAME = osgParticle +include $(TOPDIR)/Make/cygwin_plugin_def +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) + +include $(TOPDIR)/Make/makerules diff --git a/src/osgText/IO_Font.cpp b/src/osgPlugins/osgText/IO_Font.cpp similarity index 100% rename from src/osgText/IO_Font.cpp rename to src/osgPlugins/osgText/IO_Font.cpp diff --git a/src/osgText/IO_Paragraph.cpp b/src/osgPlugins/osgText/IO_Paragraph.cpp similarity index 100% rename from src/osgText/IO_Paragraph.cpp rename to src/osgPlugins/osgText/IO_Paragraph.cpp diff --git a/src/osgText/IO_Text.cpp b/src/osgPlugins/osgText/IO_Text.cpp similarity index 100% rename from src/osgText/IO_Text.cpp rename to src/osgPlugins/osgText/IO_Text.cpp diff --git a/src/osgPlugins/osgText/Makefile b/src/osgPlugins/osgText/Makefile new file mode 100644 index 000000000..a0015f530 --- /dev/null +++ b/src/osgPlugins/osgText/Makefile @@ -0,0 +1,16 @@ +TOPDIR = ../../.. +include $(TOPDIR)/Make/makedefs + +CXXFILES =\ + IO_Text.cpp \ + IO_Font.cpp \ + IO_Paragraph.cpp \ + + +LIBS += -losgText $(OSG_LIBS) $(OTHER_LIBS) + +TARGET_BASENAME = osgText +include $(TOPDIR)/Make/cygwin_plugin_def +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) + +include $(TOPDIR)/Make/makerules diff --git a/src/osgText/Makefile b/src/osgText/Makefile index b2d9ccbd0..3af6093ac 100644 --- a/src/osgText/Makefile +++ b/src/osgText/Makefile @@ -23,9 +23,6 @@ CXXFILES =\ Font.cpp \ Paragraph.cpp \ Text.cpp \ - IO_Text.cpp \ - IO_Font.cpp \ - IO_Paragraph.cpp \ Version.cpp