diff --git a/Make/dependencies b/Make/dependencies index 27f44edd3..4426485ac 100644 --- a/Make/dependencies +++ b/Make/dependencies @@ -4,9 +4,6 @@ # should we compile osgIntrospection? COMPILE_INTROSPECTION ?= no -# should we compile osgProducer and the associated applications? -PRODUCER_INSTALLED ?= yes - # should we compile any of the examples? COMPILE_EXAMPLES ?= no diff --git a/Make/makedefs b/Make/makedefs index 207fb29b0..daefa8140 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -123,14 +123,6 @@ ifneq ("$(OPENTHREADS_LIB_DIR)","") LDFLAGS += -L$(OPENTHREADS_LIB_DIR) endif -ifneq ("$(PRODUCER_INC_DIR)","") -INC += -I$(PRODUCER_INC_DIR) -endif - -ifneq ("$(PRODUCER_LIB_DIR)","") -LDFLAGS += -L$(PRODUCER_LIB_DIR) -endif - RECURSIVE_TARGETS = \ opt \ diff --git a/Make/makedirdefs b/Make/makedirdefs index b788109dc..6118e19a3 100644 --- a/Make/makedirdefs +++ b/Make/makedirdefs @@ -25,10 +25,6 @@ SRC_DIRS = \ osgSim \ osgManipulator -ifeq ($(PRODUCER_INSTALLED),yes) -SRC_DIRS += osgProducer -endif - ifeq ($(GDAL_INSTALLED),yes) SRC_DIRS += osgTerrain endif @@ -57,10 +53,6 @@ WRAPPER_DIRS = \ osgViewer \ -ifeq ($(PRODUCER_INSTALLED),yes) - WRAPPER_DIRS += osgProducer -endif - ifeq ($(GDAL_INSTALLED),yes) WRAPPER_DIRS += osgTerrain endif @@ -198,12 +190,6 @@ ifeq ($(GDAL_INSTALLED),yes) APPLICATION_DIRS += osgdem endif -ifeq ($(PRODUCER_INSTALLED),yes) - - APPLICATION_DIRS += osgproducerviewer - -endif - EXAMPLE_DIRS = \ osganimate \ osgautotransform \ diff --git a/VisualStudio/MUST_READ_ME.txt b/VisualStudio/MUST_READ_ME.txt index 19c74535b..ef51450d3 100644 --- a/VisualStudio/MUST_READ_ME.txt +++ b/VisualStudio/MUST_READ_ME.txt @@ -25,8 +25,7 @@ You will also need to run the fixup-vc6-dsps.pl script to clean up the project files that won't otherwise compile to do new elements required for support of Window 64 bit build under VS 7.x and 8.x. -Several of the plugins and demoes, and two of the core libraries - osgTerrain -and osgProducer require external dependancies. Full details on where to obtain +Several of the plugins and examples require external dependancies. Full details on where to obtain these can be found in doc/dependancies.html. @@ -65,9 +64,9 @@ To create a program based on an example, probably the easiest way is to do this: Building 64 bit binaries -64 bit OpenSceneGraph, Producer, and OpenThreads binaries can be built in Visual Studio 8, but several extra steps are required due to limits of the Visual Studio 6 project files: +64 bit OpenSceneGraph and OpenThreads binaries can be built in Visual Studio 8, but several extra steps are required due to limits of the Visual Studio 6 project files: -1. For each of the OpenSceneGraph, and OpenThreads .dsw files, and the Producer .sln files: +1. For each of the OpenSceneGraph, and OpenThreads .dsw files, : a. Open the .dsw or .sln file and convert all projects to VS 8 format. b. Open the Configuration Manager window under the Build menu, bring up the New Solution Platform window by selecting in the Active solution platform drop-down menu. Select x64 as the new platform and copy settings from Win32 (you need to have the x64 compiler installed to see the x64 platform option). Ensure the Create new project platforms checkbox is selected. Click OK, then close the Configuration Manager window. c. Do a "Save All" to save the project files. @@ -83,14 +82,12 @@ Building 64 bit binaries IF PERL _IS NOT_ INSTALLED, do the following to accomplish the same thing manually: a. In the OpenThreads solution, open the properties window for the OpenThreads project. i. Select multiple configurations, Debug and Release. Under the General page, overwrite the Output Directory path of the x64 platform with the corresponding Win32 path. For static builds, do the same thing for the Debug Static and Release Static configurations. - b. Open the Producer project properties in the Producer solution. - i. Repeat step 2.a.i. - c. In the OpenSceneGraph solution: + b. In the OpenSceneGraph solution: i. Select all the "Application" and "Example" projects in the Solution Explorer window and repeat step 2.a.i. Note there are no static configurations. ii. Select all the "Core" projects _except "Core osgIntrospection"_ and repeat step 2.a.i. iii. Select "Core osgIntrospection" and repeat step 2.a.i. Note there are no static configurations. iv. Select all the "osgPlugin" projects and repeat step 2.a.i. v. Select all the "osgWrapper" projects and repeat step 2.a.i. Note there are no static configurations. - d. Do a "Save All" to save the project files. + c. Do a "Save All" to save the project files. 3. Select the desired x64 configuration, and build away! diff --git a/VisualStudio/OpenSceneGraph.dsw b/VisualStudio/OpenSceneGraph.dsw index b06927ed1..26e391cb9 100644 --- a/VisualStudio/OpenSceneGraph.dsw +++ b/VisualStudio/OpenSceneGraph.dsw @@ -231,33 +231,6 @@ Package=<4> ############################################################################### -Project: "Core osgProducer"=.\osgProducer\osgProducer.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 - Begin Project Dependency - Project_Dep_Name Core osgText - End Project Dependency -}}} - -############################################################################### - Project: "Core osgTerrain"=.\osgTerrain\osgTerrain.dsp - Package Owner=<4> Package=<5> @@ -399,33 +372,6 @@ Package=<4> ############################################################################### -Project: "Application osgproducerviewer"=.\applications\osgproducerviewer\osgproducerviewer.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 osgProducer - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency -}}} - -############################################################################### - Project: "Example osganimate"=.\examples\osganimate\osganimate.dsp - Package Owner=<4> Package=<5> @@ -4004,30 +3950,6 @@ Package=<4> ############################################################################### -Project: "osgWrapper osgProducer"=.\osgWrappers\osgProducer\wrapper_osgProducer.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 osgProducer - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgIntrospection - End Project Dependency -}}} - -############################################################################### - Project: "osgWrapper osgSim"=.\osgWrappers\osgSim\wrapper_osgSim.dsp - Package Owner=<4> Package=<5> diff --git a/VisualStudio/applications/osgarchive/osgarchive.dsp b/VisualStudio/applications/osgarchive/osgarchive.dsp index 30d54b805..750ca82a8 100644 --- a/VisualStudio/applications/osgarchive/osgarchive.dsp +++ b/VisualStudio/applications/osgarchive/osgarchive.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Target_Dir "" MTL=midl.exe # 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" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" BSC32=bscmake.exe @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgarchive.exe" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgarchive.exe" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" !ELSEIF "$(CFG)" == "Application osgarchive - Win32 Debug" @@ -68,7 +68,7 @@ LINK32=link.exe # PROP Target_Dir "" MTL=midl.exe # 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 /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /c # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" BSC32=bscmake.exe @@ -76,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"$(OutDir)/osgarchived.exe" /pdbtype:sept /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"$(OutDir)/osgarchived.exe" /pdbtype:sept /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /incremental:no !ENDIF diff --git a/VisualStudio/applications/osgproducerviewer/osgproducerviewer.dsp b/VisualStudio/applications/osgproducerviewer/osgproducerviewer.dsp deleted file mode 100644 index bc5382910..000000000 --- a/VisualStudio/applications/osgproducerviewer/osgproducerviewer.dsp +++ /dev/null @@ -1,101 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Application osgproducerviewer" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=Application osgproducerviewer - 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 "osgproducerviewer.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 "osgproducerviewer.mak" CFG="Application osgproducerviewer - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Application osgproducerviewer - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "Application osgproducerviewer - 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)" == "Application osgproducerviewer - 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 "../../../bin/$(PlatformName)" -# PROP Intermediate_Dir "$(PlatformName)/$(ConfigurationName)" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# 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" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /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 /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib /nologo /subsystem:console /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgproducerviewer.exe" /libpath:"../../../lib/$(PlatformName)" - -!ELSEIF "$(CFG)" == "Application osgproducerviewer - 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 "../../../bin/$(PlatformName)" -# PROP Intermediate_Dir "$(PlatformName)/$(ConfigurationName)" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# 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 /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /Zm200 /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 opengl32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"$(OutDir)/osgproducerviewerd.exe" /pdbtype:sept /libpath:"../../../lib/$(PlatformName)" -# SUBTRACT LINK32 /incremental:no - -!ENDIF - -# Begin Target - -# Name "Application osgproducerviewer - Win32 Release" -# Name "Application osgproducerviewer - Win32 Debug" -# Begin Source File - -SOURCE=..\..\..\applications\osgproducerviewer\osgproducerviewer.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\icons\osg_icon.rc -# 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/applications/osgversion/osgversion.dsp b/VisualStudio/applications/osgversion/osgversion.dsp index 7ad64b853..61da11caf 100755 --- a/VisualStudio/applications/osgversion/osgversion.dsp +++ b/VisualStudio/applications/osgversion/osgversion.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Target_Dir "" MTL=midl.exe # 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" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" BSC32=bscmake.exe @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /subsystem:console /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgversion.exe" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /subsystem:console /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgversion.exe" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" !ELSEIF "$(CFG)" == "Application osgversion - Win32 Debug" @@ -68,7 +68,7 @@ LINK32=link.exe # PROP Target_Dir "" MTL=midl.exe # 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 /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /c # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" BSC32=bscmake.exe @@ -76,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"$(OutDir)/osgversiond.exe" /pdbtype:sept /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"$(OutDir)/osgversiond.exe" /pdbtype:sept /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /incremental:no !ENDIF diff --git a/VisualStudio/examples/osgdepthshadow/osgdepthshadow.dsp b/VisualStudio/examples/osgdepthshadow/osgdepthshadow.dsp index c732e30a5..88e931dd1 100644 --- a/VisualStudio/examples/osgdepthshadow/osgdepthshadow.dsp +++ b/VisualStudio/examples/osgdepthshadow/osgdepthshadow.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Target_Dir "" MTL=midl.exe # 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" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" BSC32=bscmake.exe @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgdepthshadow.exe" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgdepthshadow.exe" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" !ELSEIF "$(CFG)" == "Example osgdepthshadow - Win32 Debug" @@ -68,7 +68,7 @@ LINK32=link.exe # PROP Target_Dir "" MTL=midl.exe # 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 /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # SUBTRACT CPP /Fr # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" @@ -77,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"$(OutDir)/osgdepthshadowd.exe" /pdbtype:sept /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"$(OutDir)/osgdepthshadowd.exe" /pdbtype:sept /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /incremental:no !ENDIF diff --git a/VisualStudio/examples/osgintersection/osgintersection.dsp b/VisualStudio/examples/osgintersection/osgintersection.dsp index 90ee7ca1c..ccf104350 100644 --- a/VisualStudio/examples/osgintersection/osgintersection.dsp +++ b/VisualStudio/examples/osgintersection/osgintersection.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Target_Dir "" MTL=midl.exe # 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" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" BSC32=bscmake.exe @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgintersection.exe" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgintersection.exe" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" !ELSEIF "$(CFG)" == "Example osgintersection - Win32 Debug" @@ -68,7 +68,7 @@ LINK32=link.exe # PROP Target_Dir "" MTL=midl.exe # 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 /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /Zm200 /c # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" BSC32=bscmake.exe @@ -76,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"$(OutDir)/osgintersectiond.exe" /pdbtype:sept /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"$(OutDir)/osgintersectiond.exe" /pdbtype:sept /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /incremental:no !ENDIF diff --git a/VisualStudio/examples/osgintrospection/example_osgintrospection.dsp b/VisualStudio/examples/osgintrospection/example_osgintrospection.dsp index 619b02c8b..43737f4f8 100644 --- a/VisualStudio/examples/osgintrospection/example_osgintrospection.dsp +++ b/VisualStudio/examples/osgintrospection/example_osgintrospection.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Target_Dir "" MTL=midl.exe # 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" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" BSC32=bscmake.exe @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /subsystem:console /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgintrospection.exe" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /subsystem:console /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgintrospection.exe" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" !ELSEIF "$(CFG)" == "Example osgintrospection - Win32 Debug" @@ -68,7 +68,7 @@ LINK32=link.exe # PROP Target_Dir "" MTL=midl.exe # 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 /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c # SUBTRACT CPP /Fr # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" @@ -77,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"$(OutDir)/osgintrospectiond.exe" /pdbtype:sept /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"$(OutDir)/osgintrospectiond.exe" /pdbtype:sept /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /incremental:no !ENDIF diff --git a/VisualStudio/examples/osglauncher/resources.rc b/VisualStudio/examples/osglauncher/resources.rc deleted file mode 100644 index 6961bdd80..000000000 --- a/VisualStudio/examples/osglauncher/resources.rc +++ /dev/null @@ -1,3 +0,0 @@ -PRODUCER_ICON ICON DISCARDABLE "../../icons/osg.ico" -OSG_ICON ICON DISCARDABLE "osg.ico" - diff --git a/VisualStudio/examples/osgteapot/osgteapot.dsp b/VisualStudio/examples/osgteapot/osgteapot.dsp index d77270e99..e854ccf31 100755 --- a/VisualStudio/examples/osgteapot/osgteapot.dsp +++ b/VisualStudio/examples/osgteapot/osgteapot.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Target_Dir "" MTL=midl.exe # 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" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" BSC32=bscmake.exe @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgteapot.exe" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgteapot.exe" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" !ELSEIF "$(CFG)" == "Example osgteapot - Win32 Debug" @@ -68,7 +68,7 @@ LINK32=link.exe # PROP Target_Dir "" MTL=midl.exe # 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 /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /Zm200 /c # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" BSC32=bscmake.exe @@ -76,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"$(OutDir)/osgteapotd.exe" /pdbtype:sept /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"$(OutDir)/osgteapotd.exe" /pdbtype:sept /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /incremental:no !ENDIF diff --git a/VisualStudio/examples/osgunittests/osgunittests.dsp b/VisualStudio/examples/osgunittests/osgunittests.dsp index 5714904b8..039d23939 100644 --- a/VisualStudio/examples/osgunittests/osgunittests.dsp +++ b/VisualStudio/examples/osgunittests/osgunittests.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Target_Dir "" MTL=midl.exe # 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" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" BSC32=bscmake.exe @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /subsystem:console /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgunittests.exe" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /subsystem:console /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgunittests.exe" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" !ELSEIF "$(CFG)" == "Example osgunittests - Win32 Debug" @@ -68,7 +68,7 @@ LINK32=link.exe # PROP Target_Dir "" MTL=midl.exe # 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 /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /c # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" BSC32=bscmake.exe @@ -76,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"$(OutDir)/osgunittestsd.exe" /pdbtype:sept /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"$(OutDir)/osgunittestsd.exe" /pdbtype:sept /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /incremental:no !ENDIF diff --git a/VisualStudio/fixup-vc6-dsps.pl b/VisualStudio/fixup-vc6-dsps.pl index 3697ae339..dc6a93664 100644 --- a/VisualStudio/fixup-vc6-dsps.pl +++ b/VisualStudio/fixup-vc6-dsps.pl @@ -9,7 +9,7 @@ sub usage { "usage: $file [options] This script substitutes hardcoded values for the \$(PlatformName) and -\$(ConfigurationName) variables in the OpenSceneGraph, Producer, and +\$(ConfigurationName) variables in the OpenSceneGraph, and OpenThreads .dsp files. Those variables are useful in VC 7.x and VC 8, but are incompatible with VC 6.0. @@ -95,7 +95,6 @@ sub callback { } my (@dirs) = qw(. - ../../Producer/VC++6.0/Producer ../../OpenThreads/win32_src); # change to directory containing script to ensure paths work properly diff --git a/VisualStudio/icons/osg_icon.rc b/VisualStudio/icons/osg_icon.rc index 96e67cef7..da6818125 100644 --- a/VisualStudio/icons/osg_icon.rc +++ b/VisualStudio/icons/osg_icon.rc @@ -1,4 +1,2 @@ -PRODUCER_ICON ICON DISCARDABLE "osg.ico" - OSG_ICON ICON DISCARDABLE "osg.ico" diff --git a/VisualStudio/osg/osg.dsp b/VisualStudio/osg/osg.dsp index 9f71ec9b4..fc38bdc52 100755 --- a/VisualStudio/osg/osg.dsp +++ b/VisualStudio/osg/osg.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSG_LIBRARY" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSG_LIBRARY" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osg.dll" /implib:"../../lib/$(PlatformName)/osg.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osg.dll" /implib:"../../lib/$(PlatformName)/osg.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" !ELSEIF "$(CFG)" == "Core osg - Win32 Debug" @@ -74,7 +74,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # SUBTRACT CPP /X # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgd.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgd.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgd.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgd.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ELSEIF "$(CFG)" == "Core osg - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -130,7 +130,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # SUBTRACT CPP /X # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 diff --git a/VisualStudio/osgDB/osgDB.dsp b/VisualStudio/osgDB/osgDB.dsp index 1cff538f2..0e67c0eef 100755 --- a/VisualStudio/osgDB/osgDB.dsp +++ b/VisualStudio/osgDB/osgDB.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGDB_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGDB_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgDB.dll" /implib:"../../lib/$(PlatformName)/osgDB.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgDB.dll" /implib:"../../lib/$(PlatformName)/osgDB.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" !ELSEIF "$(CFG)" == "Core osgDB - Win32 Debug" @@ -74,7 +74,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "OSGDB_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "OSGDB_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -84,7 +84,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgDBd.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgDBd.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgDBd.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgDBd.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "Core osgDB - Win32 Release Static" @@ -102,7 +102,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -129,7 +129,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" diff --git a/VisualStudio/osgFX/osgFX.dsp b/VisualStudio/osgFX/osgFX.dsp index 2cb6b8f5c..5562ca00c 100644 --- a/VisualStudio/osgFX/osgFX.dsp +++ b/VisualStudio/osgFX/osgFX.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGFX_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGFX_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgFX.dll" /implib:"../../lib/$(PlatformName)/osgFX.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgFX.dll" /implib:"../../lib/$(PlatformName)/osgFX.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" !ELSEIF "$(CFG)" == "Core osgFX - Win32 Debug" @@ -74,7 +74,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "_DEBUG" /D "OSGFX_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "_DEBUG" /D "OSGFX_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -84,7 +84,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgFXd.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgFXd.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgFXd.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgFXd.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "Core osgFX - Win32 Release Static" @@ -102,7 +102,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -129,7 +129,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" diff --git a/VisualStudio/osgGA/osgGA.dsp b/VisualStudio/osgGA/osgGA.dsp index 1d49efd16..89496d0d0 100755 --- a/VisualStudio/osgGA/osgGA.dsp +++ b/VisualStudio/osgGA/osgGA.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGGA_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGGA_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgGA.dll" /implib:"../../lib/$(PlatformName)/osgGA.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgGA.dll" /implib:"../../lib/$(PlatformName)/osgGA.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" !ELSEIF "$(CFG)" == "Core osgGA - Win32 Debug" @@ -74,7 +74,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "OSGGA_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "OSGGA_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -84,7 +84,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgGAd.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgGAd.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgGAd.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgGAd.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "Core osgGA - Win32 Release Static" @@ -102,7 +102,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -129,7 +129,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" diff --git a/VisualStudio/osgIntrospection/osgIntrospection.dsp b/VisualStudio/osgIntrospection/osgIntrospection.dsp index 91f444305..015c6a005 100644 --- a/VisualStudio/osgIntrospection/osgIntrospection.dsp +++ b/VisualStudio/osgIntrospection/osgIntrospection.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGINTROSPECTION_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGINTROSPECTION_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgIntrospection.dll" /implib:"../../lib/$(PlatformName)/osgIntrospection.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgIntrospection.dll" /implib:"../../lib/$(PlatformName)/osgIntrospection.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" !ELSEIF "$(CFG)" == "Core osgIntrospection - Win32 Debug" @@ -71,7 +71,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "OSGINTROSPECTION_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "OSGINTROSPECTION_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgIntrospectiond.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgIntrospectiond.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgIntrospectiond.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgIntrospectiond.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/VisualStudio/osgManipulator/osgManipulator.dsp b/VisualStudio/osgManipulator/osgManipulator.dsp index 0aa99f895..211383efa 100644 --- a/VisualStudio/osgManipulator/osgManipulator.dsp +++ b/VisualStudio/osgManipulator/osgManipulator.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGMANIPULATOR_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGMANIPULATOR_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgManipulator.dll" /implib:"../../lib/$(PlatformName)/osgManipulator.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgManipulator.dll" /implib:"../../lib/$(PlatformName)/osgManipulator.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" !ELSEIF "$(CFG)" == "Core osgManipulator - Win32 Debug" @@ -74,7 +74,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "_DEBUG" /D "OSGMANIPULATOR_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "_DEBUG" /D "OSGMANIPULATOR_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -84,7 +84,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgManipulatord.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgManipulatord.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgManipulatord.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgManipulatord.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "Core osgManipulator - Win32 Release Static" @@ -102,7 +102,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -129,7 +129,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" diff --git a/VisualStudio/osgParticle/osgParticle.dsp b/VisualStudio/osgParticle/osgParticle.dsp index 8c1fd8f35..4d0e441bf 100644 --- a/VisualStudio/osgParticle/osgParticle.dsp +++ b/VisualStudio/osgParticle/osgParticle.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGPARTICLE_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGPARTICLE_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgParticle.dll" /implib:"../../lib/$(PlatformName)/osgParticle.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgParticle.dll" /implib:"../../lib/$(PlatformName)/osgParticle.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" !ELSEIF "$(CFG)" == "Core osgParticle - Win32 Debug" @@ -74,7 +74,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "OSGPARTICLE_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "OSGPARTICLE_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -84,7 +84,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgParticled.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgParticled.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgParticled.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgParticled.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "Core osgParticle - Win32 Release Static" @@ -102,7 +102,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -129,7 +129,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" diff --git a/VisualStudio/osgPlugins/3dc/3dc.dsp b/VisualStudio/osgPlugins/3dc/3dc.dsp index 831d7b49c..dfbfd2560 100644 --- a/VisualStudio/osgPlugins/3dc/3dc.dsp +++ b/VisualStudio/osgPlugins/3dc/3dc.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_3dc.dll" /implib:"../../../lib/$(PlatformName)/osgdb_3dc.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_3dc.dll" /implib:"../../../lib/$(PlatformName)/osgdb_3dc.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin 3dc - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_3dcd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_3dcd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_3dcd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_3dcd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin 3dc - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/ESRIShape/ESRIShape.dsp b/VisualStudio/osgPlugins/ESRIShape/ESRIShape.dsp index bd7f0bb7c..70325de12 100644 --- a/VisualStudio/osgPlugins/ESRIShape/ESRIShape.dsp +++ b/VisualStudio/osgPlugins/ESRIShape/ESRIShape.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ESRI_LIBRARY" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ESRI_LIBRARY" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgdb_shp.dll" /implib:"../../../lib/$(PlatformName)/osgdb_shp.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgdb_shp.dll" /implib:"../../../lib/$(PlatformName)/osgdb_shp.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" !ELSEIF "$(CFG)" == "osgPlugin ESRI - Win32 Debug" @@ -74,7 +74,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ESRI_LIBRARY" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ESRI_LIBRARY" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -84,7 +84,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgdb_shpd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_shpd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgdb_shpd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_shpd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ELSEIF "$(CFG)" == "osgPlugin ESRI - Win32 Release Static" @@ -102,7 +102,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -130,7 +130,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/OpenFlight/OpenFlight.dsp b/VisualStudio/osgPlugins/OpenFlight/OpenFlight.dsp index c37d530a1..c86df0b37 100644 --- a/VisualStudio/osgPlugins/OpenFlight/OpenFlight.dsp +++ b/VisualStudio/osgPlugins/OpenFlight/OpenFlight.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FLT_LIBRARY" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FLT_LIBRARY" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x414 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgdb_OpenFlight.dll" /implib:"../../../lib/$(PlatformName)/osgdb_OpenFlight.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgdb_OpenFlight.dll" /implib:"../../../lib/$(PlatformName)/osgdb_OpenFlight.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" !ELSEIF "$(CFG)" == "osgPlugin OpenFlight - Win32 Debug" @@ -74,7 +74,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FLT_LIBRARY" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FLT_LIBRARY" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x414 /d "_DEBUG" @@ -84,7 +84,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgdb_OpenFlightd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_OpenFlightd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgdb_OpenFlightd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_OpenFlightd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ELSEIF "$(CFG)" == "osgPlugin OpenFlight - Win32 Release Static" @@ -102,7 +102,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -130,7 +130,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/ac3d/ac3d.dsp b/VisualStudio/osgPlugins/ac3d/ac3d.dsp index bea32183e..036fb298d 100644 --- a/VisualStudio/osgPlugins/ac3d/ac3d.dsp +++ b/VisualStudio/osgPlugins/ac3d/ac3d.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_ac.dll" /implib:"../../../lib/$(PlatformName)/osgdb_ac.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_ac.dll" /implib:"../../../lib/$(PlatformName)/osgdb_ac.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin ac3d - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_acd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_acd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_acd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_acd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin ac3d - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/bmp/bmp.dsp b/VisualStudio/osgPlugins/bmp/bmp.dsp index b97b2f2c1..88f05ae0f 100644 --- a/VisualStudio/osgPlugins/bmp/bmp.dsp +++ b/VisualStudio/osgPlugins/bmp/bmp.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_bmp.dll" /implib:"../../../lib/$(PlatformName)/osgdb_bmp.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_bmp.dll" /implib:"../../../lib/$(PlatformName)/osgdb_bmp.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin bmp - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_bmpd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_bmpd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_bmpd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_bmpd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin bmp - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/bsp/bsp.dsp b/VisualStudio/osgPlugins/bsp/bsp.dsp index 4b26bd0fd..9239c5b18 100644 --- a/VisualStudio/osgPlugins/bsp/bsp.dsp +++ b/VisualStudio/osgPlugins/bsp/bsp.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "bsp_LIBRARY" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "bsp_LIBRARY" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgdb_bsp.dll" /implib:"../../../lib/$(PlatformName)/osgdb_bsp.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgdb_bsp.dll" /implib:"../../../lib/$(PlatformName)/osgdb_bsp.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" !ELSEIF "$(CFG)" == "osgPlugin bsp - Win32 Debug" @@ -74,7 +74,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "bsp_LIBRARY" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "bsp_LIBRARY" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -84,7 +84,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgdb_bspd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_bspd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgdb_bspd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_bspd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ELSEIF "$(CFG)" == "osgPlugin bsp - Win32 Release Static" @@ -102,7 +102,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -130,7 +130,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/dae/dae.dsp b/VisualStudio/osgPlugins/dae/dae.dsp index 328caa89a..baf21b18f 100644 --- a/VisualStudio/osgPlugins/dae/dae.dsp +++ b/VisualStudio/osgPlugins/dae/dae.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /I "../../../../3rdParty/include/collada-dom" /I "../../../../3rdParty/include/collada-dom/1.4" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /I "../../../../3rdParty/include/collada-dom" /I "../../../../3rdParty/include/collada-dom/1.4" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /pdbtype:sept -# ADD LINK32 libcollada_dom.lib libcollada_dae.lib libcollada_STLDatabase.lib libcollada_LIBXMLPlugin.lib libcollada_stdErrPlugin.lib libxml2_a.lib iconv_a.lib zlib.lib wsock32.lib OpenThreadsWin32.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_dae.dll" /implib:"../../../lib/$(PlatformName)/osgdb_dae.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 libcollada_dom.lib libcollada_dae.lib libcollada_STLDatabase.lib libcollada_LIBXMLPlugin.lib libcollada_stdErrPlugin.lib libxml2_a.lib iconv_a.lib zlib.lib wsock32.lib OpenThreadsWin32.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_dae.dll" /implib:"../../../lib/$(PlatformName)/osgdb_dae.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin COLLADA dae - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /I "../../../../3rdParty/include/collada-dom" /I "../../../../3rdParty/include/collada-dom/1.4" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /I "../../../../3rdParty/include/collada-dom" /I "../../../../3rdParty/include/collada-dom/1.4" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libcollada_dom.lib libcollada_dae.lib libcollada_STLDatabase.lib libcollada_LIBXMLPlugin.lib libcollada_stdErrPlugin.lib libxml2_a.lib iconv_a.lib zlib.lib wsock32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_daeD.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_daeD.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 libcollada_dom.lib libcollada_dae.lib libcollada_STLDatabase.lib libcollada_LIBXMLPlugin.lib libcollada_stdErrPlugin.lib libxml2_a.lib iconv_a.lib zlib.lib wsock32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_daeD.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_daeD.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin COLLADA dae - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/dds/dds.dsp b/VisualStudio/osgPlugins/dds/dds.dsp index 03ed4af46..5f2fde3a2 100644 --- a/VisualStudio/osgPlugins/dds/dds.dsp +++ b/VisualStudio/osgPlugins/dds/dds.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_dds.dll" /implib:"../../../lib/$(PlatformName)/osgdb_dds.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_dds.dll" /implib:"../../../lib/$(PlatformName)/osgdb_dds.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin dds - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_ddsd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_ddsd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_ddsd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_ddsd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin dds - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/directx/directx.dsp b/VisualStudio/osgPlugins/directx/directx.dsp index fb3f66853..e1e7eb089 100644 --- a/VisualStudio/osgPlugins/directx/directx.dsp +++ b/VisualStudio/osgPlugins/directx/directx.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_x.dll" /implib:"../../../lib/$(PlatformName)/osgdb_x.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_x.dll" /implib:"../../../lib/$(PlatformName)/osgdb_x.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin directx - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_xd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_xd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_xd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_xd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin directx - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/dw/dw.dsp b/VisualStudio/osgPlugins/dw/dw.dsp index 4b5c1a758..2b4ac43d1 100644 --- a/VisualStudio/osgPlugins/dw/dw.dsp +++ b/VisualStudio/osgPlugins/dw/dw.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib glu32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_dw.dll" /implib:"../../../lib/$(PlatformName)/osgdb_dw.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib glu32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_dw.dll" /implib:"../../../lib/$(PlatformName)/osgdb_dw.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin dw - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib glu32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_dwd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_dwd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib glu32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_dwd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_dwd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "osgPlugin dw - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/dxf/dxf.dsp b/VisualStudio/osgPlugins/dxf/dxf.dsp index 42015bd1c..d94e67c5b 100644 --- a/VisualStudio/osgPlugins/dxf/dxf.dsp +++ b/VisualStudio/osgPlugins/dxf/dxf.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DXF_LIBRARY" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DXF_LIBRARY" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgdb_dxf.dll" /implib:"../../../lib/$(PlatformName)/osgdb_dxf.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgdb_dxf.dll" /implib:"../../../lib/$(PlatformName)/osgdb_dxf.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" !ELSEIF "$(CFG)" == "osgPlugin dxf - Win32 Debug" @@ -74,7 +74,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DXF_LIBRARY" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DXF_LIBRARY" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -84,7 +84,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgdb_dxfd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_dxfd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgdb_dxfd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_dxfd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ELSEIF "$(CFG)" == "osgPlugin dxf - Win32 Release Static" @@ -102,7 +102,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -130,7 +130,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/flt/flt.dsp b/VisualStudio/osgPlugins/flt/flt.dsp index 68d929a08..3282f0374 100644 --- a/VisualStudio/osgPlugins/flt/flt.dsp +++ b/VisualStudio/osgPlugins/flt/flt.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FLT_LIBRARY" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FLT_LIBRARY" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x414 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgdb_flt.dll" /implib:"../../../lib/$(PlatformName)/osgdb_flt.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgdb_flt.dll" /implib:"../../../lib/$(PlatformName)/osgdb_flt.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" !ELSEIF "$(CFG)" == "osgPlugin flt - Win32 Debug" @@ -74,7 +74,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FLT_LIBRARY" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FLT_LIBRARY" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x414 /d "_DEBUG" @@ -84,7 +84,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgdb_fltd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_fltd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgdb_fltd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_fltd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ELSEIF "$(CFG)" == "osgPlugin flt - Win32 Release Static" @@ -102,7 +102,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -130,7 +130,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/freetype/freetype.dsp b/VisualStudio/osgPlugins/freetype/freetype.dsp index 204f75020..c44a535ea 100755 --- a/VisualStudio/osgPlugins/freetype/freetype.dsp +++ b/VisualStudio/osgPlugins/freetype/freetype.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib freetype219.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_freetype.dll" /implib:"../../../lib/$(PlatformName)/osgdb_freetype.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib freetype219.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_freetype.dll" /implib:"../../../lib/$(PlatformName)/osgdb_freetype.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin freetype - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib freetype219_D.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_freetyped.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_freetyped.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib freetype219_D.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_freetyped.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_freetyped.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin freetype - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/gdal/gdal.dsp b/VisualStudio/osgPlugins/gdal/gdal.dsp index 5be58d34d..239d4dd5d 100755 --- a/VisualStudio/osgPlugins/gdal/gdal.dsp +++ b/VisualStudio/osgPlugins/gdal/gdal.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib gdal_i.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_gdal.dll" /implib:"../../../lib/$(PlatformName)/osgdb_gdal.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib gdal_i.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_gdal.dll" /implib:"../../../lib/$(PlatformName)/osgdb_gdal.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin gdal - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib gdal_i.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_gdald.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_gdald.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib gdal_i.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_gdald.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_gdald.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin gdal - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/geo/geo.dsp b/VisualStudio/osgPlugins/geo/geo.dsp index 143b2ec56..2d2f1820c 100644 --- a/VisualStudio/osgPlugins/geo/geo.dsp +++ b/VisualStudio/osgPlugins/geo/geo.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_geo.dll" /implib:"../../../lib/$(PlatformName)/osgdb_geo.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_geo.dll" /implib:"../../../lib/$(PlatformName)/osgdb_geo.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin geo - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_geod.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_geod.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_geod.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_geod.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin geo - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/gif/gif.dsp b/VisualStudio/osgPlugins/gif/gif.dsp index e0abbdae2..ac1754d0f 100755 --- a/VisualStudio/osgPlugins/gif/gif.dsp +++ b/VisualStudio/osgPlugins/gif/gif.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib libungif.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_gif.dll" /implib:"../../../lib/$(PlatformName)/osgdb_gif.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib libungif.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_gif.dll" /implib:"../../../lib/$(PlatformName)/osgdb_gif.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin gif - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib libungifD.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_gifd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_gifd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib libungifD.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_gifd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_gifd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin gif - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/hdr/hdr.dsp b/VisualStudio/osgPlugins/hdr/hdr.dsp index b9fa37586..425960648 100644 --- a/VisualStudio/osgPlugins/hdr/hdr.dsp +++ b/VisualStudio/osgPlugins/hdr/hdr.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_hdr.dll" /implib:"../../../lib/$(PlatformName)/osgdb_hdr.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_hdr.dll" /implib:"../../../lib/$(PlatformName)/osgdb_hdr.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin hdr - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_hdrd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_hdrd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_hdrd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_hdrd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin hdr - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/ive/ive.dsp b/VisualStudio/osgPlugins/ive/ive.dsp index 98fb37700..06c00d8e0 100755 --- a/VisualStudio/osgPlugins/ive/ive.dsp +++ b/VisualStudio/osgPlugins/ive/ive.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_ive.dll" /implib:"../../../lib/$(PlatformName)/osgdb_ive.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_ive.dll" /implib:"../../../lib/$(PlatformName)/osgdb_ive.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin ive - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_ived.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_ived.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_ived.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_ived.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin ive - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/jpeg/jpeg.dsp b/VisualStudio/osgPlugins/jpeg/jpeg.dsp index 6ae38b1bf..e7bca4442 100755 --- a/VisualStudio/osgPlugins/jpeg/jpeg.dsp +++ b/VisualStudio/osgPlugins/jpeg/jpeg.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib libjpeg.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_jpeg.dll" /implib:"../../../lib/$(PlatformName)/osgdb_jpeg.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib libjpeg.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_jpeg.dll" /implib:"../../../lib/$(PlatformName)/osgdb_jpeg.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin jpeg - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib libjpegD.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_jpegd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_jpegd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib libjpegD.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_jpegd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_jpegd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin jpeg - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/lib3ds/lib3ds.dsp b/VisualStudio/osgPlugins/lib3ds/lib3ds.dsp index 52a70066f..9a6dafa71 100644 --- a/VisualStudio/osgPlugins/lib3ds/lib3ds.dsp +++ b/VisualStudio/osgPlugins/lib3ds/lib3ds.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_3ds.dll" /implib:"../../../lib/$(PlatformName)/osgdb_3ds.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_3ds.dll" /implib:"../../../lib/$(PlatformName)/osgdb_3ds.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin 3ds - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_3dsd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_3dsd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_3dsd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_3dsd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin 3ds - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/logo/logo.dsp b/VisualStudio/osgPlugins/logo/logo.dsp index 1f1f0a950..472135bd3 100644 --- a/VisualStudio/osgPlugins/logo/logo.dsp +++ b/VisualStudio/osgPlugins/logo/logo.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_logo.dll" /implib:"../../../lib/$(PlatformName)/osgdb_logo.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_logo.dll" /implib:"../../../lib/$(PlatformName)/osgdb_logo.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin logo - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_logod.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_logod.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_logod.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_logod.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin logo - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/lwo/lwo.dsp b/VisualStudio/osgPlugins/lwo/lwo.dsp index 664be25fc..dfcf230d3 100644 --- a/VisualStudio/osgPlugins/lwo/lwo.dsp +++ b/VisualStudio/osgPlugins/lwo/lwo.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib glu32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_lwo.dll" /implib:"../../../lib/$(PlatformName)/osgdb_lwo.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib glu32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_lwo.dll" /implib:"../../../lib/$(PlatformName)/osgdb_lwo.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin lwo - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib glu32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_lwod.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_lwod.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib glu32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_lwod.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_lwod.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "osgPlugin lwo - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" diff --git a/VisualStudio/osgPlugins/lws/lws.dsp b/VisualStudio/osgPlugins/lws/lws.dsp index 894da4440..27058886a 100644 --- a/VisualStudio/osgPlugins/lws/lws.dsp +++ b/VisualStudio/osgPlugins/lws/lws.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib glu32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_lws.dll" /implib:"../../../lib/$(PlatformName)/osgdb_lws.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib glu32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_lws.dll" /implib:"../../../lib/$(PlatformName)/osgdb_lws.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin lws - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib glu32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_lwsd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_lwsd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib glu32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_lwsd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_lwsd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "osgPlugin lws - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/md2/md2.dsp b/VisualStudio/osgPlugins/md2/md2.dsp index 35efd9681..f7616b455 100644 --- a/VisualStudio/osgPlugins/md2/md2.dsp +++ b/VisualStudio/osgPlugins/md2/md2.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_md2.dll" /implib:"../../../lib/$(PlatformName)/osgdb_md2.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_md2.dll" /implib:"../../../lib/$(PlatformName)/osgdb_md2.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin md2 - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_md2d.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_md2d.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_md2d.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_md2d.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin md2 - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/net/net.dsp b/VisualStudio/osgPlugins/net/net.dsp index 18b4bd87d..6706a94d1 100644 --- a/VisualStudio/osgPlugins/net/net.dsp +++ b/VisualStudio/osgPlugins/net/net.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSGPLUGINNET_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib wsock32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgdb_net.dll" /implib:"../../../lib/$(PlatformName)/osgdb_net.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib wsock32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgdb_net.dll" /implib:"../../../lib/$(PlatformName)/osgdb_net.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" !ELSEIF "$(CFG)" == "osgPlugin net - Win32 Debug" @@ -74,7 +74,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSGPLUGINNET_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -84,7 +84,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgdb_netd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_netd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgdb_netd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_netd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" !ELSEIF "$(CFG)" == "osgPlugin net - Win32 Release Static" @@ -101,7 +101,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -129,7 +129,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/normals/normals.dsp b/VisualStudio/osgPlugins/normals/normals.dsp index 46f1fd49e..bf04c9ae9 100644 --- a/VisualStudio/osgPlugins/normals/normals.dsp +++ b/VisualStudio/osgPlugins/normals/normals.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_normals.dll" /implib:"../../../lib/$(PlatformName)/osgdb_normals.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_normals.dll" /implib:"../../../lib/$(PlatformName)/osgdb_normals.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin normals - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_normalsd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_normalsd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_normalsd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_normalsd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin normals - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/obj/obj.dsp b/VisualStudio/osgPlugins/obj/obj.dsp index 7190e00ce..b5111ec08 100644 --- a/VisualStudio/osgPlugins/obj/obj.dsp +++ b/VisualStudio/osgPlugins/obj/obj.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_obj.dll" /implib:"../../../lib/$(PlatformName)/osgdb_obj.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_obj.dll" /implib:"../../../lib/$(PlatformName)/osgdb_obj.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin obj - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_objd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_objd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_objd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_objd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin obj - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/osg/dot_osg.dsp b/VisualStudio/osgPlugins/osg/dot_osg.dsp index b8570d013..39aec9b35 100755 --- a/VisualStudio/osgPlugins/osg/dot_osg.dsp +++ b/VisualStudio/osgPlugins/osg/dot_osg.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_osg.dll" /implib:"../../../lib/$(PlatformName)/osgdb_osg.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_osg.dll" /implib:"../../../lib/$(PlatformName)/osgdb_osg.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin osg - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_osgd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_osgd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_osgd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_osgd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin osg - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/osgFX/dot_osgFX.dsp b/VisualStudio/osgPlugins/osgFX/dot_osgFX.dsp index 5821dd8ec..ec5592754 100644 --- a/VisualStudio/osgPlugins/osgFX/dot_osgFX.dsp +++ b/VisualStudio/osgPlugins/osgFX/dot_osgFX.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_osgFX.dll" /implib:"../../../lib/$(PlatformName)/osgdb_osgFX.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_osgFX.dll" /implib:"../../../lib/$(PlatformName)/osgdb_osgFX.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin osgFX - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_osgFXd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_osgFXd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_osgFXd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_osgFXd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin osgFX - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/osgParticle/dot_osgParticle.dsp b/VisualStudio/osgPlugins/osgParticle/dot_osgParticle.dsp index 93efbeb73..1ac7a1048 100644 --- a/VisualStudio/osgPlugins/osgParticle/dot_osgParticle.dsp +++ b/VisualStudio/osgPlugins/osgParticle/dot_osgParticle.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_osgParticle.dll" /implib:"../../../lib/$(PlatformName)/osgdb_osgParticle.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_osgParticle.dll" /implib:"../../../lib/$(PlatformName)/osgdb_osgParticle.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin osgParticle - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_osgParticled.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_osgParticled.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_osgParticled.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_osgParticled.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin osgParticle - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/osgSim/dot_osgSim.dsp b/VisualStudio/osgPlugins/osgSim/dot_osgSim.dsp index 70547ff4d..4c2115f1e 100644 --- a/VisualStudio/osgPlugins/osgSim/dot_osgSim.dsp +++ b/VisualStudio/osgPlugins/osgSim/dot_osgSim.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_osgSim.dll" /implib:"../../../lib/$(PlatformName)/osgdb_osgSim.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_osgSim.dll" /implib:"../../../lib/$(PlatformName)/osgdb_osgSim.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin osgSim - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_osgSimd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_osgSimd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_osgSimd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_osgSimd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin osgSim - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/osgText/dot_osgText.dsp b/VisualStudio/osgPlugins/osgText/dot_osgText.dsp index c39156b06..b4dc084cb 100644 --- a/VisualStudio/osgPlugins/osgText/dot_osgText.dsp +++ b/VisualStudio/osgPlugins/osgText/dot_osgText.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_osgText.dll" /implib:"../../../lib/$(PlatformName)/osgdb_osgText.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_osgText.dll" /implib:"../../../lib/$(PlatformName)/osgdb_osgText.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin osgText - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_osgTextd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_osgTextd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_osgTextd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_osgTextd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin osgText - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/osga/osga.dsp b/VisualStudio/osgPlugins/osga/osga.dsp index 729e49a7d..fcab0e338 100644 --- a/VisualStudio/osgPlugins/osga/osga.dsp +++ b/VisualStudio/osgPlugins/osga/osga.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_osga.dll" /implib:"../../../lib/$(PlatformName)/osgdb_osga.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_osga.dll" /implib:"../../../lib/$(PlatformName)/osgdb_osga.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin osga - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_osgad.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_osgad.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_osgad.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_osgad.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin osga - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/osgtgz/osgtgz.dsp b/VisualStudio/osgPlugins/osgtgz/osgtgz.dsp index 3b107f54b..30d5e1f1b 100644 --- a/VisualStudio/osgPlugins/osgtgz/osgtgz.dsp +++ b/VisualStudio/osgPlugins/osgtgz/osgtgz.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_osgtgz.dll" /implib:"../../../lib/$(PlatformName)/osgdb_osgtgz.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_osgtgz.dll" /implib:"../../../lib/$(PlatformName)/osgdb_osgtgz.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin osgtgz - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_osgtgzd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_osgtgzd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_osgtgzd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_osgtgzd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin osgtgz - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/pic/pic.dsp b/VisualStudio/osgPlugins/pic/pic.dsp index 0609b183d..bc155c6ce 100755 --- a/VisualStudio/osgPlugins/pic/pic.dsp +++ b/VisualStudio/osgPlugins/pic/pic.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_pic.dll" /implib:"../../../lib/$(PlatformName)/osgdb_pic.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_pic.dll" /implib:"../../../lib/$(PlatformName)/osgdb_pic.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin pic - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_picd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_picd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_picd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_picd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin pic - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/png/png.dsp b/VisualStudio/osgPlugins/png/png.dsp index 57e14666a..cfefb9a77 100755 --- a/VisualStudio/osgPlugins/png/png.dsp +++ b/VisualStudio/osgPlugins/png/png.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib libpng.lib zlib.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_png.dll" /implib:"../../../lib/$(PlatformName)/osgdb_png.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib libpng.lib zlib.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_png.dll" /implib:"../../../lib/$(PlatformName)/osgdb_png.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin png - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib libpngD.lib zlibD.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_pngd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_pngd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib libpngD.lib zlibD.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_pngd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_pngd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin png - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/pnm/pnm.dsp b/VisualStudio/osgPlugins/pnm/pnm.dsp index c4fc42ecd..50030c03e 100644 --- a/VisualStudio/osgPlugins/pnm/pnm.dsp +++ b/VisualStudio/osgPlugins/pnm/pnm.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_pnm.dll" /implib:"../../../lib/$(PlatformName)/osgdb_pnm.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_pnm.dll" /implib:"../../../lib/$(PlatformName)/osgdb_pnm.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin pnm - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_pnmd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_pnmd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_pnmd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_pnmd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin pnm - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/quicktime/quicktime.dsp b/VisualStudio/osgPlugins/quicktime/quicktime.dsp index 028616416..6bf8bf58d 100644 --- a/VisualStudio/osgPlugins/quicktime/quicktime.dsp +++ b/VisualStudio/osgPlugins/quicktime/quicktime.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 -# ADD LINK32 OpenThreadsWin32.lib qtmlClient.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_qt.dll" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib qtmlClient.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_qt.dll" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin quicktime - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib qtmlClient.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_qtd.dll" /pdbtype:sept /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib qtmlClient.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_qtd.dll" /pdbtype:sept /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin quicktime - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/rgb/rgb.dsp b/VisualStudio/osgPlugins/rgb/rgb.dsp index 1e23dd577..516a3c4e9 100644 --- a/VisualStudio/osgPlugins/rgb/rgb.dsp +++ b/VisualStudio/osgPlugins/rgb/rgb.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_rgb.dll" /implib:"../../../lib/$(PlatformName)/osgdb_rgb.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_rgb.dll" /implib:"../../../lib/$(PlatformName)/osgdb_rgb.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin rgb - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_rgbd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_rgbd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_rgbd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_rgbd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin rgb - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/rot/rot.dsp b/VisualStudio/osgPlugins/rot/rot.dsp index 962022ca3..f47506f1f 100644 --- a/VisualStudio/osgPlugins/rot/rot.dsp +++ b/VisualStudio/osgPlugins/rot/rot.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_rot.dll" /implib:"../../../lib/$(PlatformName)/osgdb_rot.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_rot.dll" /implib:"../../../lib/$(PlatformName)/osgdb_rot.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin rot - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_rotd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_rotd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_rotd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_rotd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin rot - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/scale/scale.dsp b/VisualStudio/osgPlugins/scale/scale.dsp index fbd32e269..51006fe84 100644 --- a/VisualStudio/osgPlugins/scale/scale.dsp +++ b/VisualStudio/osgPlugins/scale/scale.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_scale.dll" /implib:"../../../lib/$(PlatformName)/osgdb_scale.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_scale.dll" /implib:"../../../lib/$(PlatformName)/osgdb_scale.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin scale - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_scaled.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_scaled.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_scaled.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_scaled.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin scale - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/stl/stl.dsp b/VisualStudio/osgPlugins/stl/stl.dsp index 4d3c1e596..2d78a7d1d 100644 --- a/VisualStudio/osgPlugins/stl/stl.dsp +++ b/VisualStudio/osgPlugins/stl/stl.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_stl.dll" /implib:"../../../lib/$(PlatformName)/osgdb_stl.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_stl.dll" /implib:"../../../lib/$(PlatformName)/osgdb_stl.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin stl - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_stld.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_stld.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_stld.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_stld.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin stl - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/tga/tga.dsp b/VisualStudio/osgPlugins/tga/tga.dsp index 5a5b98800..61854ee54 100755 --- a/VisualStudio/osgPlugins/tga/tga.dsp +++ b/VisualStudio/osgPlugins/tga/tga.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_tga.dll" /implib:"../../../lib/$(PlatformName)/osgdb_tga.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_tga.dll" /implib:"../../../lib/$(PlatformName)/osgdb_tga.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin tga - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_tgad.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_tgad.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_tgad.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_tgad.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin tga - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/tgz/tgz.dsp b/VisualStudio/osgPlugins/tgz/tgz.dsp index 1f9b51137..fbe770897 100644 --- a/VisualStudio/osgPlugins/tgz/tgz.dsp +++ b/VisualStudio/osgPlugins/tgz/tgz.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_tgz.dll" /implib:"../../../lib/$(PlatformName)/osgdb_tgz.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_tgz.dll" /implib:"../../../lib/$(PlatformName)/osgdb_tgz.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin tgz - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_tgzd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_tgzd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_tgzd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_tgzd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin tgz - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/tiff/tiff.dsp b/VisualStudio/osgPlugins/tiff/tiff.dsp index 65f7c77dc..095e77314 100755 --- a/VisualStudio/osgPlugins/tiff/tiff.dsp +++ b/VisualStudio/osgPlugins/tiff/tiff.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib libtiff.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_tiff.dll" /implib:"../../../lib/$(PlatformName)/osgdb_tiff.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib libtiff.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_tiff.dll" /implib:"../../../lib/$(PlatformName)/osgdb_tiff.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin tiff - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib libtiffD.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_tiffd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_tiffd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib libtiffD.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_tiffd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_tiffd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "osgPlugin tiff - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/trans/trans.dsp b/VisualStudio/osgPlugins/trans/trans.dsp index ded92813b..6e4f1eabc 100644 --- a/VisualStudio/osgPlugins/trans/trans.dsp +++ b/VisualStudio/osgPlugins/trans/trans.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_trans.dll" /implib:"../../../lib/$(PlatformName)/osgdb_trans.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_trans.dll" /implib:"../../../lib/$(PlatformName)/osgdb_trans.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin trans - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_transd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_transd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_transd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_transd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin trans - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/txf/txf.dsp b/VisualStudio/osgPlugins/txf/txf.dsp index 313cd4129..c6aa5131f 100644 --- a/VisualStudio/osgPlugins/txf/txf.dsp +++ b/VisualStudio/osgPlugins/txf/txf.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_txf.dll" /implib:"../../../lib/$(PlatformName)/osgdb_txf.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_txf.dll" /implib:"../../../lib/$(PlatformName)/osgdb_txf.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin txf - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_txfd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_txfd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_txfd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_txfd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin txf - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/txp/txp.dsp b/VisualStudio/osgPlugins/txp/txp.dsp index 5f1209077..27052898d 100644 --- a/VisualStudio/osgPlugins/txp/txp.dsp +++ b/VisualStudio/osgPlugins/txp/txp.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /I "../../../src/osgPlugins/txp" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSGTXP_LIBRARY" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /I "../../../src/osgPlugins/txp" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSGTXP_LIBRARY" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x41a /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_txp.dll" /implib:"../../../lib/$(PlatformName)/osgdb_txp.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_txp.dll" /implib:"../../../lib/$(PlatformName)/osgdb_txp.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin txp - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /I "../../../src/osgPlugins/txp" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D __COMP_DLL=7931 /D "WIN32" /D "_DEBUG" /D "OSGTXP_LIBRARY" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /I "../../../src/osgPlugins/txp" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D __COMP_DLL=7931 /D "WIN32" /D "_DEBUG" /D "OSGTXP_LIBRARY" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x41a /d "_DEBUG" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_txpd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_txpd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_txpd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_txpd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin txp - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /I "../../../src/osgPlugins/txp" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /I "../../../src/osgPlugins/txp" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /I "../../../src/osgPlugins/txp" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /I "../../../src/osgPlugins/txp" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgPlugins/zip/zip.dsp b/VisualStudio/osgPlugins/zip/zip.dsp index 921d5817f..9d676bfdb 100644 --- a/VisualStudio/osgPlugins/zip/zip.dsp +++ b/VisualStudio/osgPlugins/zip/zip.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_zip.dll" /implib:"../../../lib/$(PlatformName)/osgdb_zip.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgdb_zip.dll" /implib:"../../../lib/$(PlatformName)/osgdb_zip.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin zip - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -85,7 +85,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_zipd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_zipd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgdb_zipd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_zipd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin zip - Win32 Release Static" @@ -103,7 +103,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -131,7 +131,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" diff --git a/VisualStudio/osgProducer/osgProducer.dsp b/VisualStudio/osgProducer/osgProducer.dsp deleted file mode 100755 index cbaa81106..000000000 --- a/VisualStudio/osgProducer/osgProducer.dsp +++ /dev/null @@ -1,227 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Core osgProducer" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=Core osgProducer - 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 "osgProducer.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 "osgProducer.mak" CFG="Core osgProducer - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Core osgProducer - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "Core osgProducer - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "Core osgProducer - Win32 Release Static" (based on "Win32 (x86) Static Library") -!MESSAGE "Core osgProducer - Win32 Debug Static" (based on "Win32 (x86) Static 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 osgProducer - 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 "../../bin/$(PlatformName)" -# PROP Intermediate_Dir "$(PlatformName)/$(ConfigurationName)" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGPRODUCER_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# 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 /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib producer.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgProducer.dll" /implib:"../../lib/$(PlatformName)/osgProducer.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" - -!ELSEIF "$(CFG)" == "Core osgProducer - 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 "../../bin/$(PlatformName)" -# PROP Intermediate_Dir "$(PlatformName)/$(ConfigurationName)" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "OSGPRODUCER_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# 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 OpenThreadsWin32d.lib opengl32.lib glu32.lib producerd.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgProducerd.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgProducerd.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "Core osgProducer - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "../../lib" -# PROP BASE Intermediate_Dir "Release_Static" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../../lib/$(PlatformName)" -# PROP Intermediate_Dir "$(PlatformName)/$(ConfigurationName)_Static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nodefaultlib /nologo /out:"$(OutDir)/osgProducer_s.lib" - -!ELSEIF "$(CFG)" == "Core osgProducer - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "../../lib" -# PROP BASE Intermediate_Dir "Debug_Static" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../../lib/$(PlatformName)" -# PROP Intermediate_Dir "$(PlatformName)/$(ConfigurationName)_Static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nodefaultlib /nologo /out:"$(OutDir)/osgProducerd_s.lib" -# SUBTRACT LIB32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "Core osgProducer - Win32 Release" -# Name "Core osgProducer - Win32 Debug" -# Name "Core osgProducer - Win32 Release Static" -# Name "Core osgProducer - Win32 Debug Static" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\src\osgProducer\KeyboardMouseCallback.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\osgProducer\GraphicsContextImplementation.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\osgProducer\OsgCameraGroup.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\osgProducer\OsgSceneHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\osgProducer\Version.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\osgProducer\Viewer.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\osgProducer\ViewerEventHandler.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter ";h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\Include\osgProducer\Export -# End Source File -# Begin Source File - -SOURCE=..\..\Include\osgProducer\KeyboardMouseCallback -# End Source File -# Begin Source File - -SOURCE=..\..\Include\osgProducer\GraphicsContextImplementation -# End Source File -# Begin Source File - -SOURCE=..\..\include\osgProducer\OsgCameraGroup -# End Source File -# Begin Source File - -SOURCE=..\..\Include\osgProducer\OsgSceneHandler -# End Source File -# Begin Source File - -SOURCE=..\..\Include\osgProducer\Version -# End Source File -# Begin Source File - -SOURCE=..\..\Include\osgProducer\Viewer -# End Source File -# Begin Source File - -SOURCE=..\..\Include\osgProducer\ViewerEventHandler -# 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/osgShadow/osgShadow.dsp b/VisualStudio/osgShadow/osgShadow.dsp index bd44bf806..c95551e96 100644 --- a/VisualStudio/osgShadow/osgShadow.dsp +++ b/VisualStudio/osgShadow/osgShadow.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGSHADOW_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGSHADOW_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgShadow.dll" /implib:"../../lib/$(PlatformName)/osgShadow.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgShadow.dll" /implib:"../../lib/$(PlatformName)/osgShadow.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" !ELSEIF "$(CFG)" == "Core osgShadow - Win32 Debug" @@ -74,7 +74,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "OSGSHADOW_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "OSGSHADOW_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -84,7 +84,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgShadowd.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgShadowd.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgShadowd.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgShadowd.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "Core osgShadow - Win32 Release Static" @@ -102,7 +102,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" "OT_LIBRARY_STATIC" "PR_LIBRARY_STATIC" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -129,7 +129,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" "OT_LIBRARY_STATIC" "PR_LIBRARY_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" diff --git a/VisualStudio/osgShell.bat b/VisualStudio/osgShell.bat index 34c1efa0d..753d7ce74 100644 --- a/VisualStudio/osgShell.bat +++ b/VisualStudio/osgShell.bat @@ -1,13 +1,12 @@ @echo off REM This script provides a commandline shell properly configured to run OSG -REM executables directly from the OpenThreads/Producer/OpenSceneGraph source +REM executables directly from the OpenThreads/OpenSceneGraph source REM trees. REM mew 2004-07-16 cd ..\.. -set PATH=%CD%\OpenThreads\bin\win32;%CD%\Producer\bin\win32;%CD%\OpenSceneGraph\bin\win32;%CD%\3rdParty\bin;%PATH% +set PATH=%CD%\OpenThreads\bin\win32;%CD%\OpenSceneGraph\bin\win32;%CD%\3rdParty\bin;%PATH% set OSG_FILE_PATH=%CD%\OpenSceneGraph-Data;%CD%\OpenSceneGraph-Data\Images;%CD%\OpenSceneGraph-Data\fonts;%OSG_FILE_PATH% -REM set PRODUCER_CAMERA_CONFIG_FILE=%CD%\Producer-Data\1win.cfg REM uncomment one of these for your desired notify level... rem set OSG_NOTIFY_LEVEL=ALWAYS diff --git a/VisualStudio/osgSim/osgSim.dsp b/VisualStudio/osgSim/osgSim.dsp index 15ea1d7fc..0badb564d 100644 --- a/VisualStudio/osgSim/osgSim.dsp +++ b/VisualStudio/osgSim/osgSim.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /Op /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGSIM_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /Op /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGSIM_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgSim.dll" /implib:"../../lib/$(PlatformName)/osgSim.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgSim.dll" /implib:"../../lib/$(PlatformName)/osgSim.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" !ELSEIF "$(CFG)" == "Core osgSim - Win32 Debug" @@ -74,7 +74,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "OSGSIM_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "OSGSIM_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -84,7 +84,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgSimd.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgSimd.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgSimd.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgSimd.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "Core osgSim - Win32 Release Static" @@ -102,7 +102,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -129,7 +129,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # SUBTRACT CPP /X # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 diff --git a/VisualStudio/osgTerrain/osgTerrain.dsp b/VisualStudio/osgTerrain/osgTerrain.dsp index cffed3e4e..aad4bf99c 100644 --- a/VisualStudio/osgTerrain/osgTerrain.dsp +++ b/VisualStudio/osgTerrain/osgTerrain.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /Op /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGTERRAIN_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /Op /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGTERRAIN_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib gdal_i.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgTerrain.dll" /implib:"../../lib/$(PlatformName)/osgTerrain.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib gdal_i.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgTerrain.dll" /implib:"../../lib/$(PlatformName)/osgTerrain.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" !ELSEIF "$(CFG)" == "Core osgTerrain - Win32 Debug" @@ -74,7 +74,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "OSGTERRAIN_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "OSGTERRAIN_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -84,7 +84,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib gdal_iD.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgTerraind.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgTerraind.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib gdal_iD.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgTerraind.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgTerraind.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "Core osgTerrain - Win32 Release Static" @@ -102,7 +102,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" "OT_LIBRARY_STATIC" "PR_LIBRARY_STATIC" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -129,7 +129,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" "OT_LIBRARY_STATIC" "PR_LIBRARY_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" diff --git a/VisualStudio/osgText/osgText.dsp b/VisualStudio/osgText/osgText.dsp index 2a56b1208..06fe41e53 100644 --- a/VisualStudio/osgText/osgText.dsp +++ b/VisualStudio/osgText/osgText.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGTEXT_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGTEXT_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgText.dll" /implib:"../../lib/$(PlatformName)/osgText.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgText.dll" /implib:"../../lib/$(PlatformName)/osgText.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" !ELSEIF "$(CFG)" == "Core osgText - Win32 Debug" @@ -74,7 +74,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "OSGTEXT_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "OSGTEXT_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -84,7 +84,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgTextd.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgTextd.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgTextd.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgTextd.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "Core osgText - Win32 Release Static" @@ -102,7 +102,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" "OT_LIBRARY_STATIC" "PR_LIBRARY_STATIC" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -129,7 +129,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" "OT_LIBRARY_STATIC" "PR_LIBRARY_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" diff --git a/VisualStudio/osgUtil/osgUtil.dsp b/VisualStudio/osgUtil/osgUtil.dsp index f2ceb0755..a83f6261a 100755 --- a/VisualStudio/osgUtil/osgUtil.dsp +++ b/VisualStudio/osgUtil/osgUtil.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGUTIL_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGUTIL_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgUtil.dll" /implib:"../../lib/$(PlatformName)/osgUtil.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgUtil.dll" /implib:"../../lib/$(PlatformName)/osgUtil.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)"/libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" !ELSEIF "$(CFG)" == "Core osgUtil - Win32 Debug" @@ -74,7 +74,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "_DEBUG" /D "OSGUTIL_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "_DEBUG" /D "OSGUTIL_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -84,7 +84,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgUtild.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgUtild.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgUtild.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgUtild.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "Core osgUtil - Win32 Release Static" @@ -102,7 +102,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -129,7 +129,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "_DEBUG" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" diff --git a/VisualStudio/osgViewer/osgViewer.dsp b/VisualStudio/osgViewer/osgViewer.dsp index 7d5731a2c..b0a5fa50d 100644 --- a/VisualStudio/osgViewer/osgViewer.dsp +++ b/VisualStudio/osgViewer/osgViewer.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGVIEWER_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "OSGVIEWER_LIBRARY" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgViewer.dll" /implib:"../../lib/$(PlatformName)/osgViewer.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgViewer.dll" /implib:"../../lib/$(PlatformName)/osgViewer.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" !ELSEIF "$(CFG)" == "Core osgViewer - Win32 Debug" @@ -74,7 +74,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "OSGVIEWER_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "OSGVIEWER_LIBRARY" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -84,7 +84,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgViewerd.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgViewerd.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../Producer/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgViewerd.dll" /pdbtype:sept /implib:"../../lib/$(PlatformName)/osgViewerd.lib" /libpath:"../../lib/$(PlatformName)" /libpath:"../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "Core osgViewer - Win32 Release Static" @@ -102,7 +102,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "NDEBUG" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -129,7 +129,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MTd /W3 /Gm /vmg /GR /GX /Z7 /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../3rdParty/include" /D "OSG_LIBRARY_STATIC" /D "OT_LIBRARY_STATIC" /D "PR_LIBRARY_STATIC" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /Zm200 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" diff --git a/VisualStudio/osgWrappers/osg/wrapper_osg.dsp b/VisualStudio/osgWrappers/osg/wrapper_osg.dsp index de8875dfe..b496de138 100644 --- a/VisualStudio/osgWrappers/osg/wrapper_osg.dsp +++ b/VisualStudio/osgWrappers/osg/wrapper_osg.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osg.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osg.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osg.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osg.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgWrapper osg - Win32 Debug" @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ENDIF diff --git a/VisualStudio/osgWrappers/osgDB/wrapper_osgDB.dsp b/VisualStudio/osgWrappers/osgDB/wrapper_osgDB.dsp index 40213333c..fbb44c51a 100644 --- a/VisualStudio/osgWrappers/osgDB/wrapper_osgDB.dsp +++ b/VisualStudio/osgWrappers/osgDB/wrapper_osgDB.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgDB.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgDB.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgDB.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgDB.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgWrapper osgDB - Win32 Debug" @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgDBd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgDBd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgDBd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgDBd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ENDIF diff --git a/VisualStudio/osgWrappers/osgFX/wrapper_osgFX.dsp b/VisualStudio/osgWrappers/osgFX/wrapper_osgFX.dsp index 8afd1ac9c..a80a33b59 100644 --- a/VisualStudio/osgWrappers/osgFX/wrapper_osgFX.dsp +++ b/VisualStudio/osgWrappers/osgFX/wrapper_osgFX.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgFX.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgFX.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgFX.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgFX.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgWrapper osgFX - Win32 Debug" @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgFXd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgFXd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgFXd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgFXd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ENDIF diff --git a/VisualStudio/osgWrappers/osgGA/wrapper_osgGA.dsp b/VisualStudio/osgWrappers/osgGA/wrapper_osgGA.dsp index a81d232e2..6b2849b0e 100644 --- a/VisualStudio/osgWrappers/osgGA/wrapper_osgGA.dsp +++ b/VisualStudio/osgWrappers/osgGA/wrapper_osgGA.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgGA.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgGA.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgGA.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgGA.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgWrapper osgGA - Win32 Debug" @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgGAd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgGAd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgGAd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgGAd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ENDIF diff --git a/VisualStudio/osgWrappers/osgManipulator/wrapper_osgManipulator.dsp b/VisualStudio/osgWrappers/osgManipulator/wrapper_osgManipulator.dsp index c4785c238..393161ab5 100644 --- a/VisualStudio/osgWrappers/osgManipulator/wrapper_osgManipulator.dsp +++ b/VisualStudio/osgWrappers/osgManipulator/wrapper_osgManipulator.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgManipulator.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgManipulator.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgManipulator.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgManipulator.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgWrapper osgManipulator - Win32 Debug" @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgManipulatord.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgManipulatord.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgManipulatord.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgManipulatord.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ENDIF diff --git a/VisualStudio/osgWrappers/osgParticle/wrapper_osgParticle.dsp b/VisualStudio/osgWrappers/osgParticle/wrapper_osgParticle.dsp index 018f00c15..19756b395 100644 --- a/VisualStudio/osgWrappers/osgParticle/wrapper_osgParticle.dsp +++ b/VisualStudio/osgWrappers/osgParticle/wrapper_osgParticle.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgParticle.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgParticle.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgParticle.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgParticle.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgWrapper osgParticle - Win32 Debug" @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgParticled.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgParticled.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgParticled.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgParticled.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ENDIF diff --git a/VisualStudio/osgWrappers/osgProducer/wrapper_osgProducer.dsp b/VisualStudio/osgWrappers/osgProducer/wrapper_osgProducer.dsp deleted file mode 100644 index 2e100e1fc..000000000 --- a/VisualStudio/osgWrappers/osgProducer/wrapper_osgProducer.dsp +++ /dev/null @@ -1,137 +0,0 @@ -# Microsoft Developer Studio Project File - Name="osgWrapper osgProducer" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=osgWrapper osgProducer - 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 "wrapper_osgProducer.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 "wrapper_osgProducer.mak" CFG="osgWrapper osgProducer - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "osgWrapper osgProducer - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "osgWrapper osgProducer - 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)" == "osgWrapper osgProducer - 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 "../../../bin/$(PlatformName)" -# PROP Intermediate_Dir "$(PlatformName)/$(ConfigurationName)" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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 /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32.lib Producer.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgProducer.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgProducer.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" -# SUBTRACT LINK32 /nodefaultlib - -!ELSEIF "$(CFG)" == "osgWrapper osgProducer - 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 "../../../bin/$(PlatformName)" -# PROP Intermediate_Dir "$(PlatformName)/$(ConfigurationName)" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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 OpenThreadsWin32d.lib Producerd.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgProducerd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgProducerd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" -# SUBTRACT LINK32 /pdb:none /nodefaultlib - -!ENDIF - -# Begin Target - -# Name "osgWrapper osgProducer - Win32 Release" -# Name "osgWrapper osgProducer - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osgProducer\Export.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osgProducer\GraphicsContextImplementation.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osgProducer\KeyboardMouseCallback.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osgProducer\OsgCameraGroup.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osgProducer\OsgSceneHandler.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osgProducer\Viewer.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osgProducer\ViewerEventHandler.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/osgWrappers/osgShadow/wrapper_osgShadow.dsp b/VisualStudio/osgWrappers/osgShadow/wrapper_osgShadow.dsp index f5de1885d..10a0316ed 100644 --- a/VisualStudio/osgWrappers/osgShadow/wrapper_osgShadow.dsp +++ b/VisualStudio/osgWrappers/osgShadow/wrapper_osgShadow.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgShadow.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgShadow.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgShadow.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgShadow.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgWrapper osgShadow - Win32 Debug" @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgShadowd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgShadowd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgShadowd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgShadowd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ENDIF diff --git a/VisualStudio/osgWrappers/osgSim/wrapper_osgSim.dsp b/VisualStudio/osgWrappers/osgSim/wrapper_osgSim.dsp index 5ac77e12d..708baa5f1 100644 --- a/VisualStudio/osgWrappers/osgSim/wrapper_osgSim.dsp +++ b/VisualStudio/osgWrappers/osgSim/wrapper_osgSim.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgSim.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgSim.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgSim.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgSim.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgWrapper osgSim - Win32 Debug" @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgSimd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgSimd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgSimd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgSimd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ENDIF diff --git a/VisualStudio/osgWrappers/osgTerrain/wrapper_osgTerrain.dsp b/VisualStudio/osgWrappers/osgTerrain/wrapper_osgTerrain.dsp index 30e3d28e2..a5469167c 100644 --- a/VisualStudio/osgWrappers/osgTerrain/wrapper_osgTerrain.dsp +++ b/VisualStudio/osgWrappers/osgTerrain/wrapper_osgTerrain.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32.lib gdal_i.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgTerrain.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgTerrain.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32.lib gdal_i.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgTerrain.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgTerrain.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgWrapper osgTerrain - Win32 Debug" @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib gdal_iD.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgTerraind.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgTerraind.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib gdal_iD.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgTerraind.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgTerraind.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ENDIF diff --git a/VisualStudio/osgWrappers/osgText/wrapper_osgText.dsp b/VisualStudio/osgWrappers/osgText/wrapper_osgText.dsp index 9a1fcbbc9..2e2a7bf18 100644 --- a/VisualStudio/osgWrappers/osgText/wrapper_osgText.dsp +++ b/VisualStudio/osgWrappers/osgText/wrapper_osgText.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgText.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgText.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgText.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgText.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgWrapper osgText - Win32 Debug" @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgTextd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgTextd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgTextd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgTextd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ENDIF diff --git a/VisualStudio/osgWrappers/osgUtil/wrapper_osgUtil.dsp b/VisualStudio/osgWrappers/osgUtil/wrapper_osgUtil.dsp index 09be64f5f..398f55c61 100644 --- a/VisualStudio/osgWrappers/osgUtil/wrapper_osgUtil.dsp +++ b/VisualStudio/osgWrappers/osgUtil/wrapper_osgUtil.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgUtil.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgUtil.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgUtil.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgUtil.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgWrapper osgUtil - Win32 Debug" @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgUtild.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgUtild.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgUtild.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgUtild.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ENDIF diff --git a/VisualStudio/osgWrappers/osgViewer/wrapper_osgViewer.dsp b/VisualStudio/osgWrappers/osgViewer/wrapper_osgViewer.dsp index 9b8df95a3..1ca6a469e 100644 --- a/VisualStudio/osgWrappers/osgViewer/wrapper_osgViewer.dsp +++ b/VisualStudio/osgWrappers/osgViewer/wrapper_osgViewer.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgViewer.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgViewer.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgViewer.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgViewer.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgWrapper osgViewer - Win32 Debug" @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /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" @@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgViewerd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgViewerd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgViewerd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgViewerd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ENDIF diff --git a/VisualStudio/reset-64bit-outdirs.pl b/VisualStudio/reset-64bit-outdirs.pl index 5201f0a2c..41f454c7f 100755 --- a/VisualStudio/reset-64bit-outdirs.pl +++ b/VisualStudio/reset-64bit-outdirs.pl @@ -9,7 +9,7 @@ sub usage { "usage: $file [options] Resets the 64 bit OutputDirectory settings in the .vcproj files for -OpenSceneGraph, Producer, and OpenThreads to be the same as the Win32 +OpenSceneGraph and OpenThreads to be the same as the Win32 settings. This is a workaround for Visual Studio's annoying practice of generating this setting itself when creating the 64 bit configuration, rather than reusing the Win32 setting. @@ -58,8 +58,7 @@ sub callback { # cd to the directory containing this script, so paths below work properly chdir dirname($0); -my @directories = qw(../../OpenThreads/win32_src - ../../Producer/VC++7/Producer +my @directories = qw(../../OpenThreads/win32_src .); find(\&callback, @directories); diff --git a/Xcode/Misc/ArrangeDMG.sh b/Xcode/Misc/ArrangeDMG.sh index 0a844e067..ab54aae70 100644 --- a/Xcode/Misc/ArrangeDMG.sh +++ b/Xcode/Misc/ArrangeDMG.sh @@ -21,10 +21,6 @@ # Xcode/ # OpenThreads/ # OpenThreads.xcode -# Producer/ -# Xcode/ -# Producer/ -# Producer.xcode # OpenSceneGraph/ # Xcode/ # OpenSceneGraph/ @@ -37,7 +33,7 @@ # tarballs. # # You may place this script and run it from the same directory level -# that OpenThreads, Producer, and OpenSceneGraph exist in. +# that OpenThreads and OpenSceneGraph exist in. # ##################################################################### @@ -76,7 +72,6 @@ mkdir -p PackageDir/Resources echo "Copying Frameworks..." $COPY OpenThreads/Xcode/OpenThreads/build/$CONFIGURATION/OpenThreads.framework PackageDir/Frameworks -$COPY Producer/Xcode/Producer/build/$CONFIGURATION/Producer.framework PackageDir/Frameworks $COPY OpenSceneGraph/Xcode/OpenSceneGraph/build/$CONFIGURATION/osg*.framework PackageDir/Frameworks/ # Copy the gdal framework @@ -96,7 +91,6 @@ find -d PackageDir/XcodeTemplates -name CVS -exec rm -rf {} \; echo "Copying License and ReadMe files..." $COPY OpenThreads/COPYING.txt PackageDir/LICENSE_OpenThreads.txt -$COPY Producer/LICENSE.txt PackageDir/LICENSE_Producer.txt $COPY OpenSceneGraph/LICENSE.txt PackageDir/LICENSE_OSG.txt $COPY OpenSceneGraph/Xcode/OSX_OSG_README.rtf PackageDir diff --git a/Xcode/Misc/Build_OSG_OSX.sh b/Xcode/Misc/Build_OSG_OSX.sh index 77aeed94c..0141734be 100644 --- a/Xcode/Misc/Build_OSG_OSX.sh +++ b/Xcode/Misc/Build_OSG_OSX.sh @@ -3,7 +3,7 @@ ##################################################################### # Author: Eric Wing # -# This script will build OpenThreads, Producer, and OpenSceneGraph +# This script will build OpenThreads and OpenSceneGraph # (using the Xcode projects I created for each) and package up # the Frameworks and PlugIns into a disk image (.dmg) for # easy distribution. This script may be used towards automation @@ -18,10 +18,6 @@ # Xcode/ # OpenThreads/ # OpenThreads.xcode -# Producer/ -# Xcode/ -# Producer/ -# Producer.xcode # OpenSceneGraph/ # Xcode/ # OpenSceneGraph/ @@ -34,7 +30,7 @@ # tarballs. # # You may place this script and run it from the same directory level -# that OpenThreads, Producer, and OpenSceneGraph exist in. +# that OpenThreads and OpenSceneGraph exist in. # # The script will build each of the projects, and then move the built # files to a temporary subdirectory called PackageDir. A disk image (.dmg) @@ -54,12 +50,6 @@ # incomplete. Currently, optionally installed Plugins like Demeter # are not built. # -# Examples are even more problematic because they require the X11 -# system and currently cannot access the native Mac system. This -# makes double click launching impossible. However, when the -# day comes that Producer gets a native Mac backend, this will -# all fall into place. -# # To build everything, you must have the Apple Developer Tools installed # and you must also install Apple's X11 development package (if not # already installed). It can be found with the Developer Tools on the @@ -105,21 +95,6 @@ mkdir -p PackageDir/Examples ; ) -# Next build Producer - # xcodebuild is the commandline tool that can build Xcode projects. - # Specifying "clean build" will clean everything and then rebuild it. - # Just specifying "build" will only rebuild things that need it. -# xcodebuild -project Producer.xcode \ -# -buildstyle Deployment \ -(cd Producer/Xcode/Producer; \ - xcodebuild -project Producer.xcodeproj \ - -target Producer \ - -configuration $CONFIGURATION \ - $BUILDACTION \ - ; -) - - # Now build OpenSceneGraph with everything # xcodebuild is the commandline tool that can build Xcode projects. # Specifying "clean build" will clean everything and then rebuild it. @@ -145,14 +120,12 @@ mkdir -p PackageDir/Examples # Everything should be built now. Move all the things to be distrubuted # to the PackageDir with the appropriate layout. #$COPY OpenThreads/Xcode/OpenThreads/build/OpenThreads.framework PackageDir/Frameworks -#$COPY Producer/Xcode/Producer/build/Producer.framework PackageDir/Frameworks #$COPY OpenSceneGraph/Xcode/OpenSceneGraph/build/osg*.framework PackageDir/Frameworks/ #$COPY OpenSceneGraph/Xcode/OpenSceneGraph/build/*.so PackageDir/PlugIns/ #$COPY OpenSceneGraph/Xcode/OpenSceneGraph/build/*.app PackageDir/Examples/ $COPY OpenThreads/Xcode/OpenThreads/build/$CONFIGURATION/OpenThreads.framework PackageDir/Frameworks -$COPY Producer/Xcode/Producer/build/$CONFIGURATION/Producer.framework PackageDir/Frameworks $COPY OpenSceneGraph/Xcode/OpenSceneGraph/build/$CONFIGURATION/osg*.framework PackageDir/Frameworks/ $COPY OpenSceneGraph/Xcode/OpenSceneGraph/build/$CONFIGURATION/*.so PackageDir/PlugIns/ diff --git a/Xcode/Misc/Tar_Xcode.sh b/Xcode/Misc/Tar_Xcode.sh index d9713e201..c006bb1c3 100644 --- a/Xcode/Misc/Tar_Xcode.sh +++ b/Xcode/Misc/Tar_Xcode.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Must be run from the directory above OpenThreads, Producer, and OpenSceneGraph +# Must be run from the directory above OpenThreads and OpenSceneGraph (cd OpenThreads; \ @@ -8,11 +8,6 @@ tar -zcvf XcodeOpenThreads.tar.gz --exclude='*.pbxuser' --exclude='*.mode1' --exclude='*.perspective' --exclude='build' --exclude='.DS_Store' --exclude='CVS' Xcode/; ) -(cd Producer; \ - rm -f XcodeProducer.tar.gz - tar -zcvf XcodeProducer.tar.gz --exclude='*.pbxuser' --exclude='*.mode1' --exclude='*.perspective' --exclude='build' --exclude='.DS_Store' --exclude='CVS' Xcode/ -) - (cd OpenSceneGraph; \ rm -f XcodeOpenSceneGraph.tar.gz tar -zcvf XcodeOpenSceneGraph.tar.gz --exclude='*.pbxuser' --exclude='*.mode1' --exclude='*.perspective' --exclude='build' --exclude='.DS_Store' --exclude='CVS' Xcode/ @@ -20,19 +15,16 @@ rm -f md5list.txt md5 OpenThreads/XcodeOpenThreads.tar.gz >> md5list.txt -md5 Producer/XcodeProducer.tar.gz >> md5list.txt md5 OpenSceneGraph/XcodeOpenSceneGraph.tar.gz >> md5list.txt mkdir -p XcodePackageDir/Xcode rm -f XcodePackageDir/Xcode/XcodeOpenThreads.tar.gz -rm -f XcodePackageDir/Xcode/XcodeProducer.tar.gz rm -f XcodePackageDir/Xcode/XcodeOpenSceneGraph.tar.gz rm -f XcodePackageDir/Xcode/md5list.txt mv md5list.txt XcodePackageDir/Xcode/ cp OpenThreads/XcodeOpenThreads.tar.gz XcodePackageDir/Xcode/ -cp Producer/XcodeProducer.tar.gz XcodePackageDir/Xcode/ cp OpenSceneGraph/XcodeOpenSceneGraph.tar.gz XcodePackageDir/Xcode/ diff --git a/Xcode/OSX_OSG_README.rtf b/Xcode/OSX_OSG_README.rtf index 2f05491d9..248243c0c 100644 --- a/Xcode/OSX_OSG_README.rtf +++ b/Xcode/OSX_OSG_README.rtf @@ -11,7 +11,7 @@ \f0\b\fs24 \cf0 OpenSceneGraph on Mac OS X \f1\b0 \ \ -This is the readme for the entire OpenThreads/Producer/OpenSceneGraph distribution for the OS X frameworks and Xcode projects. This readme was originally written for the binary distribution, but there is a lot of useful information in here so it has also been included with the source code in the Xcode section. This was sync'd with the OSG 1.2 release.\ +This is the readme for the entire OpenThreads/OpenSceneGraph distribution for the OS X frameworks and Xcode projects. This readme was originally written for the binary distribution, but there is a lot of useful information in here so it has also been included with the source code in the Xcode section. This was sync'd with the OSG 1.2 release.\ \ The source code is available at {\field{\*\fldinst{HYPERLINK "http://www.openscenegraph.org/"}}{\fldrslt http://www.openscenegraph.org/}}\ \ @@ -110,8 +110,8 @@ If you are affected by this, please file a bug report at {\field{\*\fldinst{HYPE \f1\b0 \cf0 We are now distributing Universal Binaries. These binaries were built using Xcode 2.3 and gcc 4.0.1.\ The Xcode projects are also set to build as Universal Binaries for both Development and Deployment\ targets. If you do not need this and want to save build time, you should change the architecture option\ -to your desired setting (most likely to $(NATIVE_ARCH)). It is overridden in the top-level "OpenSceneGraph" project in the Group & Files panel. Don't forget to change OpenThreads and \ -Producer as well. (Quick tip: You can delete the modified (boldfaced) option by clicking on the - button.)\ +to your desired setting (most likely to $(NATIVE_ARCH)). It is overridden in the top-level "OpenSceneGraph" project in the Group & Files panel. Don't forget to change OpenThreads \ +as well. (Quick tip: You can delete the modified (boldfaced) option by clicking on the - button.)\ \ Apple documented the behavior of -Os in the Xcode 2.3 release, so we have changed the compiler optimizations (back) from -O3 to -Os. The hope was to shrink the binary size, but it didn't seem to have a large effect. Benchmarking still has not been done. (Volunteers?)\ \ @@ -148,7 +148,7 @@ With Apple's announcement of the Intel transition, Xcode 2.1 was released to hel \ Many thanks should be given to the people that have helped make these projects possible and for their contributions to make OSG run well on OS X through the multiyear run-up to 1.0. I unfortunately don't have a comprehensive list as many contributions have been submitted directly to OpenSceneGraph, but I wanted to give mention to these specific people I've had the pleasure of working with in trying to make this corner of the universe work.\ \ -James Hopper (work on native Aqua Producer, Xcode templates, GDAL frameworks)\ +James Hopper (work on Xcode templates, GDAL frameworks)\ David Guthrie (various patches, testing, Xcode project compiler options refinement)\ Jeremy Bell (original comprehensive discussion on OS X frameworks, patches)\ Stephen Travis Pope (provider of the OSG on OS X website)\ @@ -199,7 +199,7 @@ Also be aware that if using the 10.4 Universal SDK, you may have to explicitly s \f0\b Running the examples: \f1\b0 \ \ -Now that Producer supports a native Window manager, we have attempted to provide double clickable .app bundles. We cheat a little to keep the download size smaller by symbolically linking the Frameworks, PlugIns, and Resources directories for each .app bundle instead of giving each its own copy. This allows the apps to find their resources when trying to run directly from the .dmg without having to copy anything to your computer. \ +Now that osgViewer supports a native Window manager, we have attempted to provide double clickable .app bundles. We cheat a little to keep the download size smaller by symbolically linking the Frameworks, PlugIns, and Resources directories for each .app bundle instead of giving each its own copy. This allows the apps to find their resources when trying to run directly from the .dmg without having to copy anything to your computer. \ \ If you copy these examples out of .dmg, be aware that these symbolic links may or may not be able to find all the dependencies depending on factors such as retaining the directory structure of the .dmg, copying everything over, or what you installed to system locations.\ \ @@ -210,7 +210,7 @@ YourProgram.app/\ Frameworks/ (all the frameworks you depend on go in here)\ osg.framework\ osgDB.framework\ - Producer.framework\ + osgViewer.framework\ ...\ PlugIns/ (the plugins you need go in here)\ osgdb_freetype.so\ @@ -247,8 +247,7 @@ osgGA -seg1addr 0x2049a000\ osgIntrospection -seg1addr 0x204fd000\ osgSim -seg1addr 0x205f4000\ osgFX -seg1addr 0x20690000\ -Producer -seg1addr 0x20700000\ -osgProducer -seg1addr 0x20760000\ +osgViweer -seg1addr 0x20700000\ gdal -seg1addr 0x207d0000\ osgTerrain -seg1addr 0x20c40000 \f1 \ @@ -329,9 +328,7 @@ the standard places like /Library/Frameworks to not be searched.\ \f0\b Known Issues: \f1\b0 \ \ -There is one known serious bug that appears sometimes. With Xcode 2.0 and 2.1, in some cases when you build OpenThreads/Producer/OSG from scratch, when you run the examples, they will crash on load. The workaround seems to be to delete just the OpenThreads framework after everything is built. Then rebuild just the OpenThreads framework. Bug reports have been filed with Apple, but the root cause remains to be a mystery. (We have some guesses, but nothing substantial.) I have not yet seen this issue emerge with Xcode 2.2, so maybe the problem is fixed.\ -\ -The native Aqua back-end (AGL based) for Producer continues to improve, but it is not as rigorously tested as the X11 back-end. With the included examples, AGL Producer seems to work well enough. There has been one report of crashing with a dual screen setup using a Radeon 9800 in the release candidate phase which may or may not be fixed by the final OSG release. But if you are experiencing problems and you think the AGL implementation might be suspect, you should try swapping in the X11 back-end for comparison. However, for releasable products, you are strongly discouraged from basing your application around the X11 back-end as there are known limitations and critical bugs in Apple's X11 implementation itself which could potentially derail your entire project. Apple's X11 is only intended to help initial porting to OS X and is not intended as a final destination.\ +There is one known serious bug that appears sometimes. With Xcode 2.0 and 2.1, in some cases when you build OpenThreads/OSG from scratch, when you run the examples, they will crash on load. The workaround seems to be to delete just the OpenThreads framework after everything is built. Then rebuild just the OpenThreads framework. Bug reports have been filed with Apple, but the root cause remains to be a mystery. (We have some guesses, but nothing substantial.) I have not yet seen this issue emerge with Xcode 2.2, so maybe the problem is fixed.\ \ The osgdb_geo plugin is not big endian safe. The Makefile system does not build it for OS X. We have added it for the Xcode projects, but you probably shouldn't use it unless you're on Intel.\ \ @@ -352,9 +349,9 @@ Included with the OSG Xcode projects are some of the little scripts I used to he We're still looking for volunteers to help us write a new CMake based build system. Please contact me\ or the list if you are interested in helping implement the thing.\ \ -If you are developing with Leopard under the Apple software seed program, some areas of OpenSceneGraph and Producer are not 64-bit ready/clean. If you can help, please contact me. \ +If you are developing with Leopard under the Apple software seed program, some areas of OpenSceneGraph are not 64-bit ready/clean. If you can help, please contact me. \ \ -On a similar note, a Cocoa Producer back end would be very nice (and would avoid most of the 64-bit issues). Nothing on this end is being done currently, but if you have an interest in implementing such a thing, please contact me.\ +On a similar note, a Cocoa back end would be very nice (and would avoid most of the 64-bit issues). Nothing on this end is being done currently, but if you have an interest in implementing such a thing, please contact me.\ \ On the topic of feature requests, another potentially useful thing to have is a osgtext plugin that can load glyphs rendered by Apple instead of Freetype.\ \ @@ -364,4 +361,4 @@ On the topic of feature requests, another potentially useful thing to have is a ewing 2121 - at - yahoo (in the commercial domain)\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural {\field{\*\fldinst{HYPERLINK "http://www.create.ucsb.edu/OSG/"}}{\fldrslt \cf0 http://www.create.ucsb.edu/OSG/}}\ -} \ No newline at end of file +} diff --git a/Xcode/OpenSceneGraph/OpenSceneGraph.xcodeproj/project.pbxproj b/Xcode/OpenSceneGraph/OpenSceneGraph.xcodeproj/project.pbxproj index 741c6c97b..f6b487d41 100644 --- a/Xcode/OpenSceneGraph/OpenSceneGraph.xcodeproj/project.pbxproj +++ b/Xcode/OpenSceneGraph/OpenSceneGraph.xcodeproj/project.pbxproj @@ -190,7 +190,7 @@ buildConfigurationList = 0011038908736A190015C576 /* Build configuration list for PBXAggregateTarget "AllStandardTargets" */; buildPhases = ( ); - comments = "This will build all the standard OpenSceneGraph frameworks, plugins, and applications/examples.\nThis target will not build components that require 3rd party libraries such as osgTerrain (requires GDAL).\nSee specific targets for the 3rd party components.\n\nGDALdependentStuff is a new target that will build just GDAL dependent stuff.\n\nNew to the 2.1/2.2 projects is Cross-Project Dependencies. I now use the new 2.x Xcode feature to reference the OpenThreads and Producer projects. The advantage of this is that you should be able to run an application through Xcode without having to first remember to install the OpenThreads and Producer frameworks. There might be drawbacks to this though. It might be the case that you want to use the installed frameworks. I'm not sure what the search order will be or if it will even work. This is an area for testing. Also, in an attempt to minimize the dependency pain in case you need to undo this, I will only make the AllStandardTargets depend on those projects. If you need to undo this, you only need to remove the dependency option for that target.\n"; + comments = "This will build all the standard OpenSceneGraph frameworks, plugins, and applications/examples.\nThis target will not build components that require 3rd party libraries such as osgTerrain (requires GDAL).\nSee specific targets for the 3rd party components.\n\nGDALdependentStuff is a new target that will build just GDAL dependent stuff.\n\nNew to the 2.1/2.2 projects is Cross-Project Dependencies. I now use the new 2.x Xcode feature to reference the OpenThreads projects. The advantage of this is that you should be able to run an application through Xcode without having to first remember to install the OpenThreads frameworks. There might be drawbacks to this though. It might be the case that you want to use the installed frameworks. I'm not sure what the search order will be or if it will even work. This is an area for testing. Also, in an attempt to minimize the dependency pain in case you need to undo this, I will only make the AllStandardTargets depend on those projects. If you need to undo this, you only need to remove the dependency option for that target.\n"; dependencies = ( 00C6172C0924ECA40098F34F /* PBXTargetDependency */, 0040995F0924D075009ADD90 /* PBXTargetDependency */, @@ -366,7 +366,6 @@ 000A25C906CAD314009EE43A /* osgDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE1188E705D764C400EB53E5 /* osgDB.framework */; }; 000A25CA06CAD314009EE43A /* osgText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE11876A05D75C2700EB53E5 /* osgText.framework */; }; 000A25CB06CAD314009EE43A /* osgUtil.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE11849A05D7126100EB53E5 /* osgUtil.framework */; }; - 000A25CC06CAD314009EE43A /* osgProducer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0098F3140652ED84007615E2 /* osgProducer.framework */; }; 000A25CD06CAD314009EE43A /* osgGA.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00557CE00624A947000A808A /* osgGA.framework */; }; 000A25F006CAD627009EE43A /* osg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE117FB305D63B3800EB53E5 /* osg.framework */; }; 000A25F106CAD627009EE43A /* osgDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE1188E705D764C400EB53E5 /* osgDB.framework */; }; @@ -427,7 +426,6 @@ 000A270C06CAE6E6009EE43A /* osgDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE1188E705D764C400EB53E5 /* osgDB.framework */; }; 000A270D06CAE6E6009EE43A /* osgText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE11876A05D75C2700EB53E5 /* osgText.framework */; }; 000A270E06CAE6E6009EE43A /* osgUtil.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE11849A05D7126100EB53E5 /* osgUtil.framework */; }; - 000A270F06CAE6E6009EE43A /* osgProducer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0098F3140652ED84007615E2 /* osgProducer.framework */; }; 000A271006CAE6E6009EE43A /* osgGA.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00557CE00624A947000A808A /* osgGA.framework */; }; 000A271F06CAE6F2009EE43A /* osg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE117FB305D63B3800EB53E5 /* osg.framework */; }; 000A272006CAE6F2009EE43A /* osgDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE1188E705D764C400EB53E5 /* osgDB.framework */; }; @@ -1127,13 +1125,8 @@ 0040993B0924CD45009ADD90 /* OpenThreads.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099300924CC7D009ADD90 /* OpenThreads.framework */; }; 0040993C0924CD62009ADD90 /* OpenThreads.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099300924CC7D009ADD90 /* OpenThreads.framework */; }; 0040993D0924CD6A009ADD90 /* OpenThreads.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099300924CC7D009ADD90 /* OpenThreads.framework */; }; - 0040994D0924CE68009ADD90 /* Producer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099480924CE15009ADD90 /* Producer.framework */; }; - 004099540924CEC3009ADD90 /* Producer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099480924CE15009ADD90 /* Producer.framework */; }; - 004099550924CED1009ADD90 /* Producer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099480924CE15009ADD90 /* Producer.framework */; }; - 004099560924CEDE009ADD90 /* Producer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099480924CE15009ADD90 /* Producer.framework */; }; 004099570924CEE0009ADD90 /* OpenThreads.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099300924CC7D009ADD90 /* OpenThreads.framework */; }; 004099580924CEE9009ADD90 /* OpenThreads.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099300924CC7D009ADD90 /* OpenThreads.framework */; }; - 0040995A0924CEF6009ADD90 /* Producer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099480924CE15009ADD90 /* Producer.framework */; }; 0040995B0924CEF8009ADD90 /* OpenThreads.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099300924CC7D009ADD90 /* OpenThreads.framework */; }; 004099610924D088009ADD90 /* OpenThreads.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099300924CC7D009ADD90 /* OpenThreads.framework */; }; 004099620924D090009ADD90 /* OpenThreads.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099300924CC7D009ADD90 /* OpenThreads.framework */; }; @@ -1157,7 +1150,6 @@ 0040998C0924D1F1009ADD90 /* OpenThreads.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099300924CC7D009ADD90 /* OpenThreads.framework */; }; 0040998F0924D204009ADD90 /* OpenThreads.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099300924CC7D009ADD90 /* OpenThreads.framework */; }; 004099900924D20E009ADD90 /* OpenThreads.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099300924CC7D009ADD90 /* OpenThreads.framework */; }; - 004099920924D219009ADD90 /* Producer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099480924CE15009ADD90 /* Producer.framework */; }; 004099930924D21B009ADD90 /* OpenThreads.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099300924CC7D009ADD90 /* OpenThreads.framework */; }; 004099940924D223009ADD90 /* OpenThreads.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099300924CC7D009ADD90 /* OpenThreads.framework */; }; 004099970924D249009ADD90 /* OpenThreads.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099300924CC7D009ADD90 /* OpenThreads.framework */; }; @@ -1724,7 +1716,6 @@ 00A14C0D084E52BF000150AD /* osgDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE1188E705D764C400EB53E5 /* osgDB.framework */; }; 00A14C0E084E52BF000150AD /* osgText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE11876A05D75C2700EB53E5 /* osgText.framework */; }; 00A14C0F084E52BF000150AD /* osgUtil.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE11849A05D7126100EB53E5 /* osgUtil.framework */; }; - 00A14C10084E52BF000150AD /* osgProducer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0098F3140652ED84007615E2 /* osgProducer.framework */; }; 00A14C11084E52BF000150AD /* osgGA.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00557CE00624A947000A808A /* osgGA.framework */; }; 00A14C5C084E5674000150AD /* osgarchive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00A14C59084E5674000150AD /* osgarchive.cpp */; }; 00A14C89084E573D000150AD /* OrientationConverter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00A14C84084E573B000150AD /* OrientationConverter.cpp */; }; @@ -1734,7 +1725,6 @@ 00A14CA8084E580E000150AD /* osgDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE1188E705D764C400EB53E5 /* osgDB.framework */; }; 00A14CA9084E580E000150AD /* osgText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE11876A05D75C2700EB53E5 /* osgText.framework */; }; 00A14CAA084E580E000150AD /* osgUtil.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE11849A05D7126100EB53E5 /* osgUtil.framework */; }; - 00A14CAB084E580E000150AD /* osgProducer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0098F3140652ED84007615E2 /* osgProducer.framework */; }; 00A14CAC084E580E000150AD /* osgGA.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00557CE00624A947000A808A /* osgGA.framework */; }; 00A14CCD084E5821000150AD /* osg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE117FB305D63B3800EB53E5 /* osg.framework */; }; 00A14CCE084E5821000150AD /* osgDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE1188E705D764C400EB53E5 /* osgDB.framework */; }; @@ -1745,7 +1735,6 @@ 00A14CF4084E582E000150AD /* osgDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE1188E705D764C400EB53E5 /* osgDB.framework */; }; 00A14CF5084E582E000150AD /* osgText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE11876A05D75C2700EB53E5 /* osgText.framework */; }; 00A14CF6084E582E000150AD /* osgUtil.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE11849A05D7126100EB53E5 /* osgUtil.framework */; }; - 00A14CF7084E582E000150AD /* osgProducer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0098F3140652ED84007615E2 /* osgProducer.framework */; }; 00A14CF8084E582E000150AD /* osgGA.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00557CE00624A947000A808A /* osgGA.framework */; }; 00A14D55084E5A50000150AD /* osgviewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00A14D52084E5A50000150AD /* osgviewer.cpp */; }; 00A14D5C084E5ADC000150AD /* osgversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00A14D59084E5ADC000150AD /* osgversion.cpp */; }; @@ -2475,8 +2464,6 @@ D47A07050B83413800E19024 /* OpenThreads.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099300924CC7D009ADD90 /* OpenThreads.framework */; }; D47A07150B83417900E19024 /* osgmanipulator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D47A07120B83417900E19024 /* osgmanipulator.cpp */; }; D47A07240B8341AF00E19024 /* osgManipulator.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D47A06810B833F6E00E19024 /* osgManipulator.framework */; }; - D47A07D80B8341CF00E19024 /* osgProducer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0098F3140652ED84007615E2 /* osgProducer.framework */; }; - D47A07EF0B8341E800E19024 /* Producer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 004099480924CE15009ADD90 /* Producer.framework */; }; D48EC6500B4EBF2F000E05A4 /* CompositeViewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D48EC64B0B4EBF2E000E05A4 /* CompositeViewer.cpp */; }; D48EC6520B4EBF2F000E05A4 /* Scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D48EC64D0B4EBF2F000E05A4 /* Scene.cpp */; }; D48EC6530B4EBF2F000E05A4 /* View.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D48EC64E0B4EBF2F000E05A4 /* View.cpp */; }; @@ -2942,13 +2929,6 @@ remoteGlobalIDString = 00557CDF0624A947000A808A; remoteInfo = osgGA; }; - 001D06E7065AB7A5003310BF /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 0098F3130652ED84007615E2; - remoteInfo = osgProducer; - }; 001D0787065ABC45003310BF /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; @@ -3005,34 +2985,6 @@ remoteGlobalIDString = 8D07F2C80486CC7A007CD1D0; remoteInfo = OpenThreads; }; - 004099470924CE15009ADD90 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0040993E0924CE14009ADD90 /* Producer.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8DC2EF5B0486A6940098B216; - remoteInfo = Producer; - }; - 004099490924CE15009ADD90 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0040993E0924CE14009ADD90 /* Producer.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1FA4BAF908148C2500B03DEF; - remoteInfo = Producer_X11; - }; - 0040994B0924CE15009ADD90 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0040993E0924CE14009ADD90 /* Producer.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1FA4BB930814A28D00B03DEF; - remoteInfo = Producer_AGL; - }; - 0040995E0924D075009ADD90 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0040993E0924CE14009ADD90 /* Producer.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 8DC2EF4F0486A6940098B216; - remoteInfo = Producer; - }; 004BD03309273C2800A265A4 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; @@ -3089,13 +3041,6 @@ remoteGlobalIDString = 00557CDF0624A947000A808A; remoteInfo = osgGA; }; - 004E4D210A51FA4D00EC8521 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 0098F3130652ED84007615E2; - remoteInfo = osgProducer; - }; 004E4DE20A5208BD00EC8521 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; @@ -3369,13 +3314,6 @@ remoteGlobalIDString = 00557CDF0624A947000A808A; remoteInfo = osgGA; }; - 006CE94C0921AB8300985402 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 0098F3130652ED84007615E2; - remoteInfo = osgProducer; - }; 006CE9800921AC8700985402 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; @@ -3481,13 +3419,6 @@ remoteGlobalIDString = 00557CDF0624A947000A808A; remoteInfo = osgGA; }; - 006CE9C80921AD3300985402 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 0098F3130652ED84007615E2; - remoteInfo = osgProducer; - }; 006CE9DE0921AD7800985402 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; @@ -3663,13 +3594,6 @@ remoteGlobalIDString = 0055835A0624D1E5000A808A; remoteInfo = osgFX; }; - 006FD2FF065A89EC00677FA5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 0098F3130652ED84007615E2; - remoteInfo = osgProducer; - }; 006FD305065A8A1D00677FA5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; @@ -4734,13 +4658,6 @@ remoteGlobalIDString = 0055835A0624D1E5000A808A; remoteInfo = osgFX; }; - 6320CD5E07845CAE00FE3D2C /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 0098F3130652ED84007615E2; - remoteInfo = osgProducer; - }; D42FE6B00B5561FE0058A380 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; @@ -5519,7 +5436,6 @@ 001DFFFE065AA4BD003310BF /* tcb.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = tcb.h; path = ../../src/osgPlugins/lib3ds/tcb.h; sourceTree = SOURCE_ROOT; }; 001DFFFF065AA4BD003310BF /* tracks.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = tracks.cpp; path = ../../src/osgPlugins/lib3ds/tracks.cpp; sourceTree = SOURCE_ROOT; }; 0040992A0924CC7D009ADD90 /* OpenThreads.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OpenThreads.xcodeproj; path = ../../../OpenThreads/Xcode/OpenThreads/OpenThreads.xcodeproj; sourceTree = SOURCE_ROOT; }; - 0040993E0924CE14009ADD90 /* Producer.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Producer.xcodeproj; path = ../../../Producer/Xcode/Producer/Producer.xcodeproj; sourceTree = SOURCE_ROOT; }; 004BD02D09273BA200A265A4 /* IO_ConnectedParticleSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = IO_ConnectedParticleSystem.cpp; sourceTree = ""; }; 004BD02E09273BA300A265A4 /* IO_SmokeTrailEffect.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = IO_SmokeTrailEffect.cpp; sourceTree = ""; }; 004BD03E09273C2800A265A4 /* osgdb_geo.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = osgdb_geo.so; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -5850,7 +5766,6 @@ 0096C5FA0919637300B255F2 /* OverlayNode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = OverlayNode.cpp; sourceTree = ""; }; 0096C5FC0919639A00B255F2 /* GraphicsContextImplementation.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsContextImplementation.cpp; sourceTree = ""; }; 0096F7A40AAE093C0093E9C7 /* PublicMemberAccessor */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = PublicMemberAccessor; sourceTree = ""; }; - 0098F3140652ED84007615E2 /* osgProducer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = osgProducer.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 0098F3510652F041007615E2 /* Export */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; path = Export; sourceTree = ""; }; 0098F3520652F041007615E2 /* KeyboardMouseCallback */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; path = KeyboardMouseCallback; sourceTree = ""; }; 0098F3530652F041007615E2 /* OsgCameraGroup */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; path = OsgCameraGroup; sourceTree = ""; }; @@ -5858,12 +5773,6 @@ 0098F3550652F041007615E2 /* Version */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; path = Version; sourceTree = ""; }; 0098F3560652F041007615E2 /* Viewer */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; path = Viewer; sourceTree = ""; }; 0098F3570652F041007615E2 /* ViewerEventHandler */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; path = ViewerEventHandler; sourceTree = ""; }; - 0098F37A0652F05F007615E2 /* KeyboardMouseCallback.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = KeyboardMouseCallback.cpp; path = ../../src/osgProducer/KeyboardMouseCallback.cpp; sourceTree = SOURCE_ROOT; }; - 0098F37B0652F05F007615E2 /* OsgCameraGroup.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = OsgCameraGroup.cpp; path = ../../src/osgProducer/OsgCameraGroup.cpp; sourceTree = SOURCE_ROOT; }; - 0098F37C0652F05F007615E2 /* OsgSceneHandler.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = OsgSceneHandler.cpp; path = ../../src/osgProducer/OsgSceneHandler.cpp; sourceTree = SOURCE_ROOT; }; - 0098F37D0652F05F007615E2 /* Version.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = Version.cpp; path = ../../src/osgProducer/Version.cpp; sourceTree = SOURCE_ROOT; }; - 0098F37E0652F05F007615E2 /* Viewer.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = Viewer.cpp; path = ../../src/osgProducer/Viewer.cpp; sourceTree = SOURCE_ROOT; }; - 0098F37F0652F05F007615E2 /* ViewerEventHandler.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ViewerEventHandler.cpp; path = ../../src/osgProducer/ViewerEventHandler.cpp; sourceTree = SOURCE_ROOT; }; 009D9F88081D717F001FA987 /* BlendEquation */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = BlendEquation; path = ../../include/osg/BlendEquation; sourceTree = SOURCE_ROOT; }; 009D9F89081D717F001FA987 /* BufferObject */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = BufferObject; path = ../../include/osg/BufferObject; sourceTree = SOURCE_ROOT; }; 009D9F8A081D717F001FA987 /* io_utils */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = io_utils; path = ../../include/osg/io_utils; sourceTree = SOURCE_ROOT; }; @@ -6795,10 +6704,8 @@ 000A25C906CAD314009EE43A /* osgDB.framework in Frameworks */, 000A25CA06CAD314009EE43A /* osgText.framework in Frameworks */, 000A25CB06CAD314009EE43A /* osgUtil.framework in Frameworks */, - 000A25CC06CAD314009EE43A /* osgProducer.framework in Frameworks */, 000A25CD06CAD314009EE43A /* osgGA.framework in Frameworks */, 0040993D0924CD6A009ADD90 /* OpenThreads.framework in Frameworks */, - 004099550924CED1009ADD90 /* Producer.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -6923,10 +6830,8 @@ 000A270C06CAE6E6009EE43A /* osgDB.framework in Frameworks */, 000A270D06CAE6E6009EE43A /* osgText.framework in Frameworks */, 000A270E06CAE6E6009EE43A /* osgUtil.framework in Frameworks */, - 000A270F06CAE6E6009EE43A /* osgProducer.framework in Frameworks */, 000A271006CAE6E6009EE43A /* osgGA.framework in Frameworks */, 00A6946006CBD6FB00F26612 /* osgFX.framework in Frameworks */, - 004099920924D219009ADD90 /* Producer.framework in Frameworks */, 004099930924D21B009ADD90 /* OpenThreads.framework in Frameworks */, 00FB21660B0168960052DD79 /* osgViewer.framework in Frameworks */, ); @@ -7775,7 +7680,6 @@ 0098F4140652F2CF007615E2 /* osgUtil.framework in Frameworks */, 0098F4910652F773007615E2 /* osgGA.framework in Frameworks */, 0040993A0924CD3E009ADD90 /* OpenThreads.framework in Frameworks */, - 0040994D0924CE68009ADD90 /* Producer.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -7797,10 +7701,8 @@ 00A14C0D084E52BF000150AD /* osgDB.framework in Frameworks */, 00A14C0E084E52BF000150AD /* osgText.framework in Frameworks */, 00A14C0F084E52BF000150AD /* osgUtil.framework in Frameworks */, - 00A14C10084E52BF000150AD /* osgProducer.framework in Frameworks */, 00A14C11084E52BF000150AD /* osgGA.framework in Frameworks */, 0040993C0924CD62009ADD90 /* OpenThreads.framework in Frameworks */, - 004099540924CEC3009ADD90 /* Producer.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -7812,11 +7714,9 @@ 00A14CA8084E580E000150AD /* osgDB.framework in Frameworks */, 00A14CA9084E580E000150AD /* osgText.framework in Frameworks */, 00A14CAA084E580E000150AD /* osgUtil.framework in Frameworks */, - 00A14CAB084E580E000150AD /* osgProducer.framework in Frameworks */, 00A14CAC084E580E000150AD /* osgGA.framework in Frameworks */, 00A15420084FE3FA000150AD /* osgTerrain.framework in Frameworks */, 00099C840874D2EE0054CA01 /* osgFX.framework in Frameworks */, - 0040995A0924CEF6009ADD90 /* Producer.framework in Frameworks */, 0040995B0924CEF8009ADD90 /* OpenThreads.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -7843,9 +7743,7 @@ 00A14CF4084E582E000150AD /* osgDB.framework in Frameworks */, 00A14CF5084E582E000150AD /* osgText.framework in Frameworks */, 00A14CF6084E582E000150AD /* osgUtil.framework in Frameworks */, - 00A14CF7084E582E000150AD /* osgProducer.framework in Frameworks */, 00A14CF8084E582E000150AD /* osgGA.framework in Frameworks */, - 004099560924CEDE009ADD90 /* Producer.framework in Frameworks */, 004099570924CEE0009ADD90 /* OpenThreads.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -8429,8 +8327,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D47A07EF0B8341E800E19024 /* Producer.framework in Frameworks */, - D47A07D80B8341CF00E19024 /* osgProducer.framework in Frameworks */, D47A07240B8341AF00E19024 /* osgManipulator.framework in Frameworks */, D47A07000B83413800E19024 /* osg.framework in Frameworks */, D47A07010B83413800E19024 /* osgDB.framework in Frameworks */, @@ -9741,16 +9637,6 @@ name = Products; sourceTree = ""; }; - 0040993F0924CE14009ADD90 /* Products */ = { - isa = PBXGroup; - children = ( - 004099480924CE15009ADD90 /* Producer.framework */, - 0040994A0924CE15009ADD90 /* Producer_X11.framework */, - 0040994C0924CE15009ADD90 /* Producer_AGL.framework */, - ); - name = Products; - sourceTree = ""; - }; 004BD04A09273CFB00A265A4 /* geo */ = { isa = PBXGroup; children = ( @@ -10310,37 +10196,6 @@ path = ../../examples/osgvolume; sourceTree = SOURCE_ROOT; }; - 0098F34F0652F041007615E2 /* osgProducer */ = { - isa = PBXGroup; - children = ( - 0098F3510652F041007615E2 /* Export */, - 0096C5F30919628500B255F2 /* GraphicsContextImplementation */, - 0098F3520652F041007615E2 /* KeyboardMouseCallback */, - 0098F3530652F041007615E2 /* OsgCameraGroup */, - 0098F3540652F041007615E2 /* OsgSceneHandler */, - 0098F3550652F041007615E2 /* Version */, - 0098F3560652F041007615E2 /* Viewer */, - 0098F3570652F041007615E2 /* ViewerEventHandler */, - ); - name = osgProducer; - path = ../../include/osgProducer; - sourceTree = SOURCE_ROOT; - }; - 0098F3660652F05F007615E2 /* osgProducer */ = { - isa = PBXGroup; - children = ( - 0096C5FC0919639A00B255F2 /* GraphicsContextImplementation.cpp */, - 0098F37A0652F05F007615E2 /* KeyboardMouseCallback.cpp */, - 0098F37B0652F05F007615E2 /* OsgCameraGroup.cpp */, - 0098F37C0652F05F007615E2 /* OsgSceneHandler.cpp */, - 0098F37D0652F05F007615E2 /* Version.cpp */, - 0098F37E0652F05F007615E2 /* Viewer.cpp */, - 0098F37F0652F05F007615E2 /* ViewerEventHandler.cpp */, - ); - name = osgProducer; - path = ../../src/osgProducer; - sourceTree = SOURCE_ROOT; - }; 00A149EB084D517F000150AD /* osgIntrospection */ = { isa = PBXGroup; children = ( @@ -10838,7 +10693,6 @@ 00557FC40624B86F000A808A /* osgParticle.framework */, 005580E10624BBB3000A808A /* osgSim.framework */, 0055835B0624D1E5000A808A /* osgFX.framework */, - 0098F3140652ED84007615E2 /* osgProducer.framework */, 6320CD4307845BC300FE3D2C /* osgTerrain.framework */, 008F44D306CC023A00F4220C /* osgdb_trans.so */, 001DFCAC065A901A003310BF /* osgdb_3dc.so */, @@ -10999,7 +10853,6 @@ isa = PBXGroup; children = ( 0040992A0924CC7D009ADD90 /* OpenThreads.xcodeproj */, - 0040993E0924CE14009ADD90 /* Producer.xcodeproj */, BE1182CF05D64A5900EB53E5 /* OpenGL.framework */, 00638D83093B9B87002722CD /* GLUT.framework */, 00638E11093B9E5A002722CD /* Cocoa.framework */, @@ -11044,7 +10897,6 @@ 00FB210F0B015F4A0052DD79 /* osgViewer */, D4C6F28F0B83171D0052E667 /* osgShadow */, D47A06B90B83406500E19024 /* osgManipulator */, - 0098F3660652F05F007615E2 /* osgProducer */, 6320CCFE07845B7C00FE3D2C /* osgTerrain */, 00558606062622D8000A808A /* osgPlugins */, ); @@ -11214,7 +11066,6 @@ 005583610624D208000A808A /* osgFX */, 00A149EB084D517F000150AD /* osgIntrospection */, 00FB21160B0160380052DD79 /* osgViewer */, - 0098F34F0652F041007615E2 /* osgProducer */, 6320CCF60784580300FE3D2C /* osgTerrain */, D4C6F26C0B8316D50052E667 /* osgShadow */, D47A068E0B83404300E19024 /* osgManipulator */, @@ -15177,29 +15028,6 @@ productReference = 008F452206CC05A500F4220C /* osgvolume.app */; productType = "com.apple.product-type.application"; }; - 0098F3130652ED84007615E2 /* osgProducer */ = { - isa = PBXNativeTarget; - buildConfigurationList = 001101C508736A190015C576 /* Build configuration list for PBXNativeTarget "osgProducer" */; - buildPhases = ( - 0098F30F0652ED84007615E2 /* Headers */, - 0098F3100652ED84007615E2 /* Resources */, - 0098F3110652ED84007615E2 /* Sources */, - 0098F3120652ED84007615E2 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - 0098F45B0652F417007615E2 /* PBXTargetDependency */, - 0098F45D0652F417007615E2 /* PBXTargetDependency */, - 0098F4610652F417007615E2 /* PBXTargetDependency */, - 0098F45F0652F417007615E2 /* PBXTargetDependency */, - 0098F4950652F783007615E2 /* PBXTargetDependency */, - ); - name = osgProducer; - productName = osgProducer; - productReference = 0098F3140652ED84007615E2 /* osgProducer.framework */; - productType = "com.apple.product-type.framework"; - }; 009DA08D081D7AB7001FA987 /* osgIntrospection */ = { isa = PBXNativeTarget; buildConfigurationList = 001101C108736A190015C576 /* Build configuration list for PBXNativeTarget "osgIntrospection" */; @@ -16237,10 +16065,6 @@ ProductGroup = 0040992B0924CC7D009ADD90 /* Products */; ProjectRef = 0040992A0924CC7D009ADD90 /* OpenThreads.xcodeproj */; }, - { - ProductGroup = 0040993F0924CE14009ADD90 /* Products */; - ProjectRef = 0040993E0924CE14009ADD90 /* Producer.xcodeproj */; - }, ); targets = ( 006FD302065A8A1600677FA5 /* AllStandardTargets */, @@ -16257,7 +16081,6 @@ 005580E00624BBB3000A808A /* osgSim */, 0055835A0624D1E5000A808A /* osgFX */, 00FB20D00B015CF10052DD79 /* osgViewer */, - 0098F3130652ED84007615E2 /* osgProducer */, D4C6F2320B8316100052E667 /* osgShadow */, 6320CD0307845BC300FE3D2C /* osgTerrain */, D47A06550B833F6E00E19024 /* osgManipulator */, @@ -16412,27 +16235,6 @@ remoteRef = 0040992F0924CC7D009ADD90 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 004099480924CE15009ADD90 /* Producer.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Producer.framework; - remoteRef = 004099470924CE15009ADD90 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 0040994A0924CE15009ADD90 /* Producer_X11.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Producer_X11.framework; - remoteRef = 004099490924CE15009ADD90 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 0040994C0924CE15009ADD90 /* Producer_AGL.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Producer_AGL.framework; - remoteRef = 0040994B0924CE15009ADD90 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -19494,11 +19296,6 @@ target = BE1188E605D764C400EB53E5 /* osgDB */; targetProxy = 001DFD06065A932A003310BF /* PBXContainerItemProxy */; }; - 0040995F0924D075009ADD90 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = Producer; - targetProxy = 0040995E0924D075009ADD90 /* PBXContainerItemProxy */; - }; 004BD03209273C2800A265A4 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = BE1188E605D764C400EB53E5 /* osgDB */; @@ -19539,11 +19336,6 @@ target = 00557CDF0624A947000A808A /* osgGA */; targetProxy = 004E4D1F0A51FA4D00EC8521 /* PBXContainerItemProxy */; }; - 004E4D200A51FA4D00EC8521 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 0098F3130652ED84007615E2 /* osgProducer */; - targetProxy = 004E4D210A51FA4D00EC8521 /* PBXContainerItemProxy */; - }; 004E4DE30A5208BD00EC8521 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 004E4CFA0A51F84900EC8521 /* osgdb_bsp */; @@ -19739,11 +19531,6 @@ target = 00557CDF0624A947000A808A /* osgGA */; targetProxy = 006CE94A0921AB8300985402 /* PBXContainerItemProxy */; }; - 006CE94B0921AB8300985402 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 0098F3130652ED84007615E2 /* osgProducer */; - targetProxy = 006CE94C0921AB8300985402 /* PBXContainerItemProxy */; - }; 006CE97F0921AC8700985402 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = BE117FB205D63B3800EB53E5 /* osg */; @@ -19819,11 +19606,6 @@ target = 00557CDF0624A947000A808A /* osgGA */; targetProxy = 006CE9C60921AD3300985402 /* PBXContainerItemProxy */; }; - 006CE9C70921AD3300985402 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 0098F3130652ED84007615E2 /* osgProducer */; - targetProxy = 006CE9C80921AD3300985402 /* PBXContainerItemProxy */; - }; 006CE9DD0921AD7800985402 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = BE117FB205D63B3800EB53E5 /* osg */; @@ -19949,11 +19731,6 @@ target = 0055835A0624D1E5000A808A /* osgFX */; targetProxy = 006E257C0AC124E200FBB48F /* PBXContainerItemProxy */; }; - 006FD300065A89EC00677FA5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 0098F3130652ED84007615E2 /* osgProducer */; - targetProxy = 006FD2FF065A89EC00677FA5 /* PBXContainerItemProxy */; - }; 006FD306065A8A1D00677FA5 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 005988A50652DB9D003D6AA1 /* osgFrameworks */; @@ -20199,11 +19976,6 @@ target = 00557CDF0624A947000A808A /* osgGA */; targetProxy = 001D06E5065AB7A5003310BF /* PBXContainerItemProxy */; }; - 00A14C07084E52BF000150AD /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 0098F3130652ED84007615E2 /* osgProducer */; - targetProxy = 001D06E7065AB7A5003310BF /* PBXContainerItemProxy */; - }; 00A14C78084E56B6000150AD /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 00A14C01084E52BF000150AD /* osgarchive */; @@ -20264,11 +20036,6 @@ target = 00557CDF0624A947000A808A /* osgGA */; targetProxy = 001D06E5065AB7A5003310BF /* PBXContainerItemProxy */; }; - 00A14CEE084E582E000150AD /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 0098F3130652ED84007615E2 /* osgProducer */; - targetProxy = 001D06E7065AB7A5003310BF /* PBXContainerItemProxy */; - }; 00A14D71084E5B21000150AD /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 00A14CC2084E5821000150AD /* osgviewer */; @@ -20324,11 +20091,6 @@ target = 00557CDF0624A947000A808A /* osgGA */; targetProxy = 001D06E5065AB7A5003310BF /* PBXContainerItemProxy */; }; - 00A14F00084E65A9000150AD /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 0098F3130652ED84007615E2 /* osgProducer */; - targetProxy = 001D06E7065AB7A5003310BF /* PBXContainerItemProxy */; - }; 00A14F18084E65B3000150AD /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = BE117FB205D63B3800EB53E5 /* osg */; @@ -20354,11 +20116,6 @@ target = 00557CDF0624A947000A808A /* osgGA */; targetProxy = 001D06E5065AB7A5003310BF /* PBXContainerItemProxy */; }; - 00A14F1D084E65B3000150AD /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 0098F3130652ED84007615E2 /* osgProducer */; - targetProxy = 001D06E7065AB7A5003310BF /* PBXContainerItemProxy */; - }; 00A14F93084E6704000150AD /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 00A14F17084E65B3000150AD /* osglogicop */; @@ -20939,11 +20696,6 @@ target = 00557CDF0624A947000A808A /* osgGA */; targetProxy = 001D06E5065AB7A5003310BF /* PBXContainerItemProxy */; }; - 00F23930076776E700528CDD /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 0098F3130652ED84007615E2 /* osgProducer */; - targetProxy = 001D06E7065AB7A5003310BF /* PBXContainerItemProxy */; - }; 00F23A1307678DB800528CDD /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 00F238DE0767730700528CDD /* osgblendequation */; @@ -21054,11 +20806,6 @@ target = 0055835A0624D1E5000A808A /* osgFX */; targetProxy = 6320CD5C07845CAE00FE3D2C /* PBXContainerItemProxy */; }; - 6320CD5F07845CAE00FE3D2C /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 0098F3130652ED84007615E2 /* osgProducer */; - targetProxy = 6320CD5E07845CAE00FE3D2C /* PBXContainerItemProxy */; - }; D42FE6B10B5561FE0058A380 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 00FB20D00B015CF10052DD79 /* osgViewer */; @@ -22063,118 +21810,6 @@ }; name = Default; }; - 001101C608736A190015C576 /* Development */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - DEBUGGING_SYMBOLS = YES; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - FRAMEWORK_VERSION = A; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ""; - GCC_PREPROCESSOR_DEFINITIONS = __USE_OSX_AGL_IMPLEMENTATION__; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = YES; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - HEADER_SEARCH_PATHS = ( - ../../../Producer/include, - "$(inherited)", - ); - INFOPLIST_FILE = "osgProducer-Info.plist"; - INSTALL_PATH = "@executable_path/../Frameworks"; - OTHER_CFLAGS = ""; - OTHER_CPLUSPLUSFLAGS = ""; - OTHER_LDFLAGS = ( - "-seg1addr", - 0x20760000, - "-framework", - OpenThreads, - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = osgProducer; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; - }; - name = Development; - }; - 001101C708736A190015C576 /* Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_POSTPROCESSING = YES; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ""; - GCC_PREPROCESSOR_DEFINITIONS = __USE_OSX_AGL_IMPLEMENTATION__; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = YES; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - HEADER_SEARCH_PATHS = ( - ../../../Producer/include, - "$(inherited)", - ); - INFOPLIST_FILE = "osgProducer-Info.plist"; - INSTALL_PATH = "@executable_path/../Frameworks"; - OTHER_CFLAGS = ""; - OTHER_CPLUSPLUSFLAGS = ""; - OTHER_LDFLAGS = ( - "-seg1addr", - 0x20760000, - "-framework", - OpenThreads, - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = osgProducer; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; - }; - name = Deployment; - }; - 001101C808736A190015C576 /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - FRAMEWORK_VERSION = A; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ""; - GCC_PREPROCESSOR_DEFINITIONS = __USE_OSX_CGL_IMPLEMENTATION__; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - HEADER_SEARCH_PATHS = ( - ../../../Producer/include, - "$(inherited)", - ); - INFOPLIST_FILE = "osgProducer-Info.plist"; - INSTALL_PATH = "@executable_path/../Frameworks"; - OTHER_CFLAGS = ""; - OTHER_CPLUSPLUSFLAGS = ""; - OTHER_LDFLAGS = ( - "-seg1addr", - 0x20760000, - "-framework", - OpenThreads, - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = osgProducer; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; - }; - name = Default; - }; 001101CA08736A190015C576 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { @@ -32398,9 +32033,6 @@ ../../../OpenThreads/Xcode/OpenThreads/build, ../../../OpenThreads/Xcode/OpenThreads/build/Development, ../../../OpenThreads/Xcode/OpenThreads/build/Deployment, - ../../../Producer/Xcode/Producer/build, - ../../../Producer/Xcode/Producer/build/Development, - ../../../Producer/Xcode/Producer/build/Deployment, "$(HOME)/Library/Frameworks", /Library/Frameworks, ); @@ -32439,9 +32071,6 @@ ../../../OpenThreads/Xcode/OpenThreads/build, ../../../OpenThreads/Xcode/OpenThreads/build/Deployment, ../../../OpenThreads/Xcode/OpenThreads/build/Development, - ../../../Producer/Xcode/Producer/build, - ../../../Producer/Xcode/Producer/build/Deployment, - ../../../Producer/Xcode/Producer/build/Development, "$(HOME)/Library/Frameworks", /Library/Frameworks, ); @@ -32477,9 +32106,6 @@ ../../../OpenThreads/Xcode/OpenThreads/build, "$(HOME)/Library/Frameworks", /Library/Frameworks, - ../../../Producer/Xcode/Producer/build, - "$(HOME)/Library/Frameworks", - /Library/Frameworks, ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; @@ -34966,10 +34592,7 @@ GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = YES; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - ../../../Producer/include, - ); + HEADER_SEARCH_PATHS = ("$(inherited)"); INFOPLIST_FILE = "osgmanipulatorexample-Info.plist"; INSTALL_PATH = "$(USER_APPS_DIR)"; OTHER_CFLAGS = ""; @@ -35001,7 +34624,7 @@ GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; HEADER_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = "osgmanipulatorexample-Info.plist"; + INFOPLIST_FILE = "osgshadow-Info.plist"; INSTALL_PATH = "$(USER_APPS_DIR)"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( @@ -35322,16 +34945,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Default; }; - 001101C508736A190015C576 /* Build configuration list for PBXNativeTarget "osgProducer" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 001101C608736A190015C576 /* Development */, - 001101C708736A190015C576 /* Deployment */, - 001101C808736A190015C576 /* Default */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Default; - }; 001101C908736A190015C576 /* Build configuration list for PBXAggregateTarget "osgFrameworks" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/Xcode/OpenSceneGraph/osgProducer-Info.plist b/Xcode/OpenSceneGraph/osgProducer-Info.plist deleted file mode 100644 index 02f95bb8f..000000000 --- a/Xcode/OpenSceneGraph/osgProducer-Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - osgProducer - CFBundleGetInfoString - - CFBundleIdentifier - org.OpenSceneGraph.osgProducer - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - FMWK - CFBundleShortVersionString - - CFBundleSignature - ???? - CFBundleVersion - 1.2.0 - - diff --git a/Xcode/XcodeTemplates/OSG Application/OSGApp.pbproj/project.pbxproj b/Xcode/XcodeTemplates/OSG Application/OSGApp.pbproj/project.pbxproj index 0d1177707..589b19fb2 100755 --- a/Xcode/XcodeTemplates/OSG Application/OSGApp.pbproj/project.pbxproj +++ b/Xcode/XcodeTemplates/OSG Application/OSGApp.pbproj/project.pbxproj @@ -283,16 +283,8 @@ 1FF61109082F118D004EB1E4 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; - name = osgProducer.framework; - path = /Library/Frameworks/osgProducer.framework; - refType = 0; - sourceTree = ""; - }; - 1FF6110A082F118D004EB1E4 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.framework; - name = Producer.framework; - path = /Library/Frameworks/Producer.framework; + name = osgViewer.framework; + path = /Library/Frameworks/osgViewer.framework; refType = 0; sourceTree = ""; }; diff --git a/Xcode/XcodeTemplates/OSG Application/main.cpp b/Xcode/XcodeTemplates/OSG Application/main.cpp index b5ab3ef74..853125094 100644 --- a/Xcode/XcodeTemplates/OSG Application/main.cpp +++ b/Xcode/XcodeTemplates/OSG Application/main.cpp @@ -4,12 +4,12 @@ #include #include #include -#include +#include #include int main() { - osgProducer::Viewer viewer; + osgViewer::Viewer viewer; osg::Group* root = new osg::Group(); osg::Geode* pyramidGeode = new osg::Geode(); osg::Geometry* pyramidGeometry = new osg::Geometry(); @@ -154,17 +154,7 @@ int main() //The final step is to set up and enter a simulation loop. - viewer.setUpViewer(osgProducer::Viewer::STANDARD_SETTINGS); viewer.setSceneData( root ); - viewer.realize(); - - while( !viewer.done() ) - { - viewer.sync(); - viewer.update(); - viewer.frame(); - } - - return 0; + return viewer.run(); } diff --git a/Xcode/XcodeTemplates/OSG Application/osgApp_Prefix.pch b/Xcode/XcodeTemplates/OSG Application/osgApp_Prefix.pch index abd200b9f..701dc9494 100644 --- a/Xcode/XcodeTemplates/OSG Application/osgApp_Prefix.pch +++ b/Xcode/XcodeTemplates/OSG Application/osgApp_Prefix.pch @@ -17,7 +17,7 @@ /* Put all your C++ headers inside the __cplusplus guard. */ #ifdef __cplusplus -/* You may not need the OpenThreads and Producer headers for your project. +/* You may not need the OpenThreads headers for your project. * In those cases, you can comment out these blocks if you wish. */ #include @@ -27,26 +27,6 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include #include #include @@ -310,14 +290,9 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include #include #include diff --git a/Xcode/Xcode_OSG_Instructions.rtf b/Xcode/Xcode_OSG_Instructions.rtf index 6c24b8de2..5af8d675c 100644 --- a/Xcode/Xcode_OSG_Instructions.rtf +++ b/Xcode/Xcode_OSG_Instructions.rtf @@ -40,14 +40,6 @@ \f3 \uc0\u8232 \'ca\'ca\'ca\'ca\'ca\'ca\'ca\'ca \f2 OpenThreads.xcodeproj \f3 \uc0\u8232 \'ca\'ca -\f2 Producer/ -\f3 \uc0\u8232 \'ca\'ca\'ca\'ca -\f2 Xcode/ -\f3 \uc0\u8232 \'ca\'ca\'ca\'ca\'ca\'ca -\f2 Producer/ -\f3 \uc0\u8232 \'ca\'ca\'ca\'ca\'ca\'ca\'ca\'ca -\f2 Producer.xcodeproj -\f3 \uc0\u8232 \'ca\'ca \f2 OpenSceneGraph/ \f3 \uc0\u8232 \'ca\'ca\'ca\'ca \f2 Xcode/ @@ -61,7 +53,7 @@ \f0\b\fs20 \cf0 Step 3 - Build it\ \pard\pardeftab720\sa260\ql\qnatural -\f1\b0\fs26 \cf0 Now use Xcode to build each of the projects. You should build OpenThreads first, Producer second, and OpenSceneGraph last. If you are using the Xcode 2.1+ projects, there is a cross-project dependency rule already setup for you in the OpenSceneGraph.xcodeproj called "AllStandardTargets" target. If you use this target, you can skip going to the other two projects and just go directly to OpenSceneGraph and it will build OpenThreads and Producer for you automatically.\ +\f1\b0\fs26 \cf0 Now use Xcode to build each of the projects. You should build OpenThreads first and OpenSceneGraph last. If you are using the Xcode 2.1+ projects, there is a cross-project dependency rule already setup for you in the OpenSceneGraph.xcodeproj called "AllStandardTargets" target. If you use this target, you can skip going to the other two projects and just go directly to OpenSceneGraph and it will build OpenThreads for you automatically.\ You may want to set the build style to Deployment depending on what you are doing. The OpenSceneGraph project gives you multiple targets to select from so you may build everything, or just pieces you want.\ The binaries will be written to the Xcode build subdirectory (following standard Xcode behavior).\ To "Install" the Frameworks, you may move the Frameworks to a standard location.\uc0\u8232 ~/Library/Frameworks (for a single user)\u8232 /Library/Frameworks (for system wide installation)\u8232 /Network/Library/Frameworks (for those who understand when this should be used)\u8232 Or you may place them inside your application bundle e.g.\u8232 YourApp.app/Contents/Frameworks\u8232 Simply drag and drop the frameworks to the desired location.\u8232 \u8232 Similarly, to "Install" the Plugins, move the .so files to\u8232 ~/Library/Application Support/OpenSceneGraph/PlugIns\u8232 /Library/Application Support/OpenSceneGraph/PlugIns\u8232 /Network/Library/Application Support/OpenSceneGraph/PlugIns\u8232 Or you may place the ones you need inside your application bundle e.g.\u8232 YourApp.app/Contents/PlugIns\ @@ -85,9 +77,8 @@ To "Install" the Frameworks, you may move the Frameworks to a standard location. \f0\b\fs28 \cf0 Issues\ \pard\pardeftab720\sa260\ql\qnatural -\f1\b0\fs26 \cf0 There is a serious bug that appears sometimes when you build OpenThreads/Producer/OSG from scratch. When you run the examples, they will crash on load. If you encounter this problem, the workaround seems to be to delete just the OpenThreads framework after everything is built. Then rebuild just the OpenThreads framework. Bug reports have been filed with Apple, but the root cause remains to be a mystery. (We have some guesses, but nothing substantial.) So far the problem has not materialized yet for Xcode 2.2, so the problem may finally be resolved.\ +\f1\b0\fs26 \cf0 There is a serious bug that appears sometimes when you build OpenThreads/OSG from scratch. When you run the examples, they will crash on load. If you encounter this problem, the workaround seems to be to delete just the OpenThreads framework after everything is built. Then rebuild just the OpenThreads framework. Bug reports have been filed with Apple, but the root cause remains to be a mystery. (We have some guesses, but nothing substantial.) So far the problem has not materialized yet for Xcode 2.2, so the problem may finally be resolved.\ Currently frameworks, plugins, and executables that have non-standard dependencies such as osgTerrain are not built. There is a target called GDALdependentStuff which will build all the GDAL dependent stuff. You must have the GDAL framework installed for this to work. This target is not built by default so you must select it manually. \ -The new native Aqua backend for Producer has improved dramatically from the previous release, but it is still a work in progress. For example, cmd/option clicking may lead to strange behavior and/or a crash. (This only affects you when you use the actual keys. A mutli-button mouse doesn't seem to have this problem.) If you have feedback or can contribute to its development, Don Burns (author of Producer/co-author of OSG) would like to hear from you.\ By OS X conventions, resources (data files like images, models, fonts, etc) should be placed in your application bundles Contents/Resources directory. This behavior is not in the osg sources so we have patched the source to do so. You must apply our patch until osg accepts and includes this modification in the official source.\ Many examples require command line parameters. This makes double clicking useless. For those examples, you must run them on the command line. You may use Terminal instead of X11 if you wish.\uc0\u8232 Example:\u8232 \f2\fs21\fsmilli10563 ./osgreflect.app/Contents/MacOS/osgreflect cessna.osg @@ -114,12 +105,10 @@ osgGA -seg1addr 0x2049a000\ osgIntrospection -seg1addr 0x204fd000\ osgSim -seg1addr 0x205f4000\ osgFX -seg1addr 0x20690000\ -Producer -seg1addr 0x20700000\ -osgProducer -seg1addr 0x20760000\ gdal -seg1addr 0x207d0000\ osgTerrain -seg1addr 0x20c40000\ \ \pard\pardeftab720\sa260\ql\qnatural \f1\fs26 \cf0 These values work under Xcode 2.2 with autovectorization and -O3 so in theory, there should be some leeway if you use smaller build options. However, we encountered some strangeness under Xcode 2.0/gcc 4.0 where the binaries were even larger, but using -Os. This did not happen under the OSG 0.9.9 release. But we're hopeful that under Xcode 1.5/gcc 3.3, these addresses will just work.\ -} \ No newline at end of file +} diff --git a/applications/osgproducerviewer/GNUmakefile b/applications/osgproducerviewer/GNUmakefile deleted file mode 100644 index 97ad3bc1d..000000000 --- a/applications/osgproducerviewer/GNUmakefile +++ /dev/null @@ -1,18 +0,0 @@ -TOPDIR = ../.. -include $(TOPDIR)/Make/makedefs - -CXXFILES =\ - osgproducerviewer.cpp\ - -LIBS += -losgProducer -lProducer -losgText -losgGA -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) - -INSTFILES = \ - $(CXXFILES)\ - GNUmakefile.inst=GNUmakefile - -EXEC = osgproducerviewer - -INC += $(X_INC) - -include $(TOPDIR)/Make/makerules - diff --git a/applications/osgproducerviewer/GNUmakefile.inst b/applications/osgproducerviewer/GNUmakefile.inst deleted file mode 100644 index 9505fce4d..000000000 --- a/applications/osgproducerviewer/GNUmakefile.inst +++ /dev/null @@ -1,13 +0,0 @@ -TOPDIR = ../.. -include $(TOPDIR)/Make/makedefs - -CXXFILES =\ - osgproducerviewer.cpp\ - -LIBS += --losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) - -EXEC = osgproducerviewer - -INC += $(X_INC) - -include $(TOPDIR)/Make/makerules diff --git a/applications/osgproducerviewer/osgproducerviewer.cpp b/applications/osgproducerviewer/osgproducerviewer.cpp deleted file mode 100644 index 7c45396a7..000000000 --- a/applications/osgproducerviewer/osgproducerviewer.cpp +++ /dev/null @@ -1,127 +0,0 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2007 Robert Osfield - * - * This application is open source and may be redistributed and/or modified - * freely and without restriction, both in commericial and non commericial applications, - * as long as this copyright notice is maintained. - * - * This application is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -*/ - -#include -#include -#include -#include - -int main(int argc, char **argv) -{ - // use an ArgumentParser object to manage the program arguments. - osg::ArgumentParser arguments(&argc,argv); - - // set up the usage document, in case we need to print out how to use this program. - arguments.getApplicationUsage()->setApplicationName(arguments.getApplicationName()); - arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the standard OpenSceneGraph example which loads and visualises 3d models."); - arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] filename ..."); - arguments.getApplicationUsage()->addCommandLineOption("--image ","Load an image and render it on a quad"); - arguments.getApplicationUsage()->addCommandLineOption("--dem ","Load an image/DEM and render it on a HeightField"); - arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display command line parameters"); - arguments.getApplicationUsage()->addCommandLineOption("--help-env","Display environmental variables available"); - arguments.getApplicationUsage()->addCommandLineOption("--help-keys","Display keyboard & mouse bindings available"); - arguments.getApplicationUsage()->addCommandLineOption("--help-all","Display all command line, env vars and keyboard & mouse bindings."); - - - // construct the viewer. - osgProducer::Viewer viewer(arguments); - - // set up the value with sensible default event handlers. - viewer.setUpViewer(osgProducer::Viewer::STANDARD_SETTINGS); - - // get details on keyboard and mouse bindings used by the viewer. - viewer.getUsage(*arguments.getApplicationUsage()); - - // if user request help write it out to cout. - bool helpAll = arguments.read("--help-all"); - unsigned int helpType = ((helpAll || arguments.read("-h") || arguments.read("--help"))? osg::ApplicationUsage::COMMAND_LINE_OPTION : 0 ) | - ((helpAll || arguments.read("--help-env"))? osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE : 0 ) | - ((helpAll || arguments.read("--help-keys"))? osg::ApplicationUsage::KEYBOARD_MOUSE_BINDING : 0 ); - if (helpType) - { - arguments.getApplicationUsage()->write(std::cout, helpType); - return 1; - } - - // report any errors if they have occurred when parsing the program arguments. - if (arguments.errors()) - { - arguments.writeErrorMessages(std::cout); - return 1; - } - - if (arguments.argc()<=1) - { - arguments.getApplicationUsage()->write(std::cout,osg::ApplicationUsage::COMMAND_LINE_OPTION); - return 1; - } - - osg::Timer_t start_tick = osg::Timer::instance()->tick(); - - // read the scene from the list of file specified command line args. - osg::ref_ptr loadedModel = osgDB::readNodeFiles(arguments); - - // if no model has been successfully loaded report failure. - if (!loadedModel) - { - std::cout << arguments.getApplicationName() <<": No data loaded" << std::endl; - return 1; - } - - // any option left unread are converted into errors to write out later. - arguments.reportRemainingOptionsAsUnrecognized(); - - // report any errors if they have occurred when parsing the program arguments. - if (arguments.errors()) - { - arguments.writeErrorMessages(std::cout); - } - - osg::Timer_t end_tick = osg::Timer::instance()->tick(); - - std::cout << "Time to load = "<delta_s(start_tick,end_tick)<getKeyboardMouse(); - if (!km) return false; - - if (cameraNum>=viewer->getNumberOfCameras()) return false; - - Producer::Camera* camera=viewer->getCamera(cameraNum); - Producer::RenderSurface* rs = camera->getRenderSurface(); - - Producer::InputArea* inputArea = km->getInputArea(); - if( inputArea != NULL ) - { - // first locate which InputRectange is appropriate for specified RenderSurface. - unsigned int i; - for(i=0;igetNumRenderSurfaces();++i) - { - if (inputArea->getRenderSurface(i)==rs) break; - } - - // the RenderSurface isn't in the InputArea list.. therefore cannot make mouse coords to it. - if (i==inputArea->getNumRenderSurfaces()) return false; - - // we have a valid InputRectangle - Producer::RenderSurface::InputRectangle ir = inputArea->getRenderSurface(i)->getInputRectangle(); - - float rx = (x-ir.left())/ir.width(); - float ry = (y-ir.bottom())/ir.height(); - - int wx, wy; - unsigned int w, h; - rs->getWindowRectangle( wx, wy, w, h ); - - pixel_x = ((float)w)* rx; - pixel_y = ((float)h)* ry; - } - else - { - float rx = (x+1.0f)*0.5f; - float ry = (y+1.0f)*0.5f; - - int wx, wy; - unsigned int w, h; - rs->getWindowRectangle( wx, wy, w, h ); - - pixel_x = ((float)w)* rx; - pixel_y = ((float)h)* ry; - } - return true; -} -#endif - osg::Node* addDraggerToScene(osg::Node* scene, osgManipulator::CommandManager* cmdMgr, const std::string& name) { scene->getOrCreateStateSet()->setMode(GL_NORMALIZE, osg::StateAttribute::ON); diff --git a/examples/osgunittests/GNUmakefile.inst b/examples/osgunittests/GNUmakefile.inst index 46e563355..1be1df1fa 100644 --- a/examples/osgunittests/GNUmakefile.inst +++ b/examples/osgunittests/GNUmakefile.inst @@ -11,8 +11,4 @@ LIBS += -losgText -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) EXEC = osgunittests - -INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) -LDFLAGS += $(PRODUCER_LIB_DIR) - include $(TOPDIR)/Make/makerules diff --git a/genwrapper.conf b/genwrapper.conf index 25a29aa6c..6340b59dd 100644 --- a/genwrapper.conf +++ b/genwrapper.conf @@ -5,12 +5,6 @@ ############################################################################# -configure library "osgProducer" - dependency win32-debug "Producerd.lib" - dependency win32-release "Producer.lib" - dependency unix "-losgUtil -losgDB -lProducer -losgGA -losgText" -end - configure library "osgFX" dependency unix "-losgUtil -losgDB" end @@ -287,10 +281,6 @@ suppress reflector "osgDB::Output" # some types are incorrectly detected as value type or object type. Here we # specify the type kind explicitly -configure reflector "osgProducer::KeyboardMouseCallback" - object-type -end - configure reflector "osgDB::ReentrantMutex" object-type end diff --git a/include/osgProducer/Export b/include/osgProducer/Export deleted file mode 100644 index 54c02359c..000000000 --- a/include/osgProducer/Export +++ /dev/null @@ -1,53 +0,0 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield - * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or - * (at your option) any later version. The full license is in LICENSE file - * included with this distribution, and on the openscenegraph.org website. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * OpenSceneGraph Public License for more details. -*/ - -// The following symbol has a underscore suffix for compatibility. -#ifndef OSGPRODUCER_EXPORT_ -#define OSGPRODUCER_EXPORT_ 1 - -#if defined(WIN32) && !(defined(__CYGWIN__) || defined(__MINGW32__)) - #pragma warning( disable : 4244 ) - #pragma warning( disable : 4251 ) - #pragma warning( disable : 4267 ) - #pragma warning( disable : 4275 ) - #pragma warning( disable : 4290 ) - #pragma warning( disable : 4786 ) - #pragma warning( disable : 4305 ) - #pragma warning( disable : 4996 ) -#endif - -#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # if defined( OSG_LIBRARY_STATIC ) - # define OSGPRODUCER_EXPORT - # elif defined( OSGPRODUCER_LIBRARY ) - # define OSGPRODUCER_EXPORT __declspec(dllexport) - # else - # define OSGPRODUCER_EXPORT __declspec(dllimport) - #endif -#else - #define OSGPRODUCER_EXPORT -#endif - -/** - -\namespace osgProducer - -The osgProducer is a utility library integrates OpenProducer to provide a general purpose viewer classes. -osgProducer is used by all the OpenSceneGraph examples, and can also be used for client application development. - -Note, the core scene graph libraries and NodeKits are entirely Windowing API agnostic so you are free to implement -your own integration with whichever Windowing toolkit you prefer. -*/ - -#endif - diff --git a/include/osgProducer/GraphicsContextImplementation b/include/osgProducer/GraphicsContextImplementation deleted file mode 100644 index 358ae4b4e..000000000 --- a/include/osgProducer/GraphicsContextImplementation +++ /dev/null @@ -1,84 +0,0 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield - * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or - * (at your option) any later version. The full license is in LICENSE file - * included with this distribution, and on the openscenegraph.org website. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * OpenSceneGraph Public License for more details. -*/ - -#ifndef OSGPRODUCER_GRAPHICSCONTEXTIMPLEMENTATION -#define OSGPRODUCER_GRAPHICSCONTEXTIMPLEMENTATION 1 - - -#include - -#include - -#include - - - -namespace osgProducer { - -class OSGPRODUCER_EXPORT GraphicsContextImplementation : public osg::GraphicsContext -{ - public : - - /** Construct a graphics context to specified traits.*/ - GraphicsContextImplementation(Traits* traits); - - /** Construct a graphics context with specified RenderSurface.*/ - GraphicsContextImplementation(Producer::RenderSurface* rs); - - /** Return true of graphics context is realized.*/ - - /** Return the RenderSurface that implements the graphics context.*/ - Producer::RenderSurface* getRenderSurface() { return _rs.get(); } - - /** Return the const RenderSurface that implements the graphics context.*/ - const Producer::RenderSurface* getRenderSurface() const { return _rs.get(); } - - /** Return whether a valid and usable GraphicsContext has been created - assume success.*/ - virtual bool valid() const { return true; } - - /** Realise the GraphicsContext.*/ - virtual bool realizeImplementation(); - - /** Return true if the graphics context has been realised and is ready to use.*/ - virtual bool isRealizedImplementation() const { return _rs.valid() && _rs->isRealized(); } - - /** Close the graphics context.*/ - virtual void closeImplementation(); - - /** Make this graphics context current.*/ - virtual bool makeCurrentImplementation(); - - /** Make this graphics context current with specified read context.*/ - virtual bool makeContextCurrentImplementation(osg::GraphicsContext* readContext); - - /** Release the graphics context.*/ - virtual bool releaseContextImplementation(); - - /** Bind the graphics context to associated texture.*/ - virtual void bindPBufferToTextureImplementation(GLenum buffer); - - /** swap the front and back buffers.*/ - virtual void swapBuffersImplementation(); - - - protected: - - virtual ~GraphicsContextImplementation(); - - bool _closeOnDestruction; - osg::ref_ptr _rs; -}; - -} - -#endif diff --git a/include/osgProducer/KeyboardMouseCallback b/include/osgProducer/KeyboardMouseCallback deleted file mode 100644 index c0c99d072..000000000 --- a/include/osgProducer/KeyboardMouseCallback +++ /dev/null @@ -1,103 +0,0 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield - * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or - * (at your option) any later version. The full license is in LICENSE file - * included with this distribution, and on the openscenegraph.org website. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * OpenSceneGraph Public License for more details. -*/ - -#ifndef OSGPRODUCER_EVENTCALLBACK -#define OSGPRODUCER_EVENTCALLBACK 1 - -#include - -#include // To disable MSVC warnings - -#include // For definition of KeySymbol -#include -#include - -#include -#include - -namespace osgProducer { - - -class OSGPRODUCER_EXPORT KeyboardMouseCallback : public Producer::KeyboardMouseCallback -{ - public: - KeyboardMouseCallback(Producer::KeyboardMouse* keyboardMouse, bool &done, bool escapeKeySetsDone=true); - - virtual ~KeyboardMouseCallback() {} - - // override KeyboardMouseCallback methods. - virtual void mouseScroll( Producer::KeyboardMouseCallback::ScrollingMotion sm ); - virtual void mouseScroll2D( float, float); - virtual void penPressure(float pressure); - virtual void penProximity(Producer::KeyboardMouseCallback::TabletPointerType, bool); - virtual void mouseMotion( float mx, float my); - virtual void passiveMouseMotion( float mx, float my); - virtual void mouseWarp( float mx, float my); - - virtual void buttonPress( float mx, float my, unsigned int mbutton ); - virtual void doubleButtonPress( float mx, float my, unsigned int mbutton); - virtual void buttonRelease( float mx, float my, unsigned int mbutton ); - - virtual void keyPress( Producer::KeyCharacter key ); - virtual void keyRelease( Producer::KeyCharacter key ); - - virtual void specialKeyPress( Producer::KeyCharacter key); - virtual void specialKeyRelease( Producer::KeyCharacter key); - - virtual void windowConfig( int x, int y, unsigned int width, unsigned int height ); - - virtual void shutdown(); - - - void setEscapeSetDone(bool esc) { _escapeKeySetsDone = esc; } - bool getEscapeSetDone() const { return _escapeKeySetsDone; } - - - // local methods and members - typedef osgGA::EventQueue::Events EventQueue; - - void setEventQueue(osgGA::EventQueue* eventQueue) { _eventQueue = eventQueue; } - osgGA::EventQueue* getEventQueue() { return _eventQueue.get(); } - - bool takeEventQueue(EventQueue& queue); - bool copyEventQueue(EventQueue& queue) const; - void setEventQueue(EventQueue& queue); - void appendEventQueue(EventQueue& queue); - - bool done() const { return _done; } - - double getTime() const { return _eventQueue->getTime(); } - - Producer::KeyboardMouse* getKeyboardMouse() { return _keyboardMouse; } - const Producer::KeyboardMouse* getKeyboardMouse() const { return _keyboardMouse; } - - osgGA::GUIEventAdapter* createEventAdapter(); - - void updateWindowSize(); - - protected: - - - Producer::KeyboardMouse* _keyboardMouse; - float _mx, _my; - unsigned int _mbutton; - bool &_done; - bool _escapeKeySetsDone; - - osg::ref_ptr _eventQueue; - -}; - -} - -#endif diff --git a/include/osgProducer/OsgCameraGroup b/include/osgProducer/OsgCameraGroup deleted file mode 100644 index 58eff37a8..000000000 --- a/include/osgProducer/OsgCameraGroup +++ /dev/null @@ -1,258 +0,0 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield - * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or - * (at your option) any later version. The full license is in LICENSE file - * included with this distribution, and on the openscenegraph.org website. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * OpenSceneGraph Public License for more details. -*/ - -#ifndef OSGPRODUCER_OSGCAMERAGROUP_H -#define OSGPRODUCER_OSGCAMERAGROUP_H 1 - - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -namespace osgProducer { - -class OSGPRODUCER_EXPORT OsgCameraGroup : public Producer::CameraGroup -{ - public : - - typedef Producer::CameraGroup::ThreadModel ThreadingModel; - - OsgCameraGroup(); - - OsgCameraGroup(Producer::CameraConfig *cfg); - - OsgCameraGroup(const std::string& configFile); - - OsgCameraGroup(osg::ArgumentParser& arguments); - - virtual ~OsgCameraGroup(); - - - void setApplicationUsage(osg::ApplicationUsage* au) { _applicationUsage = au; } - - osg::ApplicationUsage* getApplicationUsage() { return _applicationUsage; } - - const osg::ApplicationUsage* getApplicationUsage() const { return _applicationUsage; } - - - typedef std::vector< osg::ref_ptr > GraphicsContextList; - - void setGraphicsContextList(GraphicsContextList& gcList) { _gcList = gcList; } - - GraphicsContextList& getGraphicsContextList() { return _gcList;} - - const GraphicsContextList& getGraphicsContextList() const { return _gcList;} - - - typedef std::vector < Producer::ref_ptr > SceneHandlerList; - - SceneHandlerList& getSceneHandlerList() { return _shvec;} - - const SceneHandlerList& getSceneHandlerList() const { return _shvec;} - - /** Set the scene data to be rendered. The scene graph traversal during - * rendering will start at the node passed as parameter. - * @param scene The node to be used as the starting point during the - * rendering traversal of the scene graph. - */ - void setSceneData( osg::Node *scene ); - - /** Get the scene data being used for rendering. - * @return The node being used as the starting point during the - * rendering traversal of the scene graph. - */ - osg::Node *getSceneData() { return _scene_data.get(); } - - const osg::Node *getSceneData() const { return _scene_data.get(); } - - - - void setSceneDecorator( osg::Group* decorator); - - osg::Group* getSceneDecorator() { return _scene_decorator.get(); } - - const osg::Group* getSceneDecorator() const { return _scene_decorator.get(); } - - - osg::Node* getTopMostSceneData(); - - const osg::Node* getTopMostSceneData() const; - - - /** Update internal structures w.r.t updated scene data.*/ - virtual void updatedSceneData(); - - - void setDisplaySettings( osg::DisplaySettings *ds ) { _ds = ds; } - - osg::DisplaySettings *getDisplaySettings() { return _ds.get(); } - - const osg::DisplaySettings *getDisplaySettings() const { return _ds.get(); } - - void setCullSettings( const osg::CullSettings& cs) { _cullSettings = cs; } - - osg::CullSettings& getCullSettings() { return _cullSettings; } - - const osg::CullSettings& getCullSettings() const { return _cullSettings; } - - - - void setFrameStamp( osg::FrameStamp* fs ); - - osg::FrameStamp *getFrameStamp() { return _frameStamp.get(); } - - const osg::FrameStamp *getFrameStamp() const { return _frameStamp.get(); } - - - void setGlobalStateSet( osg::StateSet *sset ); - - osg::StateSet *getGlobalStateSet() { return _global_stateset.get(); } - - const osg::StateSet *getGlobalStateSet() const { return _global_stateset.get(); } - - - void setClearColor( const osg::Vec4& clearColor ); - - const osg::Vec4& getClearColor() const; - - - void setLODScale( float scale ); - - float getLODScale() const; - - void setFusionDistance( osgUtil::SceneView::FusionDistanceMode mode,float value=1.0f); - - - /** Set the options to set up SceneView with, see osgUtil::SceneView::Options for available options.*/ - void setRealizeSceneViewOptions(unsigned int options) { _realizeSceneViewOptions = options; } - - /** Get the options to set up SceneView with.*/ - unsigned int getRealizeSceneViewOptions() { return _realizeSceneViewOptions; } - - /** Set whether processor affinity should be enable where supported by hardware.*/ - void setEnableProcessorAffinityHint(bool enableProccessAffinityHint) { _enableProccessAffinityHint = enableProccessAffinityHint; } - - /** Get whether processor affinity should be enable where supported by hardware.*/ - bool getEnableProcessorAffinityHint() const { return _enableProccessAffinityHint; } - - - /** RealizeCallback class one should override to provide an the implemention of realize callbacks. - * Note, this callback overrides the normal call to OsgSceneHandler::init() so it become the your - * responisibility to call this within your callback if required, it is a safe assumption to - * always call OsgSceneHandler::init() within your callback..*/ - class OSGPRODUCER_EXPORT RealizeCallback : public osg::Referenced - { - public: - virtual void operator()( OsgCameraGroup& cg, OsgSceneHandler& sh, const Producer::RenderSurface & rs) = 0; - - protected: - virtual ~RealizeCallback(); // {} - }; - - /** Set the realize callback to use when once the render surfaces are realized.*/ - void setRealizeCallback( RealizeCallback* cb) { _realizeCallback = cb; } - - /** Get the realize callback.*/ - RealizeCallback* getRealizeCallback() { return _realizeCallback.get(); } - - /** Get the const realize callback.*/ - const RealizeCallback* getRealizeCallback() const { return _realizeCallback.get(); } - - - void advance(); - - /** Set the threading model and then call realize().*/ - virtual bool realize(ThreadingModel thread_model ); - - /** Realize the render surfaces (OpenGL graphics) and various threads, and call any realize callbacks.*/ - virtual bool realize(); - - /** Set the model view matrix of the camera group, - * by individually set all the camera groups's camera.*/ - virtual void setView(const osg::Matrixd& matrix); - - /** Get the model view martrix of the camera group, - * taking its value for camera 0.*/ - osg::Matrixd getViewMatrix() const; - - - virtual void sync(); - - /** Dispatch the cull and draw for each of the Camera's for this frame.*/ - virtual void frame(); - - - /** Dispatch a clean up frame that should be called before closing a OsgCameraGroup, i.e. on exit from an app. - * The clean up frame first release all GL objects associated with all the graphics context associated with - * the camera group, then runs a special frame that does the actual OpenGL deletion of GL objects for each - * graphics context. */ - virtual void cleanup_frame(); - - - protected : - - - virtual void setUpSceneViewsWithData(); - - - osg::ApplicationUsage* _applicationUsage; - - osg::ref_ptr _scene_data; - osg::ref_ptr _scene_decorator; - - osg::ref_ptr _global_stateset; - osg::Vec4 _clear_color; - - osgUtil::SceneView::FusionDistanceMode _fusionDistanceMode; - float _fusionDistanceValue; - - unsigned int _realizeSceneViewOptions; - - GraphicsContextList _gcList; - SceneHandlerList _shvec; - - osg::ref_ptr _view; - - osg::ref_ptr _realizeCallback; - - osg::ref_ptr _ds; - bool _initialized; - - osg::CullSettings _cullSettings; - - unsigned int _frameNumber; - osg::Timer _timer; - osg::Timer_t _start_tick; - osg::ref_ptr _frameStamp; - - bool _enableProccessAffinityHint; - - void _init(); -}; - -} - -#endif diff --git a/include/osgProducer/OsgSceneHandler b/include/osgProducer/OsgSceneHandler deleted file mode 100644 index 78ca03548..000000000 --- a/include/osgProducer/OsgSceneHandler +++ /dev/null @@ -1,148 +0,0 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield - * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or - * (at your option) any later version. The full license is in LICENSE file - * included with this distribution, and on the openscenegraph.org website. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * OpenSceneGraph Public License for more details. -*/ - -#ifndef OSGPRODUCER_OSGSCENEHANDLER -#define OSGPRODUCER_OSGSCENEHANDLER 1 - -#include -#include -#include - -#include - -#include - - - -namespace osgProducer { - -class OSGPRODUCER_EXPORT OsgSceneHandler : public Producer::Camera::SceneHandler -{ - public : - - OsgSceneHandler(osg::DisplaySettings *ds = NULL); - - /// set the scene view to which will manage rendering of the OSG scene. - void setSceneView(osgUtil::SceneView* sceneView) { _sceneView = sceneView; } - - /// get the scene view. - osgUtil::SceneView* getSceneView() { return _sceneView.get(); } - - /// get the const scene view. - const osgUtil::SceneView* getSceneView() const { return _sceneView.get(); } - - /// override the init method to force it be run one at a time. - virtual void init(); - - - class Callback : public osg::Referenced - { - public: - virtual ~Callback() {} - virtual void operator()(OsgSceneHandler&, Producer::Camera &) = 0; - }; - - virtual void clear(Producer::Camera& camera) - { - if (_clearCallback.valid()) (*_clearCallback)(*this,camera); - else clearImplementation(camera); - } - - virtual void clearImplementation(Producer::Camera& camera); - - void setClearCallback(Callback* callback) { _clearCallback = callback; } - Callback* getClearCallback() { return _clearCallback.get(); } - const Callback* getClearCallback() const { return _clearCallback.get(); } - - - virtual void cull(Producer::Camera& camera) - { - if (_cullCallback.valid()) (*_cullCallback)(*this,camera); - else cullImplementation(camera); - } - - virtual void cullImplementation(Producer::Camera& camera); - - void setCullCallback(Callback* callback) { _cullCallback = callback; } - Callback* getCullCallback() { return _cullCallback.get(); } - const Callback* getCullCallback() const { return _cullCallback.get(); } - - virtual void draw(Producer::Camera& camera) - { - if (_cleanUpOnNextFrame) - { - _sceneView->flushAllDeletedGLObjects(); - _flushOfAllDeletedGLObjectsOnNextFrame = false; - _cleanUpOnNextFrame = false; - } - else - { - if (_flushOfAllDeletedGLObjectsOnNextFrame && _sceneView.valid()) - { - _sceneView->flushAllDeletedGLObjects(); - } - - if (_drawCallback.valid()) (*_drawCallback)(*this,camera); - else drawImplementation(camera); - - _flushOfAllDeletedGLObjectsOnNextFrame = false; - } - } - - virtual void drawImplementation(Producer::Camera& camera); - - void setDrawCallback(Callback* callback) { _drawCallback = callback; } - Callback* getDrawCallback() { return _drawCallback.get(); } - const Callback* getDrawCallback() const { return _drawCallback.get(); } - - void setCollectStats(bool collectStats) { _collectStats = collectStats; } - bool getCollectStats() const { return _collectStats; } - - bool getStats(osgUtil::Statistics& primStats); - - void setContextID( int id ); - - void setFlushOfAllDeletedGLObjectsOnNextFrame(bool flag) { _flushOfAllDeletedGLObjectsOnNextFrame = flag; } - - bool getFlushOfAllDeletedGLObjectsOnNextFrame() const { return _flushOfAllDeletedGLObjectsOnNextFrame; } - - void setCleanUpOnNextFrame(bool flag) { _cleanUpOnNextFrame = flag; } - - bool getCleanUpOnNextFrame() const { return _cleanUpOnNextFrame; } - - protected: - - virtual ~OsgSceneHandler() {} - - - OpenThreads::Mutex _cullMutex; - - osg::ref_ptr _sceneView; - - osg::ref_ptr _clearCallback; - osg::ref_ptr _cullCallback; - osg::ref_ptr _drawCallback; - - osg::Timer_t _frameStartTick; - osg::Timer_t _previousFrameStartTick; - - bool _flushOfAllDeletedGLObjectsOnNextFrame; - bool _cleanUpOnNextFrame; - - bool _collectStats; - osgUtil::Statistics _stats; -}; - -} - -#endif diff --git a/include/osgProducer/Version b/include/osgProducer/Version deleted file mode 100644 index 1bd6c4168..000000000 --- a/include/osgProducer/Version +++ /dev/null @@ -1,48 +0,0 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield - * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or - * (at your option) any later version. The full license is in LICENSE file - * included with this distribution, and on the openscenegraph.org website. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * OpenSceneGraph Public License for more details. -*/ - -#ifndef OSGPRODUCER_VERSION -#define OSGPRODUCER_VERSION 1 - -#include - - -extern "C" { - -/** - * osgProducerGetVersion() returns the library version number. - * Numbering convention : OpenSceneGraph-1.0 will return 1.0 from osgProducerGetVersion. - * - * This C function can be also used to check for the existence of the OpenSceneGraph - * library using autoconf and its m4 macro AC_CHECK_LIB. - * - * Here is the code to add to your configure.in: - \verbatim - # - # Check for the OpenSceneGraph (OSG) GLUT library - # - AC_CHECK_LIB(osg, osgProducerGetVersion, , - [AC_MSG_ERROR(OpenSceneGraph GLUT library not found. See http://www.openscenegraph.org)],) - \endverbatim -*/ -extern OSGPRODUCER_EXPORT const char* osgProducerGetVersion(); - -/** - * getLibraryName_osgProducer() returns the library name in human friendly form. -*/ -extern OSGPRODUCER_EXPORT const char* osgProducerGetLibraryName(); - -} - -#endif - diff --git a/include/osgProducer/Viewer b/include/osgProducer/Viewer deleted file mode 100644 index dfb78d8fe..000000000 --- a/include/osgProducer/Viewer +++ /dev/null @@ -1,356 +0,0 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield - * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or - * (at your option) any later version. The full license is in LICENSE file - * included with this distribution, and on the openscenegraph.org website. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * OpenSceneGraph Public License for more details. -*/ - -#ifndef OSGPRODUCER_VIEWER -#define OSGPRODUCER_VIEWER 1 - -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include - -#include -#include - -#include - -namespace osgProducer { - -/** A Producer-based viewer. Just like OpenGL, the core of OSG is independent of - * windowing system. The integration between OSG and some windowing system is - * delegated to other, non-core parts of OSG (users are also allowed to - * integrate OSG with any exotic windowing system they happen to use). - * \c Viewer implements the integration between OSG and Producer, AKA Open - * Producer (http://www.andesengineering.com/Producer), thus offering an - * out-of-the-box, scalable and multi-platform abstraction of the windowing - * system. - */ -class OSGPRODUCER_EXPORT Viewer : public OsgCameraGroup, public osgGA::GUIActionAdapter -{ - public : - - Viewer(); - - Viewer(Producer::CameraConfig *cfg); - - Viewer(const std::string& configFile); - - Viewer(osg::ArgumentParser& arguments); - - virtual ~Viewer(); - - /** Specifies options to control some aspects of the - * \c Viewer behavior (using the \c setUpViewer() member - * function). - */ - enum ViewerOptions - { - /** Do not activate any standard event handlers. - * If no event handlers are selected then the users would typically - * register their own custom event handlers to add user interaction via - * getEventHandlerList().push_back(myEventHandler) or addCameraManipulator(myCameraManipualtor).*/ - NO_EVENT_HANDLERS = 0, - - /** Add an \c osgGA::TrackballManipulator to manipulate the camera - * interactively. - */ - TRACKBALL_MANIPULATOR = 1, - - /** Add an \c osgGA::DriveManipulator to manipulate the camera - * interactively. - */ - DRIVE_MANIPULATOR = 2, - - /** Add an \c osgGA::FlightManipulator to manipulate the camera - * interactively. - */ - FLIGHT_MANIPULATOR = 4, - - /** Add an \c osgGA::TerrainManipulator to manipulate the camera - * interactively. - */ - TERRAIN_MANIPULATOR = 8, - - /** Add an \c osgGA::UFOManipulator to manipulate the camera - * interactively. - */ - UFO_MANIPULATOR = 0x10, - - /** Add an \c osgGA::StateSetManipulator to interactively toggle - * some bits of the renderer state (texturing, lightning...) - */ - STATE_MANIPULATOR = 32, - - /** Add a light source some point near the camera. */ - HEAD_LIGHT_SOURCE = 64, - - /** Add a light source above the scene; does nothing if - * \c HEAD_LIGHT_SOURCE is also used. - */ - SKY_LIGHT_SOURCE = 128, - - /** Add peformance statistics reporting, currently implemented via VIEWER_MANPULATOR. */ - STATS_MANIPULATOR = 256, - - /** Add an \c osgProducer::ViewerEventHandler that enables lots of - * tricks like performance statistics and writing the scene to a - * file. - */ - VIEWER_MANIPULATOR = 512, - - /** Finish the viewer execution when the ESC key is pressed. */ - ESCAPE_SETS_DONE = 1024, - - /** Enable a set of standard settings (\c TRACKBALL_MANIPULATOR, - * \c DRIVE_MANIPULATOR, \c FLIGHT_MANIPULATOR, - * \c TERRAIN_MANIPULATOR, \c STATE_MANIPULATOR, - * \c HEAD_LIGHT_SOURCE, \c STATS_MANIPULATOR, - * \c VIEWER_MANIPULATOR, \c ESCAPE_SETS_DONE). - */ - STANDARD_SETTINGS = TRACKBALL_MANIPULATOR| - DRIVE_MANIPULATOR | - FLIGHT_MANIPULATOR | - TERRAIN_MANIPULATOR | - UFO_MANIPULATOR | - STATE_MANIPULATOR | - HEAD_LIGHT_SOURCE | - STATS_MANIPULATOR | - VIEWER_MANIPULATOR | - ESCAPE_SETS_DONE - }; - - /** Set up the viewer, allowing to control some aspects of its behavior. - * @param options One or more of the options defined by the - * \c ViewerOptions enumeration, combined using the bitwise OR - * operator (``|''). - */ - void setUpViewer(unsigned int options=STANDARD_SETTINGS); - - /** Set the viewer so it sets done to true once the refrence time equals or exceeds specified elapsed time. - * Automatically does a setDoneAtElapsedTimeEnabled(true). */ - void setDoneAtElapsedTime(double elapsedTime) { _setDoneAtElapsedTimeEnabled = true; _setDoneAtElapsedTime = elapsedTime; } - - /** Get the elapsed time that will cause done to be set to be true.*/ - double getDoneAtElapsedTime() const { return _setDoneAtElapsedTime; } - - /** Set whether to use a elapsed time to limit the run of the viewer.*/ - void setDoneAtElapsedTimeEnabled(bool enabled) { _setDoneAtElapsedTimeEnabled = enabled; } - - /** Get whether to use a elapsed time to limit the run of the viewer.*/ - bool getDoneAtElapsedTimeEnabled() const { return _setDoneAtElapsedTimeEnabled; } - - /** Set the viewer so it sets done to true once the frame number equals or exceeds specified frame number. - * Automatically does a setDoneAtFrameNumberEnabled(true). */ - void setDoneAtFrameNumber(unsigned int frameNumber) { _setDoneAtFrameNumberEnabled = true; _setDoneAtFrameNumber = frameNumber; } - - /** Get the frame number that will cause done to be set to be true.*/ - unsigned int getDoneAtFrameNumber() const { return _setDoneAtFrameNumber; } - - /** Set whether to use a frame number to limit the run of the viewer.*/ - void setDoneAtFrameNumberEnabled(bool enabled) { _setDoneAtFrameNumberEnabled = enabled; } - - /** Get whether to use a frame number to limit the run of the viewer.*/ - bool getDoneAtFrameNumberEnabled() const { return _setDoneAtFrameNumberEnabled; } - - /** Set the done flag signalling that the viewer exit.*/ - void setDone(bool done) { _done = done; } - - /** Get the done flag which signals that the viewer exit.*/ - bool getDone() const { return _done; } - - /** Return true if the application is done and should exit.*/ - virtual bool done() const; - - /** Set the viewer to take an image snapshot on the last frame() when done is enabled.*/ - void setWriteImageWhenDone(bool enabled) { _writeImageWhenDone = enabled; } - - /** Set the viewer to take an image snapshot on the last frame() when done is enabled.*/ - bool getWriteImageWhenDone() const { return _writeImageWhenDone; } - - /** Set the filename to write to when the viewer takes an image snapshot on the last frame() when done is enabled.*/ - void setWriteImageFileName(const std::string& filename); - - /** Get the filename to write to when the viewer takes an image snapshot on the last frame() when done is enabled.*/ - const std::string& getWriteImageFileName() const; - - /** Get the default filename for writing an image snapshot */ - static const char* getDefaultImageFileName(); - - - /** Override the Producer::CameraGroup::setViewByMatrix to catch all changes to view.*/ - virtual void setViewByMatrix( const Producer::Matrix & pm); - - /** Set the threading model and then call realize().*/ - virtual bool realize(ThreadingModel thread_model); - - virtual bool realize(); - - /** Updated the scene. Handle any queued up events, do an update traversal and set the CameraGroup's setViewByMatrix if any camera manipulators are active.*/ - virtual void update(); - - /** Set the update visitor which does the update traversal of the scene graph. Automatically called by the update() method.*/ - void setUpdateVisitor(osg::NodeVisitor* nv) { _updateVisitor = nv; } - - /** Get the update visitor.*/ - osg::NodeVisitor* getUpdateVisitor() { return _updateVisitor.get(); } - - /** Get the const update visitor.*/ - const osg::NodeVisitor* getUpdateVisitor() const { return _updateVisitor.get(); } - - - /** Set the update visitor which does the event traversal of the scene graph. Automatically called by the update() method.*/ - void setEventVisitor(osgGA::EventVisitor* nv) { _eventVisitor = nv; } - - /** Get the update visitor.*/ - osgGA::EventVisitor* getEventVisitor() { return _eventVisitor.get(); } - - /** Get the const update visitor.*/ - const osgGA::EventVisitor* getEventVisitor() const { return _eventVisitor.get(); } - - - void computeActiveCoordinateSystemNodePath(); - - void setCoordinateSystemNodePath(const osg::NodePath& nodePath); - - osg::NodePath getCoordinateSystemNodePath() const; - - /** Dispatch the cull and draw for each of the Camera's for this frame.*/ - virtual void frame(); - - virtual void requestRedraw(); - virtual void requestContinuousUpdate(bool); - virtual void requestWarpPointer(float x,float y); - - - /** Compute, from normalized mouse coords, for sepecified Camera, the pixel coords relative to that Camera's RenderSurface.*/ - bool computePixelCoords(float x,float y,unsigned int cameraNum,float& pixel_x,float& pixel_y); - - /** Compute, from normalized mouse coords, for sepecified Camera, the near and far points in worlds coords.*/ - bool computeNearFarPoints(float x,float y,unsigned int cameraNum,osg::Vec3& near, osg::Vec3& far); - - /** Compute, from normalized mouse coords, for all Cameras, intersections with the specified subgraph.*/ - bool computeIntersections(float x,float y,unsigned int cameraNum,osg::Node *node,osgUtil::IntersectVisitor::HitList& hits,osg::Node::NodeMask traversalMask = 0xffffffff); - - /** Compute, from normalized mouse coords, for sepecified Camera, intersections with the scene.*/ - bool computeIntersections(float x,float y,unsigned int cameraNum,osgUtil::IntersectVisitor::HitList& hits,osg::Node::NodeMask traversalMask = 0xffffffff); - - /** Compute, from normalized mouse coords, for all Cameras, intersections with specified subgraph.*/ - bool computeIntersections(float x,float y,osg::Node *node,osgUtil::IntersectVisitor::HitList& hits,osg::Node::NodeMask traversalMask = 0xffffffff); - - /** Compute, from normalized mouse coords, for all Cameras, intersections with the scene.*/ - bool computeIntersections(float x,float y,osgUtil::IntersectVisitor::HitList& hits,osg::Node::NodeMask traversalMask = 0xffffffff); - - /** Set the EventQueue - a thread safe queue for registering events.*/ - void setEventQueue(osgGA::EventQueue* eventQueue) { _eventQueue = eventQueue; } - - /** Get the EventQueue.*/ - osgGA::EventQueue* getEventQueue() { return _eventQueue.get(); } - - void setKeyboardMouse(Producer::KeyboardMouse* kbm); - Producer::KeyboardMouse* getKeyboardMouse() { return _kbm.get(); } - const Producer::KeyboardMouse* getKeyboardMouse() const { return _kbm.get(); } - - void setKeyboardMouseCallback(osgProducer::KeyboardMouseCallback* kbmcb); - osgProducer::KeyboardMouseCallback* getKeyboardMouseCallback() { return _kbmcb.get(); } - const osgProducer::KeyboardMouseCallback* getKeyboardMouseCallback() const { return _kbmcb.get(); } - - typedef std::list< osg::ref_ptr > EventHandlerList; - EventHandlerList& getEventHandlerList() { return _eventHandlerList; } - const EventHandlerList& getEventHandlerList() const { return _eventHandlerList; } - - osgGA::KeySwitchMatrixManipulator* getKeySwitchMatrixManipulator() { return _keyswitchManipulator.get(); } - const osgGA::KeySwitchMatrixManipulator* getKeySwitchMatrixManipulator() const { return _keyswitchManipulator.get(); } - - unsigned int addCameraManipulator(osgGA::MatrixManipulator* cm); - void selectCameraManipulator(unsigned int no); - void getCameraManipulatorNameList( std::list &nameList ); - bool selectCameraManipulatorByName( const std::string &name ); - osgGA::MatrixManipulator *getCameraManipulatorByName( const std::string &name ); - - - void setRecordingAnimationPath(bool on) { _recordingAnimationPath = on; } - bool getRecordingAnimationPath() const { return _recordingAnimationPath; } - - void setAnimationPath(osg::AnimationPath* path) { _animationPath = path; } - osg::AnimationPath* getAnimationPath() { return _animationPath.get(); } - const osg::AnimationPath* getAnimationPath() const { return _animationPath.get(); } - - - const double* getPosition() const { return _position; } - double getSpeed() const { return _speed; } - osg::Quat getOrientation() const { return _orientation; } - - - /** Get the keyboard and mouse usage of this viewer.*/ - virtual void getUsage(osg::ApplicationUsage& usage) const; - - /** Update internal structures w.r.t updated scene data.*/ - virtual void updatedSceneData(); - - /** Dispatch a clean up frame that should be called before closing a OsgCameraGroup, i.e. on exit from an app. - * The clean up frame first release all GL objects associated with all the graphics context associated with - * the camera group, then runs a special frame that does the actual OpenGL deletion of GL objects for each - * graphics context. */ - virtual void cleanup_frame(); - - protected : - - - bool _setDoneAtElapsedTimeEnabled; - double _setDoneAtElapsedTime; - - bool _setDoneAtFrameNumberEnabled; - unsigned int _setDoneAtFrameNumber; - - bool _done; - - bool _writeImageWhenDone; - std::string _writeImageFileName; - - osg::ref_ptr _eventQueue; - - osg::ref_ptr _kbm; - - osg::ref_ptr _kbmcb; - - EventHandlerList _eventHandlerList; - osg::ref_ptr _keyswitchManipulator; - - osg::ref_ptr _updateVisitor; - osg::ref_ptr _eventVisitor; - - - typedef std::vector< osg::observer_ptr > ObserveredNodePath; - ObserveredNodePath _coordinateSystemNodePath; - - bool _recordingAnimationPath; - double _recordingStartTime; - osg::ref_ptr _animationPath; - - // record the current position and orientation of the view. - double _position[3]; - osg::Quat _orientation; - double _speed; -}; - -} - -#endif diff --git a/include/osgProducer/ViewerEventHandler b/include/osgProducer/ViewerEventHandler deleted file mode 100644 index 8dc197c48..000000000 --- a/include/osgProducer/ViewerEventHandler +++ /dev/null @@ -1,89 +0,0 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield - * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or - * (at your option) any later version. The full license is in LICENSE file - * included with this distribution, and on the openscenegraph.org website. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * OpenSceneGraph Public License for more details. -*/ - -#ifndef OSGPRODUCER_VIEWEREVENTHANDLER -#define OSGPRODUCER_VIEWEREVENTHANDLER 1 - -#include -#include - -namespace osgProducer { - -class OSGPRODUCER_EXPORT ViewerEventHandler : public osgGA::GUIEventHandler -{ - public: - - ViewerEventHandler(OsgCameraGroup* cg); - - virtual bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& aa); - - /** Get the keyboard and mouse usage of this manipulator.*/ - virtual void getUsage(osg::ApplicationUsage& usage) const; - - OsgCameraGroup* getOsgCameraGroup() { return _cg; } - const OsgCameraGroup* getOsgCameraGroup() const { return _cg; } - - - void setWriteNodeFileName(const std::string& filename) { _writeNodeFileName = filename; } - const std::string& getWriteNodeFileName() const { return _writeNodeFileName; } - - - void setDisplayHelp(bool displayHelp) { _displayHelp = displayHelp; } - - bool getDisplayHelp() const { return _displayHelp; } - - - enum FrameStatsMode - { - NO_STATS = 0, - FRAME_RATE = 1, - CAMERA_STATS = 2, - SCENE_STATS = 3 - }; - - void setFrameStatsMode(FrameStatsMode mode); - FrameStatsMode getFrameStatsMode() { return _frameStatsMode; } - - void setWriteImageOnNextFrame(bool writeImageOnNextFrame); - - void setWriteImageFileName(const std::string& filename); - const std::string& getWriteImageFileName() const { return _writeImageFileName; } - - /** release OpenGL objects in specified graphics context if State - object is passed, otherwise release OpenGL objexts for all graphics context if - State object pointer NULL.*/ - virtual void releaseGLObjects(osg::State* =0) const; - - protected: - - osgProducer::OsgCameraGroup* _cg; - - std::string _writeNodeFileName; - - bool _displayHelp; - FrameStatsMode _frameStatsMode; - - bool _firstTimeTogglingFullScreen; - - class StatsAndHelpDrawCallback; - StatsAndHelpDrawCallback* _statsAndHelpDrawCallback; - - class SnapImageDrawCallback; - typedef std::vector SnapImageDrawCallbackList; - SnapImageDrawCallbackList _snapImageDrawCallbackList; - std::string _writeImageFileName; -}; - -} - -#endif diff --git a/include/osgUtil/SceneView b/include/osgUtil/SceneView index d2bbbc3e9..25e98d5cc 100644 --- a/include/osgUtil/SceneView +++ b/include/osgUtil/SceneView @@ -28,10 +28,8 @@ namespace osgUtil { /** - * SceneView is literaly a view of a scene, encapsulating the 'camera' - * (not to be confused with Producer::Camera) (modelview+projection matrices), - * global state, lights and the scene itself. Provides - * methods for setting up the view and rendering it. + * SceneView is literaly a view of a scene, encapsulating the rendering of the scene. + * Provides methods for setting up the view and rendering it. */ class OSGUTIL_EXPORT SceneView : public osg::Object, public osg::CullSettings { diff --git a/src/osgProducer/GNUmakefile b/src/osgProducer/GNUmakefile deleted file mode 100644 index e6cc0a242..000000000 --- a/src/osgProducer/GNUmakefile +++ /dev/null @@ -1,21 +0,0 @@ -TOPDIR = ../.. -include $(TOPDIR)/Make/makedefs - -CXXFILES =\ - KeyboardMouseCallback.cpp\ - GraphicsContextImplementation.cpp\ - OsgCameraGroup.cpp\ - OsgSceneHandler.cpp\ - ViewerEventHandler.cpp\ - Viewer.cpp\ - Version.cpp\ - -LIBS += -lProducer $(GL_LIBS) -losgText -losgGA -losgUtil -losgDB -losg $(OTHER_LIBS) -DEF += -DOSGPRODUCER_LIBRARY - -TARGET_BASENAME = osgProducer -LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT) - -INC += $(X_INC) - -include $(TOPDIR)/Make/makerules diff --git a/src/osgProducer/GraphicsContextImplementation.cpp b/src/osgProducer/GraphicsContextImplementation.cpp deleted file mode 100644 index 84e0b6a47..000000000 --- a/src/osgProducer/GraphicsContextImplementation.cpp +++ /dev/null @@ -1,299 +0,0 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield - * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or - * (at your option) any later version. The full license is in LICENSE file - * included with this distribution, and on the openscenegraph.org website. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * OpenSceneGraph Public License for more details. -*/ - -#include -#include -#include -#include - -using namespace osgProducer; - -#if 0 -namespace osgProducer -{ - struct MyWindowingSystemInterface : public osg::GraphicsContext::WindowingSystemInterface - { - virtual unsigned int getNumScreens(const osg::GraphicsContext::ScreenIdentifier& /*screenIdentifier*/) - { - return Producer::RenderSurface::getNumberOfScreens(); - } - - virtual void getScreenResolution(const osg::GraphicsContext::ScreenIdentifier& screenIdentifier, unsigned int& width, unsigned int& height) - { - osg::ref_ptr rs = new Producer::RenderSurface; - rs->setHostName(screenIdentifier.hostName); - rs->setDisplayNum(screenIdentifier.displayNum); - rs->setScreenNum(screenIdentifier.screenNum); - rs->getScreenSize(width, height); - } - - - virtual osg::GraphicsContext* createGraphicsContext(osg::GraphicsContext::Traits* traits) - { - return new GraphicsContextImplementation(traits); - } - }; - - struct RegisterWindowingSystemInterfaceProxy - { - RegisterWindowingSystemInterfaceProxy() - { - osg::GraphicsContext::setWindowingSystemInterface(new MyWindowingSystemInterface); - } - - ~RegisterWindowingSystemInterfaceProxy() - { - osg::GraphicsContext::setWindowingSystemInterface(0); - } - }; - - RegisterWindowingSystemInterfaceProxy createWindowingSystemInterfaceProxy; -}; -#endif - - -GraphicsContextImplementation::GraphicsContextImplementation(Traits* traits) -{ - _traits = traits; - - _rs = new Producer::RenderSurface; - _rs->setWindowName(traits->windowName); - _rs->setWindowRectangle(traits->x, traits->y, traits->width, traits->height); - _rs->useBorder(traits->windowDecoration); - _rs->setDisplayNum(traits->displayNum); - _rs->setScreenNum(traits->screenNum); - - - // set the visual chooser - Producer::VisualChooser* rs_vc = _rs->getVisualChooser(); - if (!rs_vc) - { - rs_vc = new Producer::VisualChooser; - _rs->setVisualChooser(rs_vc); - } - - rs_vc->setRedSize(_traits->red); - rs_vc->setGreenSize(_traits->green); - rs_vc->setBlueSize(_traits->blue); - rs_vc->setAlphaSize(_traits->alpha); - - rs_vc->setDepthSize(_traits->depth); - rs_vc->setStencilSize(_traits->stencil); - - if (_traits->doubleBuffer) rs_vc->useDoubleBuffer(); - - rs_vc->addAttribute( Producer::VisualChooser::RGBA ); - - // Always use UseGL - rs_vc->addAttribute( Producer::VisualChooser::UseGL ); - - if (traits->pbuffer) - { - _rs->setDrawableType(Producer::RenderSurface::DrawableType_PBuffer); - - if (traits->target) - { - - _rs->setRenderToTextureOptions(traits->mipMapGeneration ? Producer::RenderSurface::RequestSpaceForMipMaps : - Producer::RenderSurface::RenderToTextureOptions_Default); - _rs->setRenderToTextureMipMapLevel(traits->level); - _rs->setRenderToTextureMode(traits->alpha>0 ? Producer::RenderSurface::RenderToRGBATexture : - Producer::RenderSurface::RenderToRGBTexture); - - switch(traits->target) - { - case(GL_TEXTURE_1D) : - _rs->setRenderToTextureTarget(Producer::RenderSurface::Texture1D); - break; - case(GL_TEXTURE_2D) : - _rs->setRenderToTextureTarget(Producer::RenderSurface::Texture2D); - break; - case(GL_TEXTURE_3D) : - osg::notify(osg::NOTICE)<<"PBuffer render to Texture3D not supported."<setRenderToTextureTarget(Producer::RenderSurface::Texture3D); - break; - case(GL_TEXTURE_RECTANGLE) : - osg::notify(osg::NOTICE)<<"PBuffer render to TextureRectangle not supported."<setRenderToTextureTarget(Producer::RenderSurface::TextureRectangle); - break; - case(GL_TEXTURE_CUBE_MAP_POSITIVE_X) : - case(GL_TEXTURE_CUBE_MAP_NEGATIVE_X) : - case(GL_TEXTURE_CUBE_MAP_POSITIVE_Y) : - case(GL_TEXTURE_CUBE_MAP_NEGATIVE_Y) : - case(GL_TEXTURE_CUBE_MAP_POSITIVE_Z) : - case(GL_TEXTURE_CUBE_MAP_NEGATIVE_Z) : - _rs->setRenderToTextureTarget(Producer::RenderSurface::TextureCUBE); - _rs->setRenderToTextureFace( Producer::RenderSurface::CubeMapFace(traits->target - GL_TEXTURE_CUBE_MAP_POSITIVE_X)); - break; - } - - } - - } - - GraphicsContextImplementation* sharedContext = dynamic_cast(traits->sharedContext); - - if (sharedContext) - { - // different graphics context so we have our own state. - setState(new osg::State); - - if (sharedContext->getState()) - { - getState()->setContextID( sharedContext->getState()->getContextID() ); - incrementContextIDUsageCount( sharedContext->getState()->getContextID() ); - } - else - { - getState()->setContextID( osg::GraphicsContext::createNewContextID() ); - } - - // but we share texture objects etc. so we also share the same contextID - //_rs->realize( 0, sharedContext->_rs->getGLContext() ); - - } - else - { - - // need to do something here.... - setState( new osg::State ); - getState()->setContextID( osg::GraphicsContext::createNewContextID() ); - - //_rs->realize(); - } - - // _rs->useConfigEventThread(false); - - _closeOnDestruction = true; -} - -GraphicsContextImplementation::GraphicsContextImplementation(Producer::RenderSurface* rs) -{ - _rs = rs; - _closeOnDestruction = false; - - _traits = new osg::GraphicsContext::Traits; - _traits->windowName = _rs->getWindowName(); - _traits->displayNum = _rs->getDisplayNum(); - _traits->screenNum = _rs->getScreenNum(); -} - -GraphicsContextImplementation::~GraphicsContextImplementation() -{ - if (_closeOnDestruction) close(); -} - -bool GraphicsContextImplementation::realizeImplementation() -{ - if (_rs.valid()) - { - GraphicsContextImplementation* sharedContext = dynamic_cast(_traits->sharedContext); - - if (sharedContext) - { - _rs->realize( 0, sharedContext->_rs->getGLContext() ); - } - else - { - osg::notify(osg::NOTICE)<<"GraphicsContextImplementation::realize"<realize(); - } - return _rs->isRealized(); - } - else - { - return false; - } -} - -bool GraphicsContextImplementation::makeCurrentImplementation() -{ - if (!_rs) - { - osg::notify(osg::NOTICE)<<"Error: GraphicsContextImplementation::makeCurrentImplementation() no RenderSurface."<setReadDrawable( 0 ); - - // comment out right now, as Producer's setReadDrawable() is doing a call for us. - // _rs->makeCurrent(); - - return true; -} - -bool GraphicsContextImplementation::makeContextCurrentImplementation(osg::GraphicsContext* readContext) -{ - if (!_rs) return false; - - GraphicsContextImplementation* readContextImplemention = dynamic_cast(readContext); - - if (readContextImplemention) - { - _rs->setReadDrawable( readContextImplemention->getRenderSurface() ); - } - else - { - _rs->setReadDrawable( 0 ); - } - - // comment out right now, as Producer's setReadDrawable() is doing a call for us. - // _rs->makeCurrent(); - - return true; -} - -bool GraphicsContextImplementation::releaseContextImplementation() -{ - osg::notify(osg::NOTICE)<<"GraphicsContextImplementation::releaseContextImplementation(): not implemented - release not supported under Producer."<bindPBufferToTexture(bufferType); -} - -void GraphicsContextImplementation::swapBuffersImplementation() -{ - _rs->swapBuffers(); -} diff --git a/src/osgProducer/KeyboardMouseCallback.cpp b/src/osgProducer/KeyboardMouseCallback.cpp deleted file mode 100644 index bd8c2368b..000000000 --- a/src/osgProducer/KeyboardMouseCallback.cpp +++ /dev/null @@ -1,215 +0,0 @@ -#include - -#include -#include - -#include - -using namespace osgProducer; - -KeyboardMouseCallback::KeyboardMouseCallback(Producer::KeyboardMouse* keyboardMouse, bool &done, bool escapeKeySetsDone): - Producer::KeyboardMouseCallback(), - _keyboardMouse(keyboardMouse), - _mx(0.0f),_my(0.0f),_mbutton(0), - _done(done), - _escapeKeySetsDone(escapeKeySetsDone) -{ - updateWindowSize(); -} - -void KeyboardMouseCallback::mouseScroll( Producer::KeyboardMouseCallback::ScrollingMotion sm ) -{ - updateWindowSize(); - if (_eventQueue.valid()) - { - switch(sm) - { - case(Producer::KeyboardMouseCallback::ScrollNone): break; - case(Producer::KeyboardMouseCallback::ScrollLeft): _eventQueue->mouseScroll(osgGA::GUIEventAdapter::SCROLL_LEFT); break; - case(Producer::KeyboardMouseCallback::ScrollRight): _eventQueue->mouseScroll(osgGA::GUIEventAdapter::SCROLL_RIGHT); break; - case(Producer::KeyboardMouseCallback::ScrollUp): _eventQueue->mouseScroll(osgGA::GUIEventAdapter::SCROLL_UP); break; - case(Producer::KeyboardMouseCallback::ScrollDown): _eventQueue->mouseScroll(osgGA::GUIEventAdapter::SCROLL_DOWN); break; - case(Producer::KeyboardMouseCallback::Scroll2D): _eventQueue->mouseScroll(osgGA::GUIEventAdapter::SCROLL_2D); break; - } - } -} - -void KeyboardMouseCallback::mouseScroll2D( float x, float y ) -{ - updateWindowSize(); - if (_eventQueue.valid()) _eventQueue->mouseScroll2D(x,y); -} - -void KeyboardMouseCallback::penPressure( float pressure ) -{ - updateWindowSize(); - if (_eventQueue.valid()) _eventQueue->penPressure(pressure); -} - -void KeyboardMouseCallback::penProximity(Producer::KeyboardMouseCallback::TabletPointerType pt, bool isEntering) -{ - updateWindowSize(); - if (_eventQueue.valid()) _eventQueue->penProximity((osgGA::GUIEventAdapter::TabletPointerType)pt, isEntering); -} - -void KeyboardMouseCallback::buttonPress( float mx, float my, unsigned int mbutton ) -{ - updateWindowSize(); - if (_eventQueue.valid()) _eventQueue->mouseButtonPress(mx,my,mbutton); -} - -void KeyboardMouseCallback::buttonRelease( float mx, float my, unsigned int mbutton ) -{ - updateWindowSize(); - if (_eventQueue.valid()) _eventQueue->mouseButtonRelease(mx,my,mbutton); -} - -void KeyboardMouseCallback::doubleButtonPress( float mx, float my, unsigned int mbutton ) -{ - updateWindowSize(); - if (_eventQueue.valid()) _eventQueue->mouseDoubleButtonPress(mx,my,mbutton); -} - -void KeyboardMouseCallback::keyPress( Producer::KeyCharacter key ) -{ - updateWindowSize(); - if (_eventQueue.valid()) _eventQueue->keyPress((osgGA::GUIEventAdapter::KeySymbol)key); - - // check against adapted key symbol. - if (_escapeKeySetsDone && - (osgGA::GUIEventAdapter::KeySymbol)key==osgGA::GUIEventAdapter::KEY_Escape) _done = true; -} - -void KeyboardMouseCallback::keyRelease( Producer::KeyCharacter key ) -{ - updateWindowSize(); - if (_eventQueue.valid()) _eventQueue->keyRelease((osgGA::GUIEventAdapter::KeySymbol)key); -} - -void KeyboardMouseCallback::specialKeyPress( Producer::KeyCharacter key ) -{ - updateWindowSize(); - keyPress(key); -} - -void KeyboardMouseCallback::specialKeyRelease( Producer::KeyCharacter key ) -{ - updateWindowSize(); - keyRelease(key); -} - -void KeyboardMouseCallback::windowConfig( int x, int y, unsigned int width, unsigned int height ) -{ - updateWindowSize(); - if (_eventQueue.valid()) _eventQueue->windowResize(x,y,x+width,y+height); -} - -void KeyboardMouseCallback::mouseMotion( float mx, float my) -{ - updateWindowSize(); - if (_eventQueue.valid()) _eventQueue->mouseMotion(mx,my); -} - -void KeyboardMouseCallback::passiveMouseMotion( float mx, float my) -{ - updateWindowSize(); - if (_eventQueue.valid()) _eventQueue->mouseMotion(mx,my); -} - -void KeyboardMouseCallback::mouseWarp( float mx, float my) -{ - updateWindowSize(); - if (_eventQueue.valid()) _eventQueue->mouseWarped(mx,my); // need mouse warp?? -} - - -void KeyboardMouseCallback::updateWindowSize() -{ - if (!_eventQueue) return; - - osgGA::GUIEventAdapter* ea = _eventQueue->getCurrentEventState(); - - Producer::InputArea* ia = _keyboardMouse->getInputArea(); - Producer::RenderSurface* rs = _keyboardMouse->getRenderSurface(); - if (ia) - { - - float minX = FLT_MAX; - float minY = FLT_MAX; - float maxX = -FLT_MAX; - float maxY = -FLT_MAX; - //int numInputRectangle = ia->getNumInputRectangle(); - int numRenderSurfaces = ia->getNumRenderSurfaces(); - for (int i=0;igetRenderSurface(i)->getInputRectangle(); - - minX = osg::minimum(minX,ir.left()); - minX = osg::minimum(minX,ir.left()+ir.width()); - - minY = osg::minimum(minY,ir.bottom()); - minY = osg::minimum(minY,ir.bottom()+ir.height()); - - maxX = osg::maximum(maxX,ir.left()); - maxX = osg::maximum(maxX,ir.left()+ir.width()); - - maxY = osg::maximum(maxY,ir.bottom()); - maxY = osg::maximum(maxY,ir.bottom()+ir.height()); - } - - ea->setInputRange(minX,minY,maxX,maxY); - } - else if (rs) - { - //ea->setWindowSize(-1.0f,-1.0f,1.0f,1.0f); - - const Producer::RenderSurface::InputRectangle &ir = rs->getInputRectangle(); - - float minX = osg::minimum(ir.left(),ir.left()+ir.width()); - float maxX = osg::maximum(ir.left(),ir.left()+ir.width()); - float minY = osg::minimum(ir.bottom(),ir.bottom()+ir.height()); - float maxY = osg::maximum(ir.bottom(),ir.bottom()+ir.height()); - - // osg::notify(osg::NOTICE)<<"RS ea->setWindowSize("<setInputRange(minX,minY,maxX,maxY); - } - - if (rs) - { - ea->setWindowRectangle(rs->getWindowOriginX(), rs->getWindowOriginY(), rs->getWindowWidth(),rs->getWindowHeight(), false); - } -} - -bool KeyboardMouseCallback::takeEventQueue(EventQueue& queue) -{ - updateWindowSize(); - return _eventQueue->takeEvents(queue); -} - -bool KeyboardMouseCallback::copyEventQueue(EventQueue& queue) const -{ - return _eventQueue->copyEvents(queue); -} - -void KeyboardMouseCallback::setEventQueue(EventQueue& queue) -{ - _eventQueue->setEvents(queue); -} - -void KeyboardMouseCallback::appendEventQueue(EventQueue& queue) -{ - _eventQueue->appendEvents(queue); -} - -void KeyboardMouseCallback::shutdown() -{ - _done = true; - _keyboardMouse->cancel(); -} - -osgGA::GUIEventAdapter* KeyboardMouseCallback::createEventAdapter() -{ - return new osgGA::GUIEventAdapter(*(_eventQueue->getCurrentEventState())); -} diff --git a/src/osgProducer/OsgCameraGroup.cpp b/src/osgProducer/OsgCameraGroup.cpp deleted file mode 100644 index 17a52c20f..000000000 --- a/src/osgProducer/OsgCameraGroup.cpp +++ /dev/null @@ -1,815 +0,0 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield - * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or - * (at your option) any later version. The full license is in LICENSE file - * included with this distribution, and on the openscenegraph.org website. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * OpenSceneGraph Public License for more details. -*/ - -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include - -#ifdef WIN32 -#define WGL_SAMPLE_BUFFERS_ARB 0x2041 -#define WGL_SAMPLES_ARB 0x2042 -#endif - -using namespace osgProducer; - -static osg::ApplicationUsageProxy OsgCameraGroup_e0(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE, "OSG_PROCESSOR_AFFINITY ", "ON | OFF - Where supported, switch on or off the processor affinity." ); - -OsgCameraGroup::RealizeCallback::~RealizeCallback() -{ -} - -class RenderSurfaceRealizeCallback : public Producer::RenderSurface::Callback -{ -public: - - RenderSurfaceRealizeCallback(OsgCameraGroup* cameraGroup,OsgSceneHandler* sceneHandler): - _cameraGroup(cameraGroup), - _sceneHandler(sceneHandler) - { - const OsgCameraGroup::SceneHandlerList& shl = _cameraGroup->getSceneHandlerList(); - for(unsigned int i=0; igetRealizeCallback()) - { - (*(_cameraGroup->getRealizeCallback()))(*_cameraGroup,*_sceneHandler,rs); - } - else if (_sceneHandler) _sceneHandler->init(); - - osg::Timer_t end_t = timer.tick(); - double time = timer.delta_m(start_t,end_t); - osg::notify(osg::INFO) << "Time to init = "<addCommandLineOption("-c ","Specify camera config file"); - } - - std::string filename; - if (arguments.read("-c",filename)) return findCameraConfigFile(filename); - - char *ptr; - if( (ptr = getenv( "PRODUCER_CAMERA_CONFIG_FILE" )) ) - { - osg::notify(osg::DEBUG_INFO) << "PRODUCER_CAMERA_CONFIG_FILE("<","specify the default producer camera config to use when opening osgProducer based applications."); - -static osg::ApplicationUsageProxy OsgCameraGroup_e4( - osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE, - "PRODUCER_CAMERA_BLOCK_ON_VSYNC", - "After the CPU finishes generating the scene for one frame," - " block the CPU until the start of the next frame. Same as pressing 'v'" - " within an osgProducer-based application."); - - -OsgCameraGroup::OsgCameraGroup() : Producer::CameraGroup() -{ - _init(); -} - -OsgCameraGroup::OsgCameraGroup(Producer::CameraConfig *cfg): - Producer::CameraGroup(cfg) -{ - _init(); -} - -OsgCameraGroup::OsgCameraGroup(const std::string& configFile): - Producer::CameraGroup(findCameraConfigFile(configFile)) -{ - _init(); -} - -OsgCameraGroup::OsgCameraGroup(osg::ArgumentParser& arguments): - Producer::CameraGroup(extractCameraConfigFile(arguments)) -{ - _init(); - _applicationUsage = arguments.getApplicationUsage(); - - while (arguments.read("--affinity")) - { - _enableProccessAffinityHint = true; - } - - // report the usage options. - if (arguments.getApplicationUsage()) - { - arguments.getApplicationUsage()->addCommandLineOption("--affinity","Enable processor affinity where supported."); - } - - - for( unsigned int i = 0; i < _cfg->getNumberOfCameras(); i++ ) - { - Producer::Camera *cam = _cfg->getCamera(i); - Producer::RenderSurface *rs = cam->getRenderSurface(); - if (rs->getWindowName()== Producer::RenderSurface::defaultWindowName ) - { - rs->setWindowName(arguments.getApplicationName()); - } - } - - - -} - - -class QuitImageStreamVisitor : public osg::NodeVisitor -{ - public: - - QuitImageStreamVisitor(): - osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN) {} - - - /** Simply traverse using standard NodeVisitor traverse method.*/ - virtual void apply(osg::Node& node) - { - if (node.getStateSet()) - apply(*(node.getStateSet())); - - traverse(node); - } - - virtual void apply(osg::Geode& node) - { - if (node.getStateSet()) - apply(*(node.getStateSet())); - - for(unsigned int i=0;igetStateSet()) - apply(*(drawable->getStateSet())); - } - } - - void apply(osg::StateSet& stateset) - { - for(unsigned int i=0;i(texture); - if (textureRect) - { - osg::ImageStream* imageStream = dynamic_cast(textureRect->getImage()); - if (imageStream) - { - imageStream->quit(); - } - } - - osg::Texture2D* texture2D = dynamic_cast(texture); - if (texture2D) - { - osg::ImageStream* imageStream = dynamic_cast(texture2D->getImage()); - if (imageStream) - { - imageStream->quit(); - } - } - } - } - } - -}; - -OsgCameraGroup::~OsgCameraGroup() -{ - // kill the DatabasePager and associated thread if one exists. - osgDB::Registry::instance()->setDatabasePager(0); - - osg::Node* node = getTopMostSceneData(); - if (node) - { - // kill any ImageStream threads - QuitImageStreamVisitor qisv; - node->accept(qisv); - } -} - - -static osg::ApplicationUsageProxy OsgCameraGroup_e2(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_CAMERA_THREADING ","Set the threading model using by osgProducer::Viewer/OsgCameraGroup based apps. can be SingleThreaded or ThreadPerCamera"); -static osg::ApplicationUsageProxy OsgCameraGroup_e3(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_SHARE_GRAPHICS_CONTEXTS ","Set whether to share graphics contexts. can be ON or OFF"); - -void OsgCameraGroup::_init() -{ - if (_cfg.valid()) - { - // By default select ThreadPerCamera when we have multiple cameras. - _threadModel = (_cfg->getNumberOfCameras()>1) ? ThreadPerCamera : SingleThreaded; - } - - const char* str = getenv("OSG_CAMERA_THREADING"); - if (str) - { - if (strcmp(str,"SingleThreaded")==0) _threadModel = SingleThreaded; - else if (strcmp(str,"ThreadPerCamera")==0) _threadModel = ThreadPerCamera; - } - - - // work out how many graphics context we have - std::set renderSurfaces; - for(unsigned int i=0; igetRenderSurface()) - { - renderSurfaces.insert(getCamera(i)->getRenderSurface()); - } - } - unsigned int numContexts = renderSurfaces.size(); - - str = getenv("OSG_SHARE_GRAPHICS_CONTEXTS"); - if (str) - { - if (strcmp(str,"ON")==0) - { - Producer::RenderSurface::shareAllGLContexts(true); - - // if we are sharing graphics contexts then we just treat them all as one. - numContexts = 1; - } - else if (strcmp(str,"OFF")==0) - { - Producer::RenderSurface::shareAllGLContexts(false); - } - - } - - osg::DisplaySettings::instance()->setMaxNumberOfGraphicsContexts(numContexts); - - if ((_threadModel==ThreadPerCamera || _threadModel==ThreadPerRenderSurface) && _cfg->getNumberOfCameras()>1) - { - // switch on thread safe reference counting by default when running multi-threaded. - osg::Referenced::setThreadSafeReferenceCounting(true); - } - - - _scene_data = NULL; - _global_stateset = NULL; - _clear_color.set( 0.2f, 0.2f, 0.4f, 1.0f ); - - _fusionDistanceMode = osgUtil::SceneView::PROPORTIONAL_TO_SCREEN_DISTANCE; - _fusionDistanceValue = 1.0f; - - _realizeSceneViewOptions = osgUtil::SceneView::STANDARD_SETTINGS; - - _initialized = false; - - // set up the time and frame counter. - _frameNumber = 0; - _start_tick = _timer.tick(); - - if (!_frameStamp) _frameStamp = new osg::FrameStamp; - - _applicationUsage = osg::ApplicationUsage::instance(); - - _enableProccessAffinityHint = false; - - str = getenv("OSG_PROCESSOR_AFFINITY"); - if (str && (strcmp(str,"ON")==0 || strcmp(str,"On")==0 || strcmp(str,"on")==0)) - { - _enableProccessAffinityHint = true; - } - -} - -void OsgCameraGroup::setSceneData( osg::Node *scene ) -{ - if (_scene_data==scene) return; - - if (_scene_decorator.valid() && _scene_data.valid()) - { - _scene_decorator->removeChild(_scene_data.get()); - } - - _scene_data = scene; - - if (_scene_decorator.valid() && _scene_data.valid()) - { - _scene_decorator->addChild(scene); - } - - updatedSceneData(); -} - -void OsgCameraGroup::setSceneDecorator( osg::Group* decorator) -{ - if (_scene_decorator==decorator) return; - - _scene_decorator = decorator; - - if (_scene_data.valid() && decorator) - { - decorator->addChild(_scene_data.get()); - } - updatedSceneData(); -} - - -void OsgCameraGroup::updatedSceneData() -{ - setUpSceneViewsWithData(); -} - -void OsgCameraGroup::setUpSceneViewsWithData() -{ - for(SceneHandlerList::iterator p = _shvec.begin(); p != _shvec.end(); p++ ) - { - osgUtil::SceneView* sv = (*p)->getSceneView(); - - if (_scene_decorator.valid()) - { - sv->setSceneData( _scene_decorator.get() ); - } - else if (_scene_data.valid()) - { - sv->setSceneData( _scene_data.get() ); - } - else - { - sv->setSceneData( 0 ); - } - - sv->setFrameStamp( _frameStamp.get() ); - sv->setGlobalStateSet( _global_stateset.get() ); - sv->setFusionDistance( _fusionDistanceMode, _fusionDistanceValue ); - } -} - - -void OsgCameraGroup::setFrameStamp( osg::FrameStamp* fs ) -{ - _frameStamp = fs; - setUpSceneViewsWithData(); -} - - -void OsgCameraGroup::setGlobalStateSet( osg::StateSet *sset ) -{ - _global_stateset = sset; - setUpSceneViewsWithData(); -} - -void OsgCameraGroup::setClearColor( const osg::Vec4& clearColor ) -{ - _clear_color = clearColor; - for(unsigned int i=0;igetCamera(i); - cam->setClearColor(_clear_color[0],_clear_color[1],_clear_color[2],_clear_color[3]); - } -} - -const osg::Vec4& OsgCameraGroup::getClearColor() const -{ - return _clear_color; -} - -void OsgCameraGroup::setLODScale( float scale ) -{ - getCullSettings().setLODScale(scale); - setUpSceneViewsWithData(); -} - -float OsgCameraGroup::getLODScale() const -{ - return getCullSettings().getLODScale(); -} - -void OsgCameraGroup::setFusionDistance( osgUtil::SceneView::FusionDistanceMode mode,float value) -{ - // need to set a local variable? - _fusionDistanceMode = mode; - _fusionDistanceValue = value; - setUpSceneViewsWithData(); -} - -void OsgCameraGroup::advance() -{ - if( !_initialized ) return; - CameraGroup::advance(); -} - -bool OsgCameraGroup::realize( ThreadingModel thread_model ) -{ - if( _realized ) return _realized; - - if (_cfg.valid()) _cfg->setThreadModelDirective(thread_model); - _threadModel = thread_model; - - return realize(); -} - -bool OsgCameraGroup::realize() -{ - if( _initialized ) return _realized; - - if (!_ds) _ds = osg::DisplaySettings::instance(); - - if (_enableProccessAffinityHint) - { - unsigned int numProcessors = OpenThreads::GetNumberOfProcessors(); - if (numProcessors>1) - { - for( unsigned int i = 0; i < _cfg->getNumberOfCameras(); i++ ) - { - Producer::Camera *cam = _cfg->getCamera(i); - cam->setProcessorAffinity(i % numProcessors); - } - } - } - - _shvec.clear(); - - // create the osg::View to keep track of complete views in an OSG centric way. - _view = new osg::View; - - osg::Node* node = getTopMostSceneData(); - if (node) - { - // traverse the scene graphs gathering the requirements of the OpenGL buffers. - osgUtil::DisplayRequirementsVisitor drv; - drv.setDisplaySettings(_ds.get()); - node->accept(drv); - } - - // set up each render stage to clear the appropriate buffers. - GLbitfield clear_mask=0; - if (_ds->getRGB()) clear_mask |= GL_COLOR_BUFFER_BIT; - if (_ds->getDepthBuffer()) clear_mask |= GL_DEPTH_BUFFER_BIT; - if (_ds->getStencilBuffer()) clear_mask |= GL_STENCIL_BUFFER_BIT; - - // make sure any camera's which share the same render surface also share the same osg::State. - // use a std::map to keep track of what render surfaces are associated with what state. - typedef std::map RenderSurfaceStateMap; - RenderSurfaceStateMap _renderSurfaceStateMap; - - bool needToCreatedNewContextID = true; - unsigned int contextID = 0; - - for(unsigned int i = 0; i < _cfg->getNumberOfCameras(); i++ ) - { - Producer::Camera *cam = _cfg->getCamera(i); - Producer::RenderSurface* rs = cam->getRenderSurface(); - - cam->setClearColor(_clear_color[0],_clear_color[1],_clear_color[2],_clear_color[3]); - - // get or create the scene handler. - osgProducer::OsgSceneHandler *sh; - sh = dynamic_cast(cam->getSceneHandler()); - if(sh == NULL) - sh = new osgProducer::OsgSceneHandler(_ds.get()); - - osgUtil::SceneView* sv = sh->getSceneView(); - sv->setDefaults(_realizeSceneViewOptions); - - // note, should really compute the projection and view offsets... - // but not critical as Producer controls the osg::Camera matrices via SceneView. - _view->addSlave(sv->getCamera()); - sv->setView(_view.get()); - - if (_renderSurfaceStateMap.count(rs)==0) - { - _renderSurfaceStateMap[rs] = sv->getState(); - - if (needToCreatedNewContextID) - { - // create a unique contextID for this graphics context. - contextID = osg::GraphicsContext::createNewContextID(); - - // if we are sharing our graphics context then when needn't create any more. - needToCreatedNewContextID = !Producer::RenderSurface::allGLContextsAreShared(); - } - else - { - osg::GraphicsContext::incrementContextIDUsageCount(contextID); - } - - sv->getState()->setContextID(contextID); - } - else - { - sv->setState(_renderSurfaceStateMap[rs]); - } - - _shvec.push_back( sh ); - cam->setSceneHandler( sh ); - - // set up the clear mask. - osgUtil::RenderStage *stage = sv->getRenderStage(); - if (stage) stage->setClearMask(clear_mask); - - // set the realize callback. - rs->setRealizeCallback( new RenderSurfaceRealizeCallback(this, sh)); - - // set up the visual chooser. - if (_ds.valid()) - { - - Producer::VisualChooser* rs_vc = rs->getVisualChooser(); - if (!rs_vc) - { - rs_vc = new Producer::VisualChooser; - rs_vc->setSimpleConfiguration(); - rs->setVisualChooser(rs_vc); - } - - unsigned int numStencilBits = 0; - if (_ds->getStereo()) - { - switch(_ds->getStereoMode()) - { - case(osg::DisplaySettings::QUAD_BUFFER): - rs_vc->useStereo(); - break; - case(osg::DisplaySettings::HORIZONTAL_INTERLACE): - case(osg::DisplaySettings::VERTICAL_INTERLACE): - numStencilBits = 8; - break; - default: - break; - } - } - - // set up stencil buffer if required. - numStencilBits = osg::maximum(numStencilBits,_ds->getMinimumNumStencilBits()); - if (numStencilBits > 0) - { - rs_vc->setStencilSize(numStencilBits); - } - - if (_ds->getAlphaBuffer()) rs_vc->setAlphaSize(_ds->getMinimumNumAlphaBits()); - - rs_vc->setDepthSize(24); - - if (_ds->getAccumBuffer()) - { - rs_vc->setAccumRedSize(_ds->getMinimumNumAccumRedBits()); - rs_vc->setAccumGreenSize(_ds->getMinimumNumAccumGreenBits()); - rs_vc->setAccumBlueSize(_ds->getMinimumNumAccumBlueBits()); - rs_vc->setAccumAlphaSize(_ds->getMinimumNumAccumAlphaBits()); - } - - if (_ds->getMultiSamples()) - { - rs_vc->addAttribute(Producer::VisualChooser::SampleBuffers, 1); - rs_vc->addAttribute(Producer::VisualChooser::Samples, _ds->getNumMultiSamples()); - } - } - } - - // now set up GraphicsContext wrappers for each of the render surfaces - // to all core OSG classes to keep track of the graphics context. - for(RenderSurfaceStateMap::iterator ritr = _renderSurfaceStateMap.begin(); - ritr != _renderSurfaceStateMap.end(); - ++ritr) - { - Producer::RenderSurface* rs = ritr->first; - osg::State* state = ritr->second; - GraphicsContextImplementation* gc = new GraphicsContextImplementation(rs); - gc->setState(state); - state->setGraphicsContext(gc); - _gcList.push_back(gc); - } - - if( _global_stateset == NULL && _shvec.size() > 0 ) - { - SceneHandlerList::iterator p = _shvec.begin(); - _global_stateset = (*p)->getSceneView()->getGlobalStateSet(); - } - - setUpSceneViewsWithData(); - - - // if we are still multi-thread check to make sure that no render surfaces - // are shared and don't use shared contexts, if they do we need to - // disable multi-threading of cameras. - if (_threadModel == Producer::CameraGroup::ThreadPerCamera) - { - std::set renderSurfaceSet; - for( unsigned int i = 0; i < _cfg->getNumberOfCameras(); i++ ) - { - Producer::Camera *cam = _cfg->getCamera(i); - renderSurfaceSet.insert(cam->getRenderSurface()); - } - if (renderSurfaceSet.size()!=_cfg->getNumberOfCameras()) - { - // camera's must be sharing a RenderSurface, so we need to ensure that we're - // running single threaded, to avoid OpenGL threading issues. - osg::notify(osg::INFO)<<"Warning: disabling multi-threading of cull and draw to avoid"<1 && Producer::RenderSurface::allGLContextsAreShared()) - { - // we have multiple RenderSurface, but with share contexts, which is dangerous for multi-threaded usage, - // so need to disable multi-threading to prevent problems. - osg::notify(osg::INFO)<<"Warning: disabling multi-threading of cull and draw to avoid"<setThreadModelDirective(_threadModel); - - _initialized = CameraGroup::realize(); - - return _initialized; -} - -osg::Node* OsgCameraGroup::getTopMostSceneData() -{ - if (_scene_decorator.valid()) - return _scene_decorator.get(); - else - return _scene_data.get(); -} - -const osg::Node* OsgCameraGroup::getTopMostSceneData() const -{ - if (_scene_decorator.valid()) - return _scene_decorator.get(); - else - return _scene_data.get(); -} - -void OsgCameraGroup::setView(const osg::Matrixd& matrix) -{ - Producer::Matrix pm(matrix.ptr()); - - setViewByMatrix(pm); -} - -osg::Matrixd OsgCameraGroup::getViewMatrix() const -{ - osg::Matrixd matrix; - if (_cfg.valid() && _cfg->getNumberOfCameras()>=1) - { - const Producer::Camera *cam = _cfg->getCamera(0); - matrix.set(cam->getViewMatrix()); - } - return matrix; -} - -static osg::Timer_t _last_frame_tick = 0; -static osg::Timer_t _previous_previous_frame_tick = 0; -static osg::Timer_t _previous_frame_tick = 0; -static bool _useStartOfUpdateForFrameTime = true; - -void OsgCameraGroup::sync() -{ - CameraGroup::sync(); - - // set the frame stamp for the new frame. - _frameStamp->setFrameNumber(_frameNumber++); - - if (_useStartOfUpdateForFrameTime) - { - double time_since_start = _timer.delta_s(_start_tick,_timer.tick()); - _frameStamp->setReferenceTime(time_since_start); - _frameStamp->setSimulationTime(_frameStamp->getReferenceTime()); - } - else - { - osg::Timer_t endOfNewFrameTick = _last_frame_tick + (_last_frame_tick-_previous_previous_frame_tick); - double estimatedSwapTimeForFrame = _timer.delta_s(_start_tick,endOfNewFrameTick); - - _frameStamp->setReferenceTime(estimatedSwapTimeForFrame); - _frameStamp->setSimulationTime(_frameStamp->getReferenceTime()); - } -} - -void OsgCameraGroup::frame() -{ - if (!_useStartOfUpdateForFrameTime) - { - _previous_previous_frame_tick = _previous_frame_tick; - _previous_frame_tick = _last_frame_tick; - _last_frame_tick = _timer.tick(); - } - - osg::Node* node = getTopMostSceneData(); - if (node) node->getBound(); - - if (_view.valid()) - { - double left, right, bottom, top, nearClip, farClip; - getLensParams(left, right, bottom, top, nearClip, farClip); - - if (!_view->getCamera()) - { - _view->setCamera(new osg::Camera); - } - - if (getLensProjectionType()==Producer::Camera::Lens::Perspective) - { - _view->getCamera()->setProjectionMatrixAsFrustum(left, right, bottom, top, nearClip, farClip); - } - else - { - _view->getCamera()->setProjectionMatrixAsOrtho(left, right, bottom, top, nearClip, farClip); - } - - _view->getCamera()->setViewMatrix(getViewMatrix()); - } - - // the settings in sync. - for(SceneHandlerList::iterator itr = _shvec.begin(); - itr != _shvec.end(); - ++itr) - { - (*itr)->getSceneView()->inheritCullSettings(_cullSettings); - } - - - CameraGroup::frame(); -} - -void OsgCameraGroup::cleanup_frame() -{ - // first relase all GL objects and switch on the flush of deleted objects - // in the next frame. - for(SceneHandlerList::iterator itr = _shvec.begin(); - itr != _shvec.end(); - ++itr) - { - (*itr)->getSceneView()->releaseAllGLObjects(); - (*itr)->getSceneView()->setRenderStage(0); - (*itr)->setCleanUpOnNextFrame(true); - } - - // make sure that the registry all flushes all its texture objects. - osgDB::Registry::instance()->releaseGLObjects(); - - // then run the frame to do the actuall OpenGL clean up. - frame(); -} - - diff --git a/src/osgProducer/OsgSceneHandler.cpp b/src/osgProducer/OsgSceneHandler.cpp deleted file mode 100644 index f0b8a19d1..000000000 --- a/src/osgProducer/OsgSceneHandler.cpp +++ /dev/null @@ -1,191 +0,0 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield - * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or - * (at your option) any later version. The full license is in LICENSE file - * included with this distribution, and on the openscenegraph.org website. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * OpenSceneGraph Public License for more details. -*/ - -#include - -#include - -#include - -using namespace osgUtil; -using namespace osgProducer; - -OsgSceneHandler::OsgSceneHandler( osg::DisplaySettings *ds) : - _sceneView(new osgUtil::SceneView(ds)), - _collectStats(false) -{ - _frameStartTick = 0; - _previousFrameStartTick = 0; - _flushOfAllDeletedGLObjectsOnNextFrame = false; - _cleanUpOnNextFrame = false; -} - -void OsgSceneHandler::init() -{ - static OpenThreads::Mutex mutex; - osg::notify(osg::INFO)<<"entering "<SceneView::init(); - - osg::notify(osg::INFO)<<" done "<tick(); - - osgDB::DatabasePager* dp = osgDB::Registry::instance()->getDatabasePager(); - if (dp) - { - dp->signalBeginFrame(getSceneView()->getState()->getFrameStamp()); - } - - // no-op right now as scene view manages its own clear. -} - -void OsgSceneHandler::cullImplementation(Producer::Camera &cam) -{ - OpenThreads::ScopedLock lock(_cullMutex); - - _sceneView->getProjectionMatrix().set(cam.getProjectionMatrix()); - _sceneView->getViewMatrix().set(cam.getPositionAndAttitudeMatrix()); - - int x, y; - unsigned int w, h; - cam.getProjectionRectangle( x, y, w, h ); - - _sceneView->setViewport( x, y, w, h ); - - osg::Vec4 clear_color; - cam.getClearColor(clear_color[0],clear_color[1],clear_color[2],clear_color[3]); - _sceneView->setClearColor(clear_color); - - _sceneView->cull(); - - if (_collectStats) - { - _stats.reset(); - _sceneView->getStats(_stats); - } -} - -bool OsgSceneHandler::getStats(Statistics& primStats) -{ - if (!_collectStats) return false; - - OpenThreads::ScopedLock lock(_cullMutex); - - primStats.add(_stats); - - return true; -} - -void OsgSceneHandler::drawImplementation(Producer::Camera &) -{ - // dipatch the draw traversal of the scene graph - _sceneView->SceneView::draw(); - - - // for the database pager now manage any GL object operations that are required. - osgDB::DatabasePager* dp = osgDB::Registry::instance()->getDatabasePager(); - if (dp) - { - -#if 1 - double timeForCullAndDraw = osg::Timer::instance()->delta_s(_frameStartTick, osg::Timer::instance()->tick()); - - double targeFrameTime = 1.0/dp->getTargetFrameRate(); - - double drawCostFactor = 2.0; // must be greater than 1 to account for the extra cost of emptying the OpenGL fifo. - double frameFactor = 0.9; // must be less than 1, to compensate for extra time spent in update and swap buffers etc. - double timeLeftTillEndOfFrame = targeFrameTime*frameFactor - timeForCullAndDraw*drawCostFactor; - double availableTime = timeLeftTillEndOfFrame / drawCostFactor; // account for the fifo when download texture objects. - - // clamp the available time by the prescribed minimum - if (availableTimegetMinimumTimeAvailableForGLCompileAndDeletePerFrame()) - { - availableTime = dp->getMinimumTimeAvailableForGLCompileAndDeletePerFrame(); - } - - static unsigned int _numFramesThatNoTimeAvailable = 0; - static unsigned int _maxNumFramesThatNoTimeAvailable = 10; - - if (_numFramesThatNoTimeAvailable>_maxNumFramesThatNoTimeAvailable) - { - availableTime = 0.0025; // 2.5ms. - } - - if (availableTime>0.0) - { - _numFramesThatNoTimeAvailable = 0; - - // osg::notify(osg::NOTICE)<<"Time available = "<compileGLObjects(*(getSceneView()->getState()),availableTime); - - // flush deleted GL objects. - getSceneView()->flushDeletedGLObjects(availableTime); - } - else - { - ++_numFramesThatNoTimeAvailable; - } -#else - double timeForPreviousFrame = osg::Timer::instance()->delta_s(_previousFrameStartTick, _frameStartTick); - double timeForCullAndDraw = osg::Timer::instance()->delta_s(_frameStartTick, osg::Timer::instance()->tick()); - - double minimumTargetMaxFrameTime = 0.010; // 10ms. - double targetMaxFrameTime = osg::minimum(timeForPreviousFrame, minimumTargetMaxFrameTime); - - double drawCostFactor = 2.0; // must be greater than 1 to account for the extra cost of emptying the OpenGL fifo. - double frameFactor = 0.9; // must be less than 1, to compensate for extra time spent in update and swap buffers etc. - double timeLeftTillEndOfFrame = targetMaxFrameTime*frameFactor - timeForCullAndDraw*drawCostFactor; - double availableTime = timeLeftTillEndOfFrame / drawCostFactor; // account for the fifo when download texture objects. - - static unsigned int _numFramesThatNoTimeAvailable = 0; - static unsigned int _maxNumFramesThatNoTimeAvailable = 10; - - if (_numFramesThatNoTimeAvailable>_maxNumFramesThatNoTimeAvailable) - { - availableTime = 0.0025; // 2.5ms. - } - - if (availableTime>0.0) - { - _numFramesThatNoTimeAvailable = 0; - - // osg::notify(osg::NOTICE)<<"Time available = "<compileGLObjects(*(getSceneView()->getState()),availableTime); - - // flush deleted GL objects. - getSceneView()->flushDeletedGLObjects(availableTime); - } - else - { - ++_numFramesThatNoTimeAvailable; - } -#endif - dp->signalEndFrame(); - } -} - -void OsgSceneHandler::setContextID( int id ) -{ - _sceneView->getState()->setContextID( id ); -} diff --git a/src/osgProducer/Version.cpp b/src/osgProducer/Version.cpp deleted file mode 100644 index 05e6f059e..000000000 --- a/src/osgProducer/Version.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include - -const char* osgProducerGetVersion() -{ - return "1.2"; -} - - -const char* osgProducerGetLibraryName() -{ - return "OpenSceneGraph Producer Library"; -} diff --git a/src/osgProducer/Viewer.cpp b/src/osgProducer/Viewer.cpp deleted file mode 100644 index 4bc4da549..000000000 --- a/src/osgProducer/Viewer.cpp +++ /dev/null @@ -1,996 +0,0 @@ -#include -#include -#include -#include -#include - -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include - -using namespace osgProducer; - -#ifdef __APPLE__ -#define SINGLE_THREAD_KEYBOARDMOUSE -#endif - - -class CollectedCoordinateSystemNodesVisitor : public osg::NodeVisitor -{ -public: - - CollectedCoordinateSystemNodesVisitor(): - NodeVisitor(osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN) {} - - - virtual void apply(osg::Node& node) - { - traverse(node); - } - - virtual void apply(osg::CoordinateSystemNode& node) - { - if (_pathToCoordinateSystemNode.empty()) - { - osg::notify(osg::INFO)<<"Found CoordianteSystemNode node"<getCoordinateSystemNodePath(); - - if (!tmpPath.empty()) - { - osg::Matrixd coordinateFrame; - - osg::CoordinateSystemNode* csn = dynamic_cast(tmpPath.back()); - if (csn) - { - osg::Vec3 local_position = position*osg::computeWorldToLocal(tmpPath); - - // get the coordinate frame in world coords. - coordinateFrame = csn->computeLocalCoordinateFrame(local_position)* osg::computeLocalToWorld(tmpPath); - - // keep the position of the coordinate frame to reapply after rescale. - osg::Vec3d pos = coordinateFrame.getTrans(); - - // compensate for any scaling, so that the coordinate frame is a unit size - osg::Vec3d x(1.0,0.0,0.0); - osg::Vec3d y(0.0,1.0,0.0); - osg::Vec3d z(0.0,0.0,1.0); - x = osg::Matrixd::transform3x3(x,coordinateFrame); - y = osg::Matrixd::transform3x3(y,coordinateFrame); - z = osg::Matrixd::transform3x3(z,coordinateFrame); - coordinateFrame.preMult(osg::Matrixd::scale(1.0/x.length(),1.0/y.length(),1.0/z.length())); - - // reapply the position. - coordinateFrame.setTrans(pos); - - osg::notify(osg::INFO)<<"csn->computeLocalCoordinateFrame(position)* osg::computeLocalToWorld(tmpPath)"<addCommandLineOption("-p ","Specify camera path file to animate the camera through the loaded scene"); - arguments.getApplicationUsage()->addCommandLineOption("--run-till-frame-number ","Specify the number of frame to run"); - arguments.getApplicationUsage()->addCommandLineOption("--run-till-elapsed-time","Specify the amount of time to run"); - arguments.getApplicationUsage()->addCommandLineOption("--clear-color ,,[,]","Specify the clear color as RGB or RGBA"); - } - - osg::DisplaySettings::instance()->readCommandLine(arguments); - osgDB::readCommandLine(arguments); - - std::string pathfile; - while (arguments.read("-p",pathfile)) - { - osg::ref_ptr apm = new osgGA::AnimationPathManipulator(pathfile); - if( apm.valid() && apm->valid() ) - { - unsigned int num = addCameraManipulator(apm.get()); - selectCameraManipulator(num); - } - } - - unsigned int frameNumber; - while (arguments.read("--run-till-frame-number",frameNumber)) - { - setDoneAtFrameNumber(frameNumber); - } - - double elapsedTime; - while (arguments.read("--run-till-elapsed-time",elapsedTime)) - { - setDoneAtElapsedTime(elapsedTime); - } - - std::string filename; - while (arguments.read("--write-image-when-done",filename)) - { - setWriteImageWhenDone(true); - setWriteImageFileName(filename); - } - - std::string colorStr; - while (arguments.read("--clear-color",colorStr)) - { - float r, g, b; - float a = 1.0f; - int cnt = sscanf( colorStr.c_str(), "%f,%f,%f,%f", &r, &g, &b, &a ); - if( cnt==3 || cnt==4 ) setClearColor( osg::Vec4(r,g,b,a) ); - else osg::notify(osg::WARN)<<"Invalid clear color \""<flushAll(); - } -} - -osg::NodePath Viewer::getCoordinateSystemNodePath() const -{ - osg::NodePath nodePath; - for(ObserveredNodePath::const_iterator itr = _coordinateSystemNodePath.begin(); - itr != _coordinateSystemNodePath.end(); - ++itr) - { - nodePath.push_back(const_cast(itr->get())); - } - return nodePath; -} - -void Viewer::setWriteImageFileName(const std::string& filename) -{ - _writeImageFileName = filename; - for(EventHandlerList::iterator itr = getEventHandlerList().begin(); - itr != getEventHandlerList().end(); - ++itr) - { - ViewerEventHandler* viewerEventHandler = dynamic_cast(itr->get()); - if (viewerEventHandler) - { - viewerEventHandler->setWriteImageFileName(filename); - } - } -} - -const std::string& Viewer::getWriteImageFileName() const -{ - return _writeImageFileName; -} - -static osg::ApplicationUsageProxy Viewer_e0(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE, "OSG_IMAGE_FILE_NAME ", "name of snapshot image file" ); - -const char* Viewer::getDefaultImageFileName() -{ - const char* name = getenv( "OSG_IMAGE_FILE_NAME" ); - return name ? name : "saved_image.jpg"; -} - - -void Viewer::setCoordinateSystemNodePath(const osg::NodePath& nodePath) -{ - _coordinateSystemNodePath.clear(); - std::copy(nodePath.begin(), - nodePath.end(), - std::back_inserter(_coordinateSystemNodePath)); -} - -void Viewer::computeActiveCoordinateSystemNodePath() -{ - // now search for CoordinateSystemNode's for which we want to track. - osg::Node* subgraph = getTopMostSceneData(); - - if (subgraph) - { - CollectedCoordinateSystemNodesVisitor ccsnv; - subgraph->accept(ccsnv); - - if (!ccsnv._pathToCoordinateSystemNode.empty()) - { - setCoordinateSystemNodePath(ccsnv._pathToCoordinateSystemNode); - return; - } - } - // otherwise no node path found so reset to empty. - setCoordinateSystemNodePath(osg::NodePath()); -} - -void Viewer::updatedSceneData() -{ - OsgCameraGroup::updatedSceneData(); - - // refresh the coordinate system node path. - computeActiveCoordinateSystemNodePath(); - - // refresh the camera manipulators - if (_keyswitchManipulator.valid()) _keyswitchManipulator->setNode(getTopMostSceneData()); -} - -void Viewer::setKeyboardMouse(Producer::KeyboardMouse* kbm) -{ - _kbm = kbm; - if (_kbm.valid() && _kbmcb.valid()) _kbm->setCallback(_kbmcb.get()); -} - -void Viewer::setKeyboardMouseCallback(osgProducer::KeyboardMouseCallback* kbmcb) -{ - _kbmcb = kbmcb; - if (_kbm.valid() && _kbmcb.valid()) - { - _kbm->setCallback(_kbmcb.get()); - _kbmcb->setEventQueue(_eventQueue.get()); - } -} - -void Viewer::setUpViewer(unsigned int options) -{ - - // set up the keyboard and mouse handling. - Producer::InputArea *ia = getCameraConfig()->getInputArea(); - - if (!_kbm) - { - setKeyboardMouse(ia ? - (new Producer::KeyboardMouse(ia)) : - (new Producer::KeyboardMouse(getCamera(0)->getRenderSurface())) ); - - } - - // set the keyboard mouse callback to catch the events from the windows. - if (!_kbmcb) - { - setKeyboardMouseCallback(new osgProducer::KeyboardMouseCallback( _kbm.get(), _done, (options & ESCAPE_SETS_DONE)!=0 )); - } - - // register the callback with the keyboard mouse manger. - _kbm->setCallback( _kbmcb.get() ); - //kbm->allowContinuousMouseMotionUpdate(true); - - - - // set the globa state - - osg::ref_ptr globalStateSet = new osg::StateSet; - setGlobalStateSet(globalStateSet.get()); - { - globalStateSet->setGlobalDefaults(); - // enable depth testing by default. - globalStateSet->setMode(GL_DEPTH_TEST, osg::StateAttribute::ON); - -#if 0 - // set up an alphafunc by default to speed up blending operations. - osg::AlphaFunc* alphafunc = new osg::AlphaFunc; - alphafunc->setFunction(osg::AlphaFunc::GREATER,0.0f); - globalStateSet->setAttributeAndModes(alphafunc, osg::StateAttribute::ON); -#endif - } - - if (options & HEAD_LIGHT_SOURCE || options & SKY_LIGHT_SOURCE) - { - // enable lighting by default - globalStateSet->setMode(GL_LIGHTING, osg::StateAttribute::ON); - - // add either a headlight or sun light to the scene. - osg::LightSource* lightsource = new osg::LightSource; - setSceneDecorator(lightsource); - { - osg::Light* light = new osg::Light; - lightsource->setLight(light); - if (options & HEAD_LIGHT_SOURCE) - { - lightsource->setReferenceFrame(osg::LightSource::ABSOLUTE_RF); // headlight. - } - else - { - lightsource->setReferenceFrame(osg::LightSource::RELATIVE_RF); // skylight - } - lightsource->setLocalStateSetModes(osg::StateAttribute::ON); - } - } - - if (!_updateVisitor) _updateVisitor = new osgUtil::UpdateVisitor; - - _updateVisitor->setFrameStamp(_frameStamp.get()); - - if (!_eventVisitor) _eventVisitor = new osgGA::EventVisitor; - _eventVisitor->setActionAdapter(this); - - - if (options&TRACKBALL_MANIPULATOR) addCameraManipulator(new osgGA::TrackballManipulator); - if (options&FLIGHT_MANIPULATOR) addCameraManipulator(new osgGA::FlightManipulator); - if (options&DRIVE_MANIPULATOR) addCameraManipulator(new osgGA::DriveManipulator); - if (options&TERRAIN_MANIPULATOR) addCameraManipulator(new osgGA::TerrainManipulator); - if (options&UFO_MANIPULATOR) addCameraManipulator(new osgGA::UFOManipulator); - - if (options&STATE_MANIPULATOR) - { - osg::ref_ptr statesetManipulator = new osgGA::StateSetManipulator; - statesetManipulator->setStateSet(getGlobalStateSet()); - _eventHandlerList.push_back(statesetManipulator.get()); - } - - if (options&VIEWER_MANIPULATOR) - { - getEventHandlerList().push_back(new ViewerEventHandler(this)); - } - -} - -unsigned int Viewer::addCameraManipulator(osgGA::MatrixManipulator* cm) -{ - if (!cm) return 0xfffff; - - // create a key switch manipulator if one doesn't already exist. - if (!_keyswitchManipulator) - { - _keyswitchManipulator = new osgGA::KeySwitchMatrixManipulator; - _eventHandlerList.push_back(_keyswitchManipulator.get()); - } - - unsigned int num = _keyswitchManipulator->getNumMatrixManipulators(); - _keyswitchManipulator->addNumberedMatrixManipulator(cm); - - return num; -} - -bool Viewer::done() const -{ - return _done || - !validForRendering() || - (_setDoneAtElapsedTimeEnabled && _setDoneAtElapsedTime<=getFrameStamp()->getReferenceTime()) || - (_setDoneAtFrameNumberEnabled && _setDoneAtFrameNumber<=_frameNumber); -} - -void Viewer::setViewByMatrix( const Producer::Matrix & pm) -{ - CameraGroup::setViewByMatrix(pm); - - if (_keyswitchManipulator.valid()) - { - // now convert Producer matrix to an osg::Matrix so we can update - // the internal camera... - - osg::Matrixd matrix(pm.ptr()); - _keyswitchManipulator->setByInverseMatrix(matrix); - } -} - -bool Viewer::realize( ThreadingModel thread_model ) -{ - if( _realized ) return _realized; - _threadModel = thread_model; - return realize(); -} - -class PostSwapFinishCallback : public Producer::Camera::Callback -{ -public: - - PostSwapFinishCallback() {} - - virtual void operator()(const Producer::Camera&) - { - // glFinish(); - } -}; - -bool Viewer::realize() -{ - if (_realized) return _realized; - - OsgCameraGroup::realize(); - - // force a sync before we intialize the keyswitch manipulator to home - // so that Producer has a chance to set up the windows before we do - // any work on them. - OsgCameraGroup::sync(); - -#ifndef SINGLE_THREAD_KEYBOARDMOUSE - // kick start the keyboard mouse if needed. - if (_kbm.valid() && !_kbm->isRunning()) - { - _kbm->startThread(); - - while (!_kbm->isRunning()) - { - // osg::notify(osg::NOTICE)<<"Waiting"<updateWindowSize(); - - // by default set up the DatabasePager. - { - osgDB::DatabasePager* databasePager = osgDB::Registry::instance()->getOrCreateDatabasePager(); - databasePager->registerPagedLODs(getTopMostSceneData()); - - for(SceneHandlerList::iterator p=_shvec.begin(); - p!=_shvec.end(); - ++p) - { - // pass the database pager to the cull visitor so node can send requests to the pager. - (*p)->getSceneView()->getCullVisitor()->setDatabaseRequestHandler(databasePager); - - // tell the database pager which graphic context the compile of rendering objexts is needed. - databasePager->setCompileGLObjectsForContextID((*p)->getSceneView()->getState()->getContextID(),true); - } - - - // set up a post swap callback to flush deleted GL objects and compile new GL objects - for(unsigned int cameraNum=0;cameraNumaddPostSwapCallback(new PostSwapFinishCallback()); - } - - } - - - if (_keyswitchManipulator.valid() && _keyswitchManipulator->getCurrentMatrixManipulator() && _eventQueue.valid()) - { - _keyswitchManipulator->setCoordinateFrameCallback(new ViewerCoordinateFrameCallback(this)); - - osg::ref_ptr init_event = _eventQueue->createEvent(); - - _keyswitchManipulator->setNode(getTopMostSceneData()); - _keyswitchManipulator->home(*init_event,*this); - } - - // set up osg::State objects with the _done prt to allow early termination of - // draw traversal. - for(SceneHandlerList::iterator p=_shvec.begin(); p!=_shvec.end(); p++ ) - { - (*p)->getSceneView()->getState()->setAbortRenderingPtr(&_done); - } - - return _realized; -} - - -void Viewer::update() -{ -#ifdef SINGLE_THREAD_KEYBOARDMOUSE - if (_kbm.valid() && !_kbm->isRunning()) _kbm->update(*(_kbm->getCallback())); -#endif - - // create an event to signal the new frame. - getEventQueue()->frame(_frameStamp->getReferenceTime()); - - // get the event since the last frame. - osgGA::EventQueue::Events events; - getEventQueue()->takeEvents(events); - - if (_eventVisitor.valid()) - { - _eventVisitor->setTraversalNumber(_frameStamp->getFrameNumber()); - } - - // dispatch the events in order of arrival. - for(osgGA::EventQueue::Events::iterator event_itr=events.begin(); - event_itr!=events.end(); - ++event_itr) - { - bool handled = false; - - if (_eventVisitor.valid()) - { - _eventVisitor->reset(); - _eventVisitor->addEvent(event_itr->get()); - getTopMostSceneData()->accept(*_eventVisitor); - if (_eventVisitor->getEventHandled()) - handled = true; - } - - for(EventHandlerList::iterator handler_itr=_eventHandlerList.begin(); - handler_itr!=_eventHandlerList.end() && !handled; - ++handler_itr) - { - handled = (*handler_itr)->handle(*(*event_itr),*this,0,0); - } - - } - - if (osgDB::Registry::instance()->getDatabasePager()) - { - // update the scene graph by remove expired subgraphs and merge newly loaded subgraphs - osgDB::Registry::instance()->getDatabasePager()->updateSceneGraph(_frameStamp->getReferenceTime()); - } - - if (_updateVisitor.valid()) - { - _updateVisitor->setTraversalNumber(_frameStamp->getFrameNumber()); - - // update the scene by traversing it with the the update visitor which will - // call all node update callbacks and animations. - getTopMostSceneData()->accept(*_updateVisitor); - } - - - // update the main producer camera - if (_keyswitchManipulator.valid() && _keyswitchManipulator->getCurrentMatrixManipulator()) - { - osgGA::MatrixManipulator* mm = _keyswitchManipulator->getCurrentMatrixManipulator(); - osg::Matrixd matrix = mm->getInverseMatrix(); - CameraGroup::setViewByMatrix(Producer::Matrix(matrix.ptr())); - - setFusionDistance(mm->getFusionDistanceMode(),mm->getFusionDistanceValue()); - - } -} - -void Viewer::frame() -{ - // record the position of the view point. - osg::Matrixd matrix; - matrix.invert(getViewMatrix()); - _orientation = matrix.getRotate(); - - double newPosition[3]; - newPosition[0] = matrix(3,0); - newPosition[1] = matrix(3,1); - newPosition[2] = matrix(3,2); - - _speed = sqrtf(osg::square(newPosition[0]-_position[0])+osg::square(newPosition[1]-_position[1])+osg::square(newPosition[2]-_position[2])); - _position[0] = newPosition[0]; - _position[1] = newPosition[1]; - _position[2] = newPosition[2]; - -#if 0 - osg::Quat::value_type angle; - osg::Vec3 axis; - - osg::Quat roll; - roll.makeRotate(-osg::PI/2.0f,1,0,0); - - _orientation = roll*_orientation; - - _orientation.getRotate(angle,axis); - - std::cout<<"_position "<<_position[0]<<", "<<_position[1]<<", "<<_position[2]<<" speed "<<_speed<<" angle "<empty()) _recordingStartTime = _frameStamp->getReferenceTime(); - - getAnimationPath()->insert(_frameStamp->getReferenceTime()-_recordingStartTime,osg::AnimationPath::ControlPoint(osg::Vec3(_position[0],_position[1],_position[2]),_orientation)); - } - - if (done() && getWriteImageWhenDone()) - { - for(EventHandlerList::iterator itr = getEventHandlerList().begin(); - itr != getEventHandlerList().end(); - ++itr) - { - ViewerEventHandler* viewerEventHandler = dynamic_cast(itr->get()); - if (viewerEventHandler) - { - osg::notify(osg::NOTICE)<<"Need to write image"<setWriteImageOnNextFrame(true); - } - } - - } - - OsgCameraGroup::frame(); - - - if (osg::Referenced::getDeleteHandler()) - { - osg::Referenced::getDeleteHandler()->flush(); - } - -} - -bool Viewer::computePixelCoords(float x,float y,unsigned int cameraNum,float& pixel_x,float& pixel_y) -{ - Producer::KeyboardMouse* km = getKeyboardMouse(); - if (!km) return false; - - if (cameraNum>=getNumberOfCameras()) return false; - - Producer::Camera* camera=getCamera(cameraNum); - Producer::RenderSurface* rs = camera->getRenderSurface(); - - //std::cout << "checking camara "<computePixelCoords(x,y,rs,pixel_x,pixel_y)) - { - //std::cout << " compute pixel coords "<getProjectionRectangle( pr_wx, pr_wy, pr_width, pr_height ); - - int rs_wx, rs_wy; - unsigned int rs_width, rs_height; - rs->getWindowRectangle( rs_wx, rs_wy, rs_width, rs_height ); - - pixel_x -= (float)rs_wx; - pixel_y -= (float)rs_wy; - - //std::cout << " wx = "<getUsage(usage); - } -} - -void Viewer::cleanup_frame() -{ - for(EventHandlerList::iterator itr = _eventHandlerList.begin(); - itr != _eventHandlerList.end(); - ++itr) - { - (*itr)->releaseGLObjects(); - - ViewerEventHandler* veh = dynamic_cast(itr->get()); - if (veh) - { - // switch off stats so it doesn't try to redraw them. - veh->setFrameStatsMode(ViewerEventHandler::NO_STATS); - veh->setDisplayHelp(false); - veh->setWriteImageOnNextFrame(false); - } - } - - OsgCameraGroup::cleanup_frame(); -} diff --git a/src/osgProducer/ViewerEventHandler.cpp b/src/osgProducer/ViewerEventHandler.cpp deleted file mode 100644 index 98d49acf9..000000000 --- a/src/osgProducer/ViewerEventHandler.cpp +++ /dev/null @@ -1,1280 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -#include -#include - -using namespace osgProducer; - - -class ViewerEventHandler::SnapImageDrawCallback : public Producer::Camera::Callback -{ -public: - - SnapImageDrawCallback(): - _snapImageOnNextFrame(false) - { - } - - void setFileName(const std::string& filename) { _filename = filename; } - const std::string& getFileName() const { return _filename; } - - void setSnapImageOnNextFrame(bool flag) { _snapImageOnNextFrame = flag; } - bool getSnapImageOnNextFrame() const { return _snapImageOnNextFrame; } - - virtual void operator()( const Producer::Camera & camera) - { - if (!_snapImageOnNextFrame) return; - - int x,y; - unsigned int width,height; - camera.getProjectionRectangle(x,y,width,height); - - osg::ref_ptr image = new osg::Image; - image->readPixels(x,y,width,height, - GL_RGB,GL_UNSIGNED_BYTE); - - if (osgDB::writeImageFile(*image,_filename)) - { - osg::notify(osg::NOTICE) << "Saved screen image to `"<<_filename<<"`"<< std::endl; - } - - _snapImageOnNextFrame = false; - } - -protected: - - std::string _filename; - bool _snapImageOnNextFrame; - - -}; - -class ViewerEventHandler::StatsAndHelpDrawCallback : public Producer::CameraGroup::StatsHandler, public Producer::Camera::Callback -{ -public: - - StatsAndHelpDrawCallback(ViewerEventHandler* veh, unsigned int cameraNumber): - _veh(veh), - _cameraNumber(cameraNumber), - _helpInitialized(false), - _statsInitialized(false), - _infoInitialized(false) - { - _fs.resize(10); - _index = 0; - - Producer::PipeTimer::instance()->setReturnType( Producer::PipeTimer::milliseconds ); - - _veh->getOsgCameraGroup()->setStatsHandler(this); - - _stateset = new osg::StateSet; - _viewport = new osg::Viewport(0,0,1280,1024); - _stateset->setAttribute(_viewport.get()); - _stateset->setAttribute(new osg::BlendFunc()); - _stateset->setMode(GL_DEPTH_TEST,osg::StateAttribute::OFF); - _stateset->setMode(GL_BLEND,osg::StateAttribute::ON); - - _projection = new osg::RefMatrix(osg::Matrix::ortho2D(0.0,1280,0.0,1024)); - _modelview = new osg::RefMatrix(); - - //createHelpText(); - //createStatsText(); - - //_helpInitialized = false; - - } - - void setArraySize(unsigned int size) { _fs.resize(size); } - unsigned int getArraySize() { return _fs.size(); } - - void operator() (const Producer::CameraGroup &cg ) - { - _index = (_index + 1) % _fs.size(); - _fs[_index] = cg.getFrameStats(); - } - - virtual void operator()( const Producer::Camera & camera); - - typedef std::vector< osg::ref_ptr > TextList; - void releaseTextList(const TextList& list) const - { - for(TextList::const_iterator itr = list.begin(); - itr != list.end(); - ++itr) - { - (*itr)->releaseGLObjects(); - } - } - - void releaseGLObjects() const - { - releaseTextList(_descriptionList); - releaseTextList(_optionList); - releaseTextList(_explanationList); - releaseTextList(_statsLabelList); - releaseTextList(_infoLabelList); - releaseTextList(_sceneStatsLabelList); - releaseTextList(_cullTimeText); - releaseTextList(_drawTimeText); - releaseTextList(_gpuTimeText); - - if (_frameRateLabelText.valid()) _frameRateLabelText->releaseGLObjects(); - if (_frameRateCounterText.valid()) _frameRateCounterText->releaseGLObjects(); - if (_updateTimeText.valid()) _updateTimeText->releaseGLObjects(); - - if (_positionText.valid()) _positionText->releaseGLObjects(); - if (_orientationText.valid()) _orientationText->releaseGLObjects(); - if (_speedText.valid()) _speedText->releaseGLObjects(); - - if (_numVerticesText.valid()) _numVerticesText->releaseGLObjects(); - if (_numPrimitivesText.valid()) _numPrimitivesText->releaseGLObjects(); - if (_numDrawablesText.valid()) _numDrawablesText->releaseGLObjects(); - - } - -protected: - - ViewerEventHandler* _veh; - unsigned int _cameraNumber; - - osg::ref_ptr _stateset; - osg::ref_ptr _viewport; - osg::ref_ptr _projection; - osg::ref_ptr _modelview; - - // help related methods and data - void displayHelp(); - void createHelpText(); - - bool _helpInitialized; - TextList _descriptionList; - TextList _optionList; - TextList _explanationList; - - - // stats related methods and data. - void displayStats(); - void createStatsText(); - - typedef std::vector CameraTimes; - - bool _statsInitialized; - osg::ref_ptr _frameRateLabelText; - osg::ref_ptr _frameRateCounterText; - TextList _statsLabelList; - osg::ref_ptr _updateTimeText; - CameraTimes _cullTimes; - TextList _cullTimeText; - CameraTimes _drawTimes; - TextList _drawTimeText; - TextList _gpuTimeText; - - // info related methods and data. - void displayInfo(); - void createInfoText(); - - bool _infoInitialized; - TextList _infoLabelList; - osg::ref_ptr _positionText; - osg::ref_ptr _orientationText; - osg::ref_ptr _speedText; - - TextList _sceneStatsLabelList; - osg::ref_ptr _numVerticesText; - osg::ref_ptr _numPrimitivesText; - osg::ref_ptr _numDrawablesText; - - - std::vector _fs; - unsigned int _index; - -}; - - -void ViewerEventHandler::StatsAndHelpDrawCallback::operator()( const Producer::Camera & camera) -{ - if (_veh->getDisplayHelp()==false && - _veh->getFrameStatsMode()==ViewerEventHandler::NO_STATS) return; - - int x,y; - unsigned int width,height; - camera.getProjectionRectangle(x,y,width,height); - - // don't redraw if the new window size is 0 width or height. - if (width==0 || height==0) return; - - _viewport->setViewport(x,y,width,height); - - OsgSceneHandler* osh = _veh->getOsgCameraGroup()->getSceneHandlerList()[_cameraNumber].get(); - osgUtil::SceneView* sv = osh->getSceneView(); - osg::State& state = *(sv->getState()); - - - if (!_projection) _projection = new osg::RefMatrix(osg::Matrix::ortho2D(0.0,width/height*1024.0f,0.0,1024.0)); - else - { - _projection->makeOrtho2D(0.0,width/height*1024.0f,0.0,1024.0); - } - - - state.applyProjectionMatrix(_projection.get()); - state.applyModelViewMatrix(_modelview.get()); - - state.pushStateSet(_stateset.get()); - state.apply(); - - if (_veh->getFrameStatsMode()!=ViewerEventHandler::NO_STATS && camera.getInstrumentationMode()) - { - displayStats(); - } - - if (_veh->getDisplayHelp()) - { - displayHelp(); - } - - if (_veh->getDisplayHelp()) - { - displayInfo(); - } - - state.popStateSet(); - - //state.apply(); - -} - -void ViewerEventHandler::StatsAndHelpDrawCallback::displayHelp() -{ - if (!_helpInitialized) createHelpText(); - - OsgSceneHandler* osh = _veh->getOsgCameraGroup()->getSceneHandlerList()[_cameraNumber].get(); - osgUtil::SceneView* sv = osh->getSceneView(); - - - for(TextList::iterator ditr=_descriptionList.begin(); - ditr!=_descriptionList.end(); - ++ditr) - { - (*ditr)->draw(sv->getRenderInfo()); - } - - for(TextList::iterator oitr=_optionList.begin(); - oitr!=_optionList.end(); - ++oitr) - { - (*oitr)->draw(sv->getRenderInfo()); - } - - for(TextList::iterator eitr=_explanationList.begin(); - eitr!=_explanationList.end(); - ++eitr) - { - (*eitr)->draw(sv->getRenderInfo()); - } -} - -void ViewerEventHandler::StatsAndHelpDrawCallback::createHelpText() -{ - - OsgCameraGroup* ocg = _veh->getOsgCameraGroup(); - if (ocg->getApplicationUsage()) - { - - const osg::ApplicationUsage::UsageMap& um = ocg->getApplicationUsage()->getKeyboardMouseBindings(); - - float maxWidthOfDisplayRegion = 1200.0f; - float bottomOfDescription = 1000.0f; - osg::Vec3 posDescription(0.0f,bottomOfDescription,0.0f); - osg::Vec4 colorDescription(1.0f,1.0f,0.0f,1.0f); - osg::Vec4 backdropColorDescription(0.0f,0.0f,0.0f,1.0f); - float characterSize = 20.0f; - - if (!(ocg->getApplicationUsage()->getDescription()).empty()) - { - osgText::Text* text = new osgText::Text; - text->setFont("fonts/arial.ttf"); - text->setColor(colorDescription); - text->setFontResolution((unsigned int)characterSize,(unsigned int)characterSize); - text->setCharacterSize(characterSize); - text->setPosition(posDescription); - text->setMaximumWidth(maxWidthOfDisplayRegion); - text->setAlignment(osgText::Text::BASE_LINE); - text->setBackdropType(osgText::Text::OUTLINE); - // Probably could use NO_DEPTH_BUFFER and not have any problems - text->setBackdropImplementation(osgText::Text::DEPTH_RANGE); - text->setBackdropColor(backdropColorDescription); - text->setText(ocg->getApplicationUsage()->getDescription()); - - bottomOfDescription = text->getBound().yMin()-characterSize*2.0f; - - _descriptionList.push_back(text); - - } - - osg::Vec3 posOption(0.0f,bottomOfDescription,0.0f); - osg::Vec4 colorOption(1.0f,1.0f,0.0f,1.0f); - osg::Vec4 backdropColorOption(0.0f,0.0f,0.0f,1.0f); - float maxX = 0.0f; - - // create option strings. - osg::ApplicationUsage::UsageMap::const_iterator citr; - for(citr=um.begin(); - citr!=um.end(); - ++citr) - { - osgText::Text* text = new osgText::Text; - text->setFont("fonts/arial.ttf"); - text->setColor(colorOption); - text->setFontResolution((unsigned int)characterSize,(unsigned int)characterSize); - text->setCharacterSize(characterSize); - text->setPosition(posOption); - text->setAlignment(osgText::Text::BASE_LINE); - text->setBackdropType(osgText::Text::OUTLINE); - // Probably could use NO_DEPTH_BUFFER and not have any problems - text->setBackdropImplementation(osgText::Text::DEPTH_RANGE); - text->setBackdropColor(backdropColorOption); - text->setText(citr->first); - - if (text->getBound().xMax()>maxX) maxX=text->getBound().xMax(); - - _optionList.push_back(text); - - } - - osg::Vec3 posExplanation(maxX+characterSize,bottomOfDescription,0.0f); - osg::Vec4 colorExplanation(1.0f,1.0f,0.0f,1.0f); - osg::Vec4 backdropColorExplanation(0.0f,0.0f,0.0f,1.0f); - float maxWidth = maxWidthOfDisplayRegion-maxX; - - TextList::iterator oitr; - TextList::iterator eitr; - TextList::iterator ditr; - - for(citr=um.begin(), oitr=_optionList.begin(); - citr!=um.end(); - ++citr,++oitr) - { - osgText::Text* text = new osgText::Text; - text->setFont("fonts/arial.ttf"); - text->setColor(colorExplanation); - text->setFontResolution((unsigned int)characterSize,(unsigned int)characterSize); - text->setCharacterSize(characterSize); - text->setPosition(posExplanation); - text->setMaximumWidth(maxWidth); - text->setAlignment(osgText::Text::BASE_LINE); - text->setBackdropType(osgText::Text::OUTLINE); - // Probably could use NO_DEPTH_BUFFER and not have any problems - text->setBackdropImplementation(osgText::Text::DEPTH_RANGE); - text->setBackdropColor(backdropColorExplanation); - text->setText(citr->second); - - if (text->getBound().xMax()>maxX) maxX=text->getBound().xMax(); - - // fix the position of option text to be the same height as the examplanation. - osg::Vec3 pos((*oitr)->getPosition()); - (*oitr)->setPosition(osg::Vec3(pos.x(),posExplanation.y(),pos.z())); - - posExplanation.y() = text->getBound().yMin()-characterSize; - - _explanationList.push_back(text); - - } - - // compute the boundings of the all the text. - osg::BoundingBox bb; - for(ditr=_descriptionList.begin(); - ditr!=_descriptionList.end(); - ++ditr) - { - bb.expandBy((*ditr)->getBound()); - } - - for(oitr=_optionList.begin(); - oitr!=_optionList.end(); - ++oitr) - { - bb.expandBy((*oitr)->getBound()); - } - - for(eitr=_explanationList.begin(); - eitr!=_explanationList.end(); - ++eitr) - { - bb.expandBy((*eitr)->getBound()); - } - - float totalWidth = bb.xMax()-bb.xMin(); - float totalHeight = bb.yMax()-bb.yMin(); - float widthMargin = (1280.0f-totalWidth)*0.5f; - float heightMargin = (1024.0f-totalHeight)*0.5f; - - osg::Vec3 delta(widthMargin-bb.xMin(),heightMargin-bb.yMin(),0.0f); - - // shift the text to center it. - for(ditr=_descriptionList.begin(); - ditr!=_descriptionList.end(); - ++ditr) - { - (*ditr)->setPosition((*ditr)->getPosition()+delta); - } - - for(oitr=_optionList.begin(); - oitr!=_optionList.end(); - ++oitr) - { - (*oitr)->setPosition((*oitr)->getPosition()+delta); - } - - for(eitr=_explanationList.begin(); - eitr!=_explanationList.end(); - ++eitr) - { - (*eitr)->setPosition((*eitr)->getPosition()+delta); - } - - - } - _helpInitialized = true; -} - -void ViewerEventHandler::StatsAndHelpDrawCallback::displayStats() -{ - if (!_statsInitialized) createStatsText(); - - OsgCameraGroup* ocg = _veh->getOsgCameraGroup(); - OsgSceneHandler* osh = ocg->getSceneHandlerList()[_cameraNumber].get(); - osgUtil::SceneView* sv = osh->getSceneView(); - - bool gpuTimingsValid = false; - - char tmpText[128]; - - // render the text - if (_veh->getFrameStatsMode()>=ViewerEventHandler::FRAME_RATE) - { - // update and draw the frame rate text. - - - _frameRateLabelText->draw(sv->getRenderInfo()); - if (_fs.size()>1) - { - unsigned int lindex = (_index + 1) % _fs.size(); - double timeForFrames = (_fs[_index]._startOfFrame-_fs[lindex]._startOfFrame); - double timePerFrame = timeForFrames/(double)(_fs.size()-1); - sprintf(tmpText,"%4.2f",1.0/timePerFrame); - _frameRateCounterText->setText(tmpText); - } - _frameRateCounterText->draw(sv->getRenderInfo()); - - - if (_veh->getFrameStatsMode()>=ViewerEventHandler::CAMERA_STATS) - { - - - double updateTime = 0.0; - std::fill(_cullTimes.begin(),_cullTimes.end(),0.0); - std::fill(_drawTimes.begin(),_drawTimes.end(),0.0); - - for(unsigned int frame = 0; frame < _fs.size(); ++frame ) - { - Producer::CameraGroup::FrameStats fs = _fs[frame]; - updateTime += (fs._endOfUpdate-fs._startOfUpdate); - - for(unsigned int i = 0; i < fs.getNumFrameTimeStampSets(); ++i ) - { - Producer::Camera::FrameTimeStampSet fts = fs.getFrameTimeStampSet(i); - - _cullTimes[i] += fts[Producer::Camera::EndCull]-fts[Producer::Camera::BeginCull]; - _drawTimes[i] += fts[Producer::Camera::EndDraw]-fts[Producer::Camera::BeginDraw]; - } - } - - sprintf(tmpText,"%4.2f",1000.0*updateTime/(double)_fs.size()); - _updateTimeText->setText(tmpText); - - _updateTimeText->draw(sv->getRenderInfo()); - - TextList::iterator itr; - CameraTimes::iterator titr; - for(itr=_cullTimeText.begin(),titr = _cullTimes.begin(); - itr!=_cullTimeText.end() && titr!=_cullTimes.end(); - ++itr,++titr) - { - sprintf(tmpText,"%4.2f",1000.0*(*titr)/(double)_fs.size()); - (*itr)->setText(tmpText); - (*itr)->draw(sv->getRenderInfo()); - } - - for(itr=_drawTimeText.begin(),titr = _drawTimes.begin(); - itr!=_drawTimeText.end() && titr!=_drawTimes.end(); - ++itr,++titr) - { - sprintf(tmpText,"%4.2f",1000.0*(*titr)/(double)_fs.size()); - (*itr)->setText(tmpText); - (*itr)->draw(sv->getRenderInfo()); - } - - unsigned int i; - for(itr=_gpuTimeText.begin(), i = 0; - itr!=_gpuTimeText.end() && i < ocg->getNumberOfCameras(); - ++itr, ++i) - { - double gpuTime = ocg->getCamera(i)->getFrameStats().getPipeStats(Producer::Camera::DrawTime); - if (gpuTime!=0.0) - { - gpuTimingsValid = true; - sprintf(tmpText,"%4.2f", gpuTime); - (*itr)->setText(tmpText); - (*itr)->draw(sv->getRenderInfo()); - } - } - - for(itr=_statsLabelList.begin(); - itr!=_statsLabelList.end(); - ++itr) - { - if (gpuTimingsValid || ((*itr)->getName()!="GPU")) - { - (*itr)->draw(sv->getRenderInfo()); - } - } - } - - if (_veh->getFrameStatsMode()>=ViewerEventHandler::SCENE_STATS) - { - osgUtil::Statistics stats; - - for(osgProducer::OsgCameraGroup::SceneHandlerList::iterator shitr = _veh->getOsgCameraGroup()->getSceneHandlerList().begin(); - shitr != _veh->getOsgCameraGroup()->getSceneHandlerList().end(); - ++shitr) - { - (*shitr)->getStats(stats); - } - - unsigned int primitives = 0; - for(osgUtil::Statistics::PrimitiveCountMap::iterator pcmitr = stats.GetPrimitivesBegin(); - pcmitr != stats.GetPrimitivesEnd(); - ++pcmitr) - { - primitives += pcmitr->second; - } - - for(TextList::iterator itr = _sceneStatsLabelList.begin(); - itr != _sceneStatsLabelList.end(); - ++itr) - { - (*itr)->draw(sv->getRenderInfo()); - } - - sprintf(tmpText,"%d",stats._vertexCount); - _numVerticesText->setText(tmpText); - _numVerticesText->draw(sv->getRenderInfo()); - - sprintf(tmpText,"%d",primitives); - _numPrimitivesText->setText(tmpText); - _numPrimitivesText->draw(sv->getRenderInfo()); - - sprintf(tmpText,"%d",stats.numDrawables); - _numDrawablesText->setText(tmpText); - _numDrawablesText->draw(sv->getRenderInfo()); - } - } - - // render graphs - if (_veh->getFrameStatsMode()>=ViewerEventHandler::CAMERA_STATS) - { - - sv->getState()->applyTextureMode(0,GL_TEXTURE_2D,false); - - // Set up the Orthographic view - glMatrixMode( GL_PROJECTION ); - glPushMatrix(); - glLoadIdentity(); - - if (gpuTimingsValid) - { - glOrtho( -0.075, .128, 600.0, -20.0, -1.0, 1.0 ); - } - else - { - glOrtho( -0.04, .128, 600.0, -20.0, -1.0, 1.0 ); - } - - - unsigned int lindex = (_index + 1) % _fs.size(); - Producer::Camera::TimeStamp zero = _fs[lindex]._startOfFrame; - unsigned int i; - double x1=0.0, x2=0.0, y1=0.0, y2=0.0; - for(unsigned int frame = 0; frame < _fs.size(); frame++ ) - { - Producer::CameraGroup::FrameStats fs = _fs[(lindex + frame) % _fs.size()]; - y1 = 0.0; - y2 = y1 + 10; - x1 = fs._startOfUpdate - zero; - x2 = fs._endOfUpdate - zero; - - glBegin( GL_QUADS ); - - // Draw Update length - glColor4f( 0.0, 1.0, 0.0, 0.5 ); - glVertex2d( x1, y1); - glVertex2d( x2, y1); - glVertex2d( x2, y2); - glVertex2d( x1, y2); - - for( i = 0; i < fs.getNumFrameTimeStampSets(); i++ ) - { - Producer::Camera::FrameTimeStampSet fts = fs.getFrameTimeStampSet(i); - y1 += 13.0; - y2 = y1 + 10.0; - x1 = fts[Producer::Camera::BeginCull] - zero; - x2 = fts[Producer::Camera::EndCull] - zero; - - glColor4f( 0.0, 1.0, 1.0, 0.5 ); - glVertex2d( x1, y1); - glVertex2d( x2, y1); - glVertex2d( x2, y2); - glVertex2d( x1, y2); - - x1 = fts[Producer::Camera::BeginDraw] - zero; - x2 = fts[Producer::Camera::EndDraw] - zero; - - glColor4f( 1.0, 1.0, 0.0, 0.5 ); - glVertex2d( x1, y1); - glVertex2d( x2, y1); - glVertex2d( x2, y2); - glVertex2d( x1, y2); - - } - glEnd(); - - glBegin( GL_LINES ); - glColor4f( 1, 1, 1, 0.5 ); - glVertex2d( fs._startOfFrame - zero , 0.0 ); - y1 = fs.getNumFrameTimeStampSets() * 13.0 + 10.0; - glVertex2d( fs._startOfFrame - zero, y1 ); - - y1 = 12.5; - for( i = 0; i < fs.getNumFrameTimeStampSets(); i++ ) - { - y2 = y1 + 11; - Producer::Camera::FrameTimeStampSet fts = fs.getFrameTimeStampSet(i); - Producer::Camera::TimeStamp vsync = fts[Producer::Camera::Vsync]; - double x1 = vsync - zero; - glColor4f( 1.0, 1.0, 0.0, 0.5 ); - glVertex2d( x1, y1 ); - glVertex2d( x1, y2 ); - y1 += 13.0; - } - glEnd(); - } - - glBegin( GL_LINES ); - - glColor4f( 1, 1, 1, 0.5 ); - for( i = 0; i < 128; i++ ) - { - glVertex2d((GLdouble)i*.001, y1); - - if( !(i%10) ) - glVertex2d((GLdouble)i*.001, y1 - 5.0); - else if( !(i%5) ) - glVertex2d((GLdouble)i*.001, y1 - 3.0); - else - glVertex2d((GLdouble)i*.001, y1 - 1.0); - } - - glEnd(); - - glMatrixMode( GL_PROJECTION ); - glPopMatrix(); - glMatrixMode( GL_MODELVIEW ); - - } -} - -void ViewerEventHandler::StatsAndHelpDrawCallback::createStatsText() -{ - _statsInitialized = true; - - float characterSize = 20.0f; - - osg::Vec4 colorFR(1.0f,1.0f,1.0f,1.0f); - osg::Vec4 colorUpdate( 0.0f,1.0f,0.0f,1.0f); - osg::Vec4 colorCull( 0.0f,1.0f,1.0f,1.0f); - osg::Vec4 colorDraw( 1.0f,1.0f,0.0f,1.0f); - osg::Vec4 colorGPU( 1.0f,0.5f,0.0f,1.0f); - - float leftPos = 10.0f; - - osg::Vec3 pos(leftPos,1000.0f,0.0f); - - _frameRateLabelText = new osgText::Text; - _frameRateLabelText->setFont("fonts/arial.ttf"); - _frameRateLabelText->setColor(colorFR); - _frameRateLabelText->setCharacterSize(characterSize); - _frameRateLabelText->setPosition(pos); - _frameRateLabelText->setAlignment(osgText::Text::BASE_LINE); - _frameRateLabelText->setText("Frame Rate: "); - - pos.x() = _frameRateLabelText->getBound().xMax(); - - _frameRateCounterText = new osgText::Text; - _frameRateCounterText->setFont("fonts/arial.ttf"); - _frameRateCounterText->setColor(colorFR); - _frameRateCounterText->setCharacterSize(characterSize); - _frameRateCounterText->setPosition(pos); - _frameRateCounterText->setAlignment(osgText::Text::BASE_LINE); - _frameRateCounterText->setText("0123456789."); - - - pos.x() = leftPos; - pos.y() -= characterSize*1.5f; - - { - osgText::Text* text = new osgText::Text; - text->setFont("fonts/arial.ttf"); - text->setColor(colorUpdate); - text->setFontResolution((unsigned int)characterSize,(unsigned int)characterSize); - text->setCharacterSize(characterSize); - text->setPosition(pos); - text->setAlignment(osgText::Text::BASE_LINE); - text->setText("Update: "); - - _statsLabelList.push_back(text); - - pos.x() = text->getBound().xMax(); - - _updateTimeText = new osgText::Text; - - _updateTimeText->setFont("fonts/arial.ttf"); - _updateTimeText->setColor(colorUpdate); - _updateTimeText->setFontResolution((unsigned int)characterSize,(unsigned int)characterSize); - _updateTimeText->setCharacterSize(characterSize); - _updateTimeText->setPosition(pos); - _updateTimeText->setAlignment(osgText::Text::BASE_LINE); - _updateTimeText->setText("0123456789."); - - } - - pos.x() = leftPos; - pos.y() -= characterSize; - - _cullTimes.clear(); - _drawTimes.clear(); - - OsgCameraGroup* ocg = _veh->getOsgCameraGroup(); - Producer::CameraConfig* cfg = ocg->getCameraConfig(); - for (unsigned int i=0;igetNumberOfCameras(); ++i ) - { - pos.x() = leftPos; - - osgText::Text* cullLabel = new osgText::Text; - cullLabel->setFont("fonts/arial.ttf"); - cullLabel->setColor(colorCull); - cullLabel->setFontResolution((unsigned int)characterSize,(unsigned int)characterSize); - cullLabel->setCharacterSize(characterSize); - cullLabel->setPosition(pos); - cullLabel->setAlignment(osgText::Text::BASE_LINE); - cullLabel->setText("Cull: "); - - _statsLabelList.push_back(cullLabel); - - pos.x() = cullLabel->getBound().xMax(); - - osgText::Text* cullField = new osgText::Text; - - cullField->setFont("fonts/arial.ttf"); - cullField->setColor(colorCull); - cullField->setFontResolution((unsigned int)characterSize,(unsigned int)characterSize); - cullField->setCharacterSize(characterSize); - cullField->setPosition(pos); - cullField->setAlignment(osgText::Text::BASE_LINE); - cullField->setText("1000.00"); - - _cullTimes.push_back(0.0); - - _cullTimeText.push_back(cullField); - - pos.x() = cullField->getBound().xMax(); - - - osgText::Text* drawLabel = new osgText::Text; - drawLabel->setFont("fonts/arial.ttf"); - drawLabel->setColor(colorDraw); - drawLabel->setFontResolution((unsigned int)characterSize,(unsigned int)characterSize); - drawLabel->setCharacterSize(characterSize); - drawLabel->setPosition(pos); - drawLabel->setAlignment(osgText::Text::BASE_LINE); - drawLabel->setText("Draw: "); - - _statsLabelList.push_back(drawLabel); - - pos.x() = drawLabel->getBound().xMax(); - - osgText::Text* drawField = new osgText::Text; - - drawField->setFont("fonts/arial.ttf"); - drawField->setColor(colorDraw); - drawField->setFontResolution((unsigned int)characterSize,(unsigned int)characterSize); - drawField->setCharacterSize(characterSize); - drawField->setPosition(pos); - drawField->setAlignment(osgText::Text::BASE_LINE); - drawField->setText("1000.00"); - - _drawTimeText.push_back(drawField); - - _drawTimes.push_back(0.0); - - pos.x() = drawField->getBound().xMax(); - - - osgText::Text* gpuLabel = new osgText::Text; - gpuLabel->setFont("fonts/arial.ttf"); - gpuLabel->setName("GPU"); - gpuLabel->setColor(colorGPU); - gpuLabel->setFontResolution((unsigned int)characterSize,(unsigned int)characterSize); - gpuLabel->setCharacterSize(characterSize); - gpuLabel->setPosition(pos); - gpuLabel->setAlignment(osgText::Text::BASE_LINE); - gpuLabel->setText("GPU: "); - - _statsLabelList.push_back(gpuLabel); - - pos.x() = gpuLabel->getBound().xMax(); - - osgText::Text* gpuField = new osgText::Text; - - gpuField->setFont("fonts/arial.ttf"); - gpuField->setColor(colorGPU); - gpuField->setFontResolution((unsigned int)characterSize,(unsigned int)characterSize); - gpuField->setCharacterSize(characterSize); - gpuField->setPosition(pos); - gpuField->setAlignment(osgText::Text::BASE_LINE); - gpuField->setText("1000.00"); - - _gpuTimeText.push_back(gpuField); - - pos.y() -= characterSize; - } - - pos.y() -= characterSize*0.5f; - - // scene stats section - { - pos.x() = leftPos; - - // num drawables - osgText::Text* drawLabel = new osgText::Text; - drawLabel->setFont("fonts/arial.ttf"); - drawLabel->setColor(colorDraw); - drawLabel->setFontResolution((unsigned int)characterSize,(unsigned int)characterSize); - drawLabel->setCharacterSize(characterSize); - drawLabel->setPosition(pos); - drawLabel->setAlignment(osgText::Text::BASE_LINE); - drawLabel->setText("Number of Drawables: "); - - _sceneStatsLabelList.push_back(drawLabel); - - pos.x() = drawLabel->getBound().xMax(); - - _numDrawablesText = new osgText::Text; - _numDrawablesText->setFont("fonts/arial.ttf"); - _numDrawablesText->setColor(colorDraw); - _numDrawablesText->setFontResolution((unsigned int)characterSize,(unsigned int)characterSize); - _numDrawablesText->setCharacterSize(characterSize); - _numDrawablesText->setPosition(pos); - _numDrawablesText->setAlignment(osgText::Text::BASE_LINE); - _numDrawablesText->setText("100000 "); - - pos.x() = _numDrawablesText->getBound().xMax(); - - // num vertices - drawLabel = new osgText::Text; - drawLabel->setFont("fonts/arial.ttf"); - drawLabel->setColor(colorDraw); - drawLabel->setFontResolution((unsigned int)characterSize,(unsigned int)characterSize); - drawLabel->setCharacterSize(characterSize); - drawLabel->setPosition(pos); - drawLabel->setAlignment(osgText::Text::BASE_LINE); - drawLabel->setText("Number of Vertices: "); - - _sceneStatsLabelList.push_back(drawLabel); - - pos.x() = drawLabel->getBound().xMax(); - - _numVerticesText = new osgText::Text; - _numVerticesText->setFont("fonts/arial.ttf"); - _numVerticesText->setColor(colorDraw); - _numVerticesText->setFontResolution((unsigned int)characterSize,(unsigned int)characterSize); - _numVerticesText->setCharacterSize(characterSize); - _numVerticesText->setPosition(pos); - _numVerticesText->setAlignment(osgText::Text::BASE_LINE); - _numVerticesText->setText("1000000 "); - - pos.x() = _numVerticesText->getBound().xMax(); - - - // num primitives - drawLabel = new osgText::Text; - drawLabel->setFont("fonts/arial.ttf"); - drawLabel->setColor(colorDraw); - drawLabel->setFontResolution((unsigned int)characterSize,(unsigned int)characterSize); - drawLabel->setCharacterSize(characterSize); - drawLabel->setPosition(pos); - drawLabel->setAlignment(osgText::Text::BASE_LINE); - drawLabel->setText("Number of Primitives: "); - - _sceneStatsLabelList.push_back(drawLabel); - - pos.x() = drawLabel->getBound().xMax(); - - _numPrimitivesText = new osgText::Text; - _numPrimitivesText->setFont("fonts/arial.ttf"); - _numPrimitivesText->setColor(colorDraw); - _numPrimitivesText->setFontResolution((unsigned int)characterSize,(unsigned int)characterSize); - _numPrimitivesText->setCharacterSize(characterSize); - _numPrimitivesText->setPosition(pos); - _numPrimitivesText->setAlignment(osgText::Text::BASE_LINE); - _numPrimitivesText->setText("1000000 "); - - pos.x() = _numPrimitivesText->getBound().xMax(); - - - - } -} - -void ViewerEventHandler::StatsAndHelpDrawCallback::displayInfo() -{ -} - -void ViewerEventHandler::StatsAndHelpDrawCallback::createInfoText() -{ -} - - - -ViewerEventHandler::ViewerEventHandler(OsgCameraGroup* cg): - _cg(cg), - _writeNodeFileName("saved_model.osg"), - _displayHelp(false), - _frameStatsMode(NO_STATS), - _firstTimeTogglingFullScreen(true) -{ - Producer::CameraConfig* cfg = _cg->getCameraConfig(); - - Producer::Camera *cam = cfg->getCamera(0); - - _statsAndHelpDrawCallback = new StatsAndHelpDrawCallback(this,0); - cam->addPostDrawCallback(_statsAndHelpDrawCallback); - - for(unsigned int i=0;igetNumberOfCameras();++i) - { - SnapImageDrawCallback* snapImageDrawCallback = new SnapImageDrawCallback(); - cfg->getCamera(i)->addPostDrawCallback(snapImageDrawCallback); - _snapImageDrawCallbackList.push_back(snapImageDrawCallback); - } - - - Viewer* viewer = dynamic_cast(cg); - if (viewer) setWriteImageFileName(viewer->getWriteImageFileName()); - else setWriteImageFileName( Viewer::getDefaultImageFileName() ); -} - -void ViewerEventHandler::setWriteImageOnNextFrame(bool writeImageOnNextFrame) -{ - for(SnapImageDrawCallbackList::iterator itr=_snapImageDrawCallbackList.begin(); - itr!=_snapImageDrawCallbackList.end(); - ++itr) - { - (*itr)->setSnapImageOnNextFrame(writeImageOnNextFrame); - } -} - -void ViewerEventHandler::setWriteImageFileName(const std::string& filename) -{ - std::string basename = osgDB::getNameLessExtension(filename); - std::string ext = osgDB::getFileExtension(filename); - - unsigned int cameraNum = 0; - for(SnapImageDrawCallbackList::iterator itr=_snapImageDrawCallbackList.begin(); - itr!=_snapImageDrawCallbackList.end(); - ++itr, ++cameraNum) - { - if (cameraNum==0) - { - (*itr)->setFileName(filename); - } - else - { - std::string name(basename+"_"); - name += ('0'+cameraNum); - name += '.'; - name += ext; - (*itr)->setFileName(name); - } - } -} - -void ViewerEventHandler::setFrameStatsMode(FrameStatsMode mode) -{ - _frameStatsMode = mode; - _cg->setInstrumentationMode(_frameStatsMode!=NO_STATS); - - for(osgProducer::OsgCameraGroup::SceneHandlerList::iterator shitr = _cg->getSceneHandlerList().begin(); - shitr != _cg->getSceneHandlerList().end(); - ++shitr) - { - (*shitr)->setCollectStats(_frameStatsMode==SCENE_STATS); - } -} - -bool ViewerEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& aa) -{ - if(!_cg) return false; - - if(ea.getEventType()==osgGA::GUIEventAdapter::KEYDOWN) - { - - switch( ea.getKey() ) - { - case 's' : - { - FrameStatsMode newFrameStatsMode = (FrameStatsMode)((_frameStatsMode+1)%4); - setFrameStatsMode(newFrameStatsMode); - return true; - } - case 'v' : - { - bool block = !_cg->getBlockOnVsync(); - _cg->setBlockOnVsync(block); - for(unsigned int i=0;i<_cg->getNumberOfCameras();++i) - { - _cg->getCamera(i)->setBlockOnVsync(block); - } - return true; - } - - case 'f' : - { - Producer::CameraConfig* cfg = _cg->getCameraConfig(); - - bool shouldBeFullScreen = false; - bool flag = true; - for( unsigned int i = 0; i < cfg->getNumberOfCameras(); ++i ) - { - Producer::Camera *cam = cfg->getCamera(i); - Producer::RenderSurface* rs = cam->getRenderSurface(); - if( rs->getDrawableType() != Producer::RenderSurface::DrawableType_Window ) - continue; - - if( flag ) - { - shouldBeFullScreen =! rs->isFullScreen(); // Remember the initial state of the first render surface - flag = false; - } - - if ( shouldBeFullScreen!=rs->isFullScreen() ) // If the current render surface hasn't been modified already - { - if (_firstTimeTogglingFullScreen && rs->isFullScreen()) - { - unsigned int screenWidth; - unsigned int screenHeight; - unsigned int windowWidth; - unsigned int windowHeight; - rs->getScreenSize( screenWidth, screenHeight ); - if( screenHeight > screenWidth ) - { - windowWidth = (unsigned int)((float)screenWidth * 0.625); - windowHeight = (unsigned int)((float)windowWidth * 0.75); - } - else - { - windowHeight = (unsigned int)((float)screenHeight * 0.625); - windowWidth = (unsigned int)((float)windowHeight * 1.334); - } - int x = (screenWidth - windowWidth) >> 1; - int y = (screenHeight - windowHeight) >> 1; - #ifndef WIN32 - rs->useBorder(true); - #else - rs->fullScreen(false); - #endif - rs->setWindowRectangle( x, y, windowWidth, windowHeight ); - } - else - { - rs->fullScreen(!rs->isFullScreen()); - } - } - } - _firstTimeTogglingFullScreen = false; - - return true; - } - - case 'o' : - { - osg::Node* node = _cg->getSceneData(); - if (node) - { - if (osgDB::writeNodeFile(*node,_writeNodeFileName.c_str())) - { - std::cout<<"written nodes to file "<<_writeNodeFileName<getAnimationPath()) - { - std::ofstream fout("saved_animation.path"); - viewer->getAnimationPath()->write(fout); - fout.close(); - - osg::notify(osg::NOTICE) << "Saved camera animation to 'saved_animation.path'"<< std::endl; - - } - - } - else if (ea.getKey()=='z') - { - viewer->setRecordingAnimationPath(true); - viewer->setAnimationPath(new osg::AnimationPath()); - viewer->getAnimationPath()->setLoopMode(osg::AnimationPath::LOOP); - osg::notify(osg::NOTICE) << "Recording camera animation, press 'z' to finish recording."<< std::endl; - } - - if (ea.getKey()=='Z') - { - osgGA::AnimationPathManipulator* apm = 0; - unsigned int apmNo = 0; - - osgGA::KeySwitchMatrixManipulator* kscm = viewer->getKeySwitchMatrixManipulator(); - if (kscm) - { - for(apmNo=0;apmNogetNumMatrixManipulators();++apmNo) - { - apm = dynamic_cast(kscm->getMatrixManipulatorWithIndex(apmNo)); - if (apm) break; - } - } - - if (!apm) - { - apm = new osgGA::AnimationPathManipulator(); - apmNo = viewer->addCameraManipulator(apm); - } - - apm->setAnimationPath(viewer->getAnimationPath()); - apm->home(ea,aa); - - viewer->selectCameraManipulator(apmNo); - } - - break; - } - return true; - } - - default: - break; - - } - } - return false; - -} - -void ViewerEventHandler::getUsage(osg::ApplicationUsage& usage) const -{ - usage.addKeyboardMouseBinding("f","Toggle fullscreen"); - usage.addKeyboardMouseBinding("h","Display help"); - usage.addKeyboardMouseBinding("o","Write scene graph to \"saved_model.osg\""); - usage.addKeyboardMouseBinding("O PrtSrn","Write camera images to \"saved_image*.jpg\""); - usage.addKeyboardMouseBinding("s","Toggle instrumention"); - usage.addKeyboardMouseBinding("v","Toggle block and vsync"); - usage.addKeyboardMouseBinding("z","Start recording camera path."); - usage.addKeyboardMouseBinding("Z","If recording camera path stop recording camera path, save to \"saved_animation.path\"\nThen restart camera from beginning on animation path"); -} - -void ViewerEventHandler::releaseGLObjects(osg::State*) const -{ - if (_statsAndHelpDrawCallback) _statsAndHelpDrawCallback->releaseGLObjects(); -} diff --git a/src/osgWrappers/osg/View.cpp b/src/osgWrappers/osg/View.cpp index 60a7e31c8..b6cbfcd32 100644 --- a/src/osgWrappers/osg/View.cpp +++ b/src/osgWrappers/osg/View.cpp @@ -11,8 +11,10 @@ #include #include +#include #include #include +#include #include #include @@ -25,10 +27,39 @@ #endif BEGIN_OBJECT_REFLECTOR(osg::View) - I_VirtualBaseType(osg::Referenced); + I_BaseType(osg::Object); I_Constructor0(____View, "", ""); + I_ConstructorWithDefaults2(IN, const osg::View &, view, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____View__C5_osg_View_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "Clone the type of an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, + Properties::VIRTUAL, + __osg_Object_P1__clone__C5_osg_CopyOp_R1, + "Clone an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the object's library. ", + "Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. "); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "return the name of the object's class type. ", + "Must be defined by derived classes. "); I_Method1(void, setStats, IN, osg::Stats *, stats, Properties::NON_VIRTUAL, __void__setStats__osg_Stats_P1, diff --git a/src/osgWrappers/osgManipulator/Dragger.cpp b/src/osgWrappers/osgManipulator/Dragger.cpp index 068d394e3..fa5303281 100644 --- a/src/osgWrappers/osgManipulator/Dragger.cpp +++ b/src/osgWrappers/osgManipulator/Dragger.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -51,7 +52,7 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::CompositeDragger) __void__setParentDragger__Dragger_P1, "Set/Get parent dragger. ", "For simple draggers parent points to itself. For composite draggers parent points to the parent dragger that uses this dragger."); - I_Method3(bool, handle, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, + I_Method3(bool, handle, IN, const osgManipulator::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, Properties::VIRTUAL, __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "", @@ -151,7 +152,7 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Dragger) __CompositeDragger_P1__getComposite, "Returns 0 if this Dragger is not a CompositeDragger. ", ""); - I_Method3(bool, handle, IN, const osgManipulator::Dragger::PointerInfo &, x, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, + I_Method3(bool, handle, IN, const osgManipulator::PointerInfo &, x, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, Properties::VIRTUAL, __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "", @@ -167,15 +168,24 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Dragger) __void__setParentDragger__Dragger_P1); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgManipulator::Dragger::PointerInfo) +TYPE_NAME_ALIAS(std::pair< osg::NodePath COMMA osg::Vec3 >, osgManipulator::PointerInfo::NodePathIntersectionPair); + +TYPE_NAME_ALIAS(std::list< osgManipulator::PointerInfo::NodePathIntersectionPair >, osgManipulator::PointerInfo::IntersectionList); + +BEGIN_VALUE_REFLECTOR(osgManipulator::PointerInfo) I_Constructor0(____PointerInfo, "", ""); - I_Constructor1(IN, const osgManipulator::Dragger::PointerInfo &, rhs, + I_Constructor1(IN, const osgManipulator::PointerInfo &, rhs, Properties::NON_EXPLICIT, ____PointerInfo__C5_PointerInfo_R1, "", ""); + I_Method0(void, reset, + Properties::NON_VIRTUAL, + __void__reset, + "", + ""); I_Method0(bool, completed, Properties::NON_VIRTUAL, __bool__completed, @@ -206,6 +216,11 @@ BEGIN_VALUE_REFLECTOR(osgManipulator::Dragger::PointerInfo) __bool__projectWindowXYIntoObject__osg_Vec3_R1__osg_Vec3_R1, "", ""); + I_Method2(bool, projectObjectIntoWindow, IN, const osg::Vec3 &, object, IN, osg::Vec3 &, window, + Properties::NON_VIRTUAL, + __bool__projectObjectIntoWindow__C5_osg_Vec3_R1__osg_Vec3_R1, + "", + ""); I_Method0(const osg::Matrix &, getViewMatrix, Properties::NON_VIRTUAL, __C5_osg_Matrix_R1__getViewMatrix, @@ -216,17 +231,37 @@ BEGIN_VALUE_REFLECTOR(osgManipulator::Dragger::PointerInfo) __bool__contains__C5_osg_Node_P1, "", ""); + I_Method1(void, setCamera, IN, osg::Camera *, camera, + Properties::NON_VIRTUAL, + __void__setCamera__osg_Camera_P1, + "", + ""); + I_Method2(void, addIntersection, IN, const osg::NodePath &, nodePath, IN, osg::Vec3, intersectionPoint, + Properties::NON_VIRTUAL, + __void__addIntersection__C5_osg_NodePath_R1__osg_Vec3, + "", + ""); + I_Method2(void, setMousePosition, IN, int, pixel_x, IN, int, pixel_y, + Properties::NON_VIRTUAL, + __void__setMousePosition__int__int, + "", + ""); + I_SimpleProperty(osg::Camera *, Camera, + 0, + __void__setCamera__osg_Camera_P1); I_SimpleProperty(osg::Vec3, LocalIntersectPoint, __osg_Vec3__getLocalIntersectPoint, 0); I_SimpleProperty(const osg::Matrix &, ViewMatrix, __C5_osg_Matrix_R1__getViewMatrix, 0); - I_PublicMemberProperty(int, pixel_x); - I_PublicMemberProperty(int, pixel_y); - I_PublicMemberProperty(osgUtil::SceneView *, sv); - I_PublicMemberProperty(osgUtil::IntersectVisitor::HitList, hitList); - I_PublicMemberProperty(osgUtil::IntersectVisitor::HitList::iterator, hitIter); + I_PublicMemberProperty(int, _pixel_x); + I_PublicMemberProperty(int, _pixel_y); + I_PublicMemberProperty(osg::Camera *, _camera); + I_PublicMemberProperty(osgManipulator::PointerInfo::IntersectionList, _hitList); + I_PublicMemberProperty(osgManipulator::PointerInfo::IntersectionList::iterator, _hitIter); + I_PublicMemberProperty(osg::Matrix, _MVPW); + I_PublicMemberProperty(osg::Matrix, _inverseMVPW); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgManipulator::Dragger >) @@ -268,5 +303,9 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgManipulator::Dragger >) 0); END_REFLECTOR +STD_LIST_REFLECTOR(std::list< osgManipulator::PointerInfo::NodePathIntersectionPair >); + +STD_PAIR_REFLECTOR(std::pair< osg::NodePath COMMA osg::Vec3 >); + STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgManipulator::Dragger > >); diff --git a/src/osgWrappers/osgManipulator/Projector.cpp b/src/osgWrappers/osgManipulator/Projector.cpp index 0bd1f0c3c..29afa6133 100644 --- a/src/osgWrappers/osgManipulator/Projector.cpp +++ b/src/osgWrappers/osgManipulator/Projector.cpp @@ -36,9 +36,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::CylinderPlaneProjector) ____CylinderPlaneProjector__osg_Cylinder_P1, "", ""); - I_Method2(bool, project, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, + I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, Properties::VIRTUAL, - __bool__project__C5_Dragger_PointerInfo_R1__osg_Vec3_R1, + __bool__project__C5_PointerInfo_R1__osg_Vec3_R1, "Calculates the object coordinates (projectedPoint) of a window coordinate (pointToProject) when projected onto the given plane. ", "Returns true on successful projection."); I_Method0(bool, isProjectionOnCylinder, @@ -73,14 +73,14 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::CylinderProjector) __C5_osg_Cylinder_P1__getCylinder, "", ""); - I_Method2(bool, project, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, + I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, Properties::VIRTUAL, - __bool__project__C5_Dragger_PointerInfo_R1__osg_Vec3_R1, + __bool__project__C5_PointerInfo_R1__osg_Vec3_R1, "Calculates the object coordinates (projectedPoint) of a window coordinate (pointToProject) when projected onto the given plane. ", "Returns true on successful projection."); - I_Method2(bool, isPointInFront, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, const osg::Matrix &, localToWorld, + I_Method2(bool, isPointInFront, IN, const osgManipulator::PointerInfo &, pi, IN, const osg::Matrix &, localToWorld, Properties::NON_VIRTUAL, - __bool__isPointInFront__C5_Dragger_PointerInfo_R1__C5_osg_Matrix_R1, + __bool__isPointInFront__C5_PointerInfo_R1__C5_osg_Matrix_R1, "Returns true is the point is in front of the cylinder given the eye direction. ", ""); I_Method1(void, setFront, IN, bool, front, @@ -130,9 +130,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::LineProjector) __osg_Vec3_R1__getLineEnd, "", ""); - I_Method2(bool, project, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, + I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, Properties::VIRTUAL, - __bool__project__C5_Dragger_PointerInfo_R1__osg_Vec3_R1, + __bool__project__C5_PointerInfo_R1__osg_Vec3_R1, "Calculates the object coordinates (projectedPoint) of a window coordinate (pointToProject) when projected onto the given line. ", "Returns true on successful projection."); I_SimpleProperty(osg::Vec3 &, LineEnd, @@ -163,9 +163,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::PlaneProjector) __C5_osg_Plane_R1__getPlane, "", ""); - I_Method2(bool, project, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, + I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, Properties::VIRTUAL, - __bool__project__C5_Dragger_PointerInfo_R1__osg_Vec3_R1, + __bool__project__C5_PointerInfo_R1__osg_Vec3_R1, "Calculates the object coordinates (projectedPoint) of a window coordinate (pointToProject) when projected onto the given plane. ", "Returns true on successful projection."); I_SimpleProperty(const osg::Plane &, Plane, @@ -178,9 +178,9 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::Projector) I_Constructor0(____Projector, "", ""); - I_Method2(bool, project, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, + I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, Properties::PURE_VIRTUAL, - __bool__project__C5_Dragger_PointerInfo_R1__osg_Vec3_R1, + __bool__project__C5_PointerInfo_R1__osg_Vec3_R1, "Calculates the object/world coordinates (projectedPoint) of a window coordinate (pointToProject) when projected onto some shape or geometry (implemented in derived classes). ", "SceneView in used for i projecting window coordinates into object coordinates and vice versa. Returns true on successful projection."); I_Method1(void, setLocalToWorld, IN, const osg::Matrix &, localToWorld, @@ -216,9 +216,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::SpherePlaneProjector) ____SpherePlaneProjector__osg_Sphere_P1, "", ""); - I_Method2(bool, project, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, + I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, Properties::VIRTUAL, - __bool__project__C5_Dragger_PointerInfo_R1__osg_Vec3_R1, + __bool__project__C5_PointerInfo_R1__osg_Vec3_R1, "Calculates the object coordinates (projectedPoint) of a window coordinate (pointToProject) when projected onto the given sphere. ", "Returns true on successful projection."); I_Method0(bool, isProjectionOnSphere, @@ -253,14 +253,14 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::SphereProjector) __C5_osg_Sphere_P1__getSphere, "", ""); - I_Method2(bool, project, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, + I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, Properties::VIRTUAL, - __bool__project__C5_Dragger_PointerInfo_R1__osg_Vec3_R1, + __bool__project__C5_PointerInfo_R1__osg_Vec3_R1, "Calculates the object coordinates (projectedPoint) of a window coordinate (pointToProject) when projected onto the given sphere. ", "Returns true on successful projection."); - I_Method2(bool, isPointInFront, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, const osg::Matrix &, localToWorld, + I_Method2(bool, isPointInFront, IN, const osgManipulator::PointerInfo &, pi, IN, const osg::Matrix &, localToWorld, Properties::NON_VIRTUAL, - __bool__isPointInFront__C5_Dragger_PointerInfo_R1__C5_osg_Matrix_R1, + __bool__isPointInFront__C5_PointerInfo_R1__C5_osg_Matrix_R1, "Returns true is the point is in front of the cylinder given the eye direction. ", ""); I_Method1(void, setFront, IN, bool, front, diff --git a/src/osgWrappers/osgManipulator/RotateCylinderDragger.cpp b/src/osgWrappers/osgManipulator/RotateCylinderDragger.cpp index 4ab5ac26b..932c6f24a 100644 --- a/src/osgWrappers/osgManipulator/RotateCylinderDragger.cpp +++ b/src/osgWrappers/osgManipulator/RotateCylinderDragger.cpp @@ -29,7 +29,7 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::RotateCylinderDragger) I_Constructor0(____RotateCylinderDragger, "", ""); - I_Method3(bool, handle, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + I_Method3(bool, handle, IN, const osgManipulator::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, Properties::VIRTUAL, __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "Handle pick events on dragger and generate TranslateInLine commands. ", diff --git a/src/osgWrappers/osgManipulator/RotateSphereDragger.cpp b/src/osgWrappers/osgManipulator/RotateSphereDragger.cpp index 693a8ebea..ad3259f45 100644 --- a/src/osgWrappers/osgManipulator/RotateSphereDragger.cpp +++ b/src/osgWrappers/osgManipulator/RotateSphereDragger.cpp @@ -29,7 +29,7 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::RotateSphereDragger) I_Constructor0(____RotateSphereDragger, "", ""); - I_Method3(bool, handle, IN, const osgManipulator::Dragger::PointerInfo &, x, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + I_Method3(bool, handle, IN, const osgManipulator::PointerInfo &, x, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, Properties::VIRTUAL, __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "Handle pick events on dragger and generate TranslateInLine commands. ", diff --git a/src/osgWrappers/osgManipulator/Scale1DDragger.cpp b/src/osgWrappers/osgManipulator/Scale1DDragger.cpp index 1bce35571..71d877556 100644 --- a/src/osgWrappers/osgManipulator/Scale1DDragger.cpp +++ b/src/osgWrappers/osgManipulator/Scale1DDragger.cpp @@ -37,7 +37,7 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale1DDragger) ____Scale1DDragger__ScaleMode, "", ""); - I_Method3(bool, handle, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + I_Method3(bool, handle, IN, const osgManipulator::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, Properties::VIRTUAL, __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "Handle pick events on dragger and generate TranslateInLine commands. ", diff --git a/src/osgWrappers/osgManipulator/Scale2DDragger.cpp b/src/osgWrappers/osgManipulator/Scale2DDragger.cpp index 411531405..fb5f534b8 100644 --- a/src/osgWrappers/osgManipulator/Scale2DDragger.cpp +++ b/src/osgWrappers/osgManipulator/Scale2DDragger.cpp @@ -38,7 +38,7 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale2DDragger) ____Scale2DDragger__ScaleMode, "", ""); - I_Method3(bool, handle, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + I_Method3(bool, handle, IN, const osgManipulator::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, Properties::VIRTUAL, __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "Handle pick events on dragger and generate TranslateInLine commands. ", diff --git a/src/osgWrappers/osgManipulator/TabPlaneDragger.cpp b/src/osgWrappers/osgManipulator/TabPlaneDragger.cpp index 14567d148..ecdf388e1 100644 --- a/src/osgWrappers/osgManipulator/TabPlaneDragger.cpp +++ b/src/osgWrappers/osgManipulator/TabPlaneDragger.cpp @@ -29,7 +29,7 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TabPlaneDragger) I_Constructor0(____TabPlaneDragger, "", ""); - I_Method3(bool, handle, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + I_Method3(bool, handle, IN, const osgManipulator::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, Properties::VIRTUAL, __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "", diff --git a/src/osgWrappers/osgManipulator/Translate1DDragger.cpp b/src/osgWrappers/osgManipulator/Translate1DDragger.cpp index b774da2eb..182caf802 100644 --- a/src/osgWrappers/osgManipulator/Translate1DDragger.cpp +++ b/src/osgWrappers/osgManipulator/Translate1DDragger.cpp @@ -34,7 +34,7 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Translate1DDragger) ____Translate1DDragger__C5_osg_Vec3_R1__C5_osg_Vec3_R1, "", ""); - I_Method3(bool, handle, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + I_Method3(bool, handle, IN, const osgManipulator::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, Properties::VIRTUAL, __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "Handle pick events on dragger and generate TranslateInLine commands. ", diff --git a/src/osgWrappers/osgManipulator/Translate2DDragger.cpp b/src/osgWrappers/osgManipulator/Translate2DDragger.cpp index 5373fc048..aeedc8957 100644 --- a/src/osgWrappers/osgManipulator/Translate2DDragger.cpp +++ b/src/osgWrappers/osgManipulator/Translate2DDragger.cpp @@ -35,7 +35,7 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Translate2DDragger) ____Translate2DDragger__C5_osg_Plane_R1, "", ""); - I_Method3(bool, handle, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + I_Method3(bool, handle, IN, const osgManipulator::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, Properties::VIRTUAL, __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "Handle pick events on dragger and generate TranslateInLine commands. ", diff --git a/src/osgWrappers/osgManipulator/TranslatePlaneDragger.cpp b/src/osgWrappers/osgManipulator/TranslatePlaneDragger.cpp index f66663cc6..afaf72377 100644 --- a/src/osgWrappers/osgManipulator/TranslatePlaneDragger.cpp +++ b/src/osgWrappers/osgManipulator/TranslatePlaneDragger.cpp @@ -31,7 +31,7 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TranslatePlaneDragger) I_Constructor0(____TranslatePlaneDragger, "", ""); - I_Method3(bool, handle, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + I_Method3(bool, handle, IN, const osgManipulator::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, Properties::VIRTUAL, __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "", diff --git a/src/osgWrappers/osgProducer/Export.cpp b/src/osgWrappers/osgProducer/Export.cpp deleted file mode 100644 index 18d1ed5dc..000000000 --- a/src/osgWrappers/osgProducer/Export.cpp +++ /dev/null @@ -1,22 +0,0 @@ -// *************************************************************************** -// -// Generated automatically by genwrapper. -// Please DO NOT EDIT this file! -// -// *************************************************************************** - -#include -#include -#include -#include - -#include - -// Must undefine IN and OUT macros defined in Windows headers -#ifdef IN -#undef IN -#endif -#ifdef OUT -#undef OUT -#endif - diff --git a/src/osgWrappers/osgProducer/GNUmakefile b/src/osgWrappers/osgProducer/GNUmakefile deleted file mode 100644 index 9881eb18f..000000000 --- a/src/osgWrappers/osgProducer/GNUmakefile +++ /dev/null @@ -1,21 +0,0 @@ -TOPDIR = ../../.. -include $(TOPDIR)/Make/makedefs - -CXXFILES =\ - Export.cpp\ - GraphicsContextImplementation.cpp\ - KeyboardMouseCallback.cpp\ - OsgCameraGroup.cpp\ - OsgSceneHandler.cpp\ - Viewer.cpp\ - ViewerEventHandler.cpp\ - -LIBS += -losgProducer -losg -losgIntrospection -losgUtil -losgDB -lProducer -losgGA -losgText $(GL_LIBS) $(OTHER_LIBS) - -OPTF = -O - -TARGET_BASENAME = osgProducer -include $(TOPDIR)/Make/cygwin_wrapper_def -WRAPPER = $(WRAPPER_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) - -include $(TOPDIR)/Make/makerules diff --git a/src/osgWrappers/osgProducer/GraphicsContextImplementation.cpp b/src/osgWrappers/osgProducer/GraphicsContextImplementation.cpp deleted file mode 100644 index a81db4fe2..000000000 --- a/src/osgWrappers/osgProducer/GraphicsContextImplementation.cpp +++ /dev/null @@ -1,95 +0,0 @@ -// *************************************************************************** -// -// Generated automatically by genwrapper. -// Please DO NOT EDIT this file! -// -// *************************************************************************** - -#include -#include -#include -#include - -#include -#include - -// Must undefine IN and OUT macros defined in Windows headers -#ifdef IN -#undef IN -#endif -#ifdef OUT -#undef OUT -#endif - -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgProducer::GraphicsContextImplementation) - I_BaseType(osg::GraphicsContext); - I_Constructor1(IN, osg::GraphicsContext::Traits *, traits, - Properties::NON_EXPLICIT, - ____GraphicsContextImplementation__Traits_P1, - "Construct a graphics context to specified traits. ", - ""); - I_Constructor1(IN, Producer::RenderSurface *, rs, - Properties::NON_EXPLICIT, - ____GraphicsContextImplementation__Producer_RenderSurface_P1, - "Construct a graphics context with specified RenderSurface. ", - ""); - I_Method0(Producer::RenderSurface *, getRenderSurface, - Properties::NON_VIRTUAL, - __Producer_RenderSurface_P1__getRenderSurface, - "Return the RenderSurface that implements the graphics context. ", - ""); - I_Method0(const Producer::RenderSurface *, getRenderSurface, - Properties::NON_VIRTUAL, - __C5_Producer_RenderSurface_P1__getRenderSurface, - "Return the const RenderSurface that implements the graphics context. ", - ""); - I_Method0(bool, valid, - Properties::VIRTUAL, - __bool__valid, - "Return whether a valid and usable GraphicsContext has been created - assume success. ", - ""); - I_Method0(bool, realizeImplementation, - Properties::VIRTUAL, - __bool__realizeImplementation, - "Realise the GraphicsContext. ", - ""); - I_Method0(bool, isRealizedImplementation, - Properties::VIRTUAL, - __bool__isRealizedImplementation, - "Return true if the graphics context has been realised and is ready to use. ", - ""); - I_Method0(void, closeImplementation, - Properties::VIRTUAL, - __void__closeImplementation, - "Close the graphics context. ", - ""); - I_Method0(bool, makeCurrentImplementation, - Properties::VIRTUAL, - __bool__makeCurrentImplementation, - "Make this graphics context current. ", - ""); - I_Method1(bool, makeContextCurrentImplementation, IN, osg::GraphicsContext *, readContext, - Properties::VIRTUAL, - __bool__makeContextCurrentImplementation__osg_GraphicsContext_P1, - "Make this graphics context current with specified read context. ", - ""); - I_Method0(bool, releaseContextImplementation, - Properties::VIRTUAL, - __bool__releaseContextImplementation, - "Release the graphics context. ", - ""); - I_Method1(void, bindPBufferToTextureImplementation, IN, GLenum, buffer, - Properties::VIRTUAL, - __void__bindPBufferToTextureImplementation__GLenum, - "Bind the graphics context to associated texture. ", - ""); - I_Method0(void, swapBuffersImplementation, - Properties::VIRTUAL, - __void__swapBuffersImplementation, - "swap the front and back buffers. ", - ""); - I_SimpleProperty(Producer::RenderSurface *, RenderSurface, - __Producer_RenderSurface_P1__getRenderSurface, - 0); -END_REFLECTOR - diff --git a/src/osgWrappers/osgProducer/KeyboardMouseCallback.cpp b/src/osgWrappers/osgProducer/KeyboardMouseCallback.cpp deleted file mode 100644 index 563132a12..000000000 --- a/src/osgWrappers/osgProducer/KeyboardMouseCallback.cpp +++ /dev/null @@ -1,195 +0,0 @@ -// *************************************************************************** -// -// Generated automatically by genwrapper. -// Please DO NOT EDIT this file! -// -// *************************************************************************** - -#include -#include -#include -#include - -#include -#include -#include - -// Must undefine IN and OUT macros defined in Windows headers -#ifdef IN -#undef IN -#endif -#ifdef OUT -#undef OUT -#endif - -TYPE_NAME_ALIAS(osgGA::EventQueue::Events, osgProducer::KeyboardMouseCallback::EventQueue); - -BEGIN_OBJECT_REFLECTOR(osgProducer::KeyboardMouseCallback) - I_ConstructorWithDefaults3(IN, Producer::KeyboardMouse *, keyboardMouse, , IN, bool &, done, , IN, bool, escapeKeySetsDone, true, - ____KeyboardMouseCallback__Producer_KeyboardMouse_P1__bool_R1__bool, - "", - ""); - I_Method1(void, mouseScroll, IN, Producer::KeyboardMouseCallback::ScrollingMotion, sm, - Properties::VIRTUAL, - __void__mouseScroll__Producer_KeyboardMouseCallback_ScrollingMotion, - "", - ""); - I_Method2(void, mouseScroll2D, IN, float, x, IN, float, x, - Properties::VIRTUAL, - __void__mouseScroll2D__float__float, - "", - ""); - I_Method1(void, penPressure, IN, float, pressure, - Properties::VIRTUAL, - __void__penPressure__float, - "", - ""); - I_Method2(void, penProximity, IN, Producer::KeyboardMouseCallback::TabletPointerType, x, IN, bool, x, - Properties::VIRTUAL, - __void__penProximity__Producer_KeyboardMouseCallback_TabletPointerType__bool, - "", - ""); - I_Method2(void, mouseMotion, IN, float, mx, IN, float, my, - Properties::VIRTUAL, - __void__mouseMotion__float__float, - "", - ""); - I_Method2(void, passiveMouseMotion, IN, float, mx, IN, float, my, - Properties::VIRTUAL, - __void__passiveMouseMotion__float__float, - "", - ""); - I_Method2(void, mouseWarp, IN, float, mx, IN, float, my, - Properties::VIRTUAL, - __void__mouseWarp__float__float, - "", - ""); - I_Method3(void, buttonPress, IN, float, mx, IN, float, my, IN, unsigned int, mbutton, - Properties::VIRTUAL, - __void__buttonPress__float__float__unsigned_int, - "", - ""); - I_Method3(void, doubleButtonPress, IN, float, mx, IN, float, my, IN, unsigned int, mbutton, - Properties::VIRTUAL, - __void__doubleButtonPress__float__float__unsigned_int, - "", - ""); - I_Method3(void, buttonRelease, IN, float, mx, IN, float, my, IN, unsigned int, mbutton, - Properties::VIRTUAL, - __void__buttonRelease__float__float__unsigned_int, - "", - ""); - I_Method1(void, keyPress, IN, Producer::KeyCharacter, key, - Properties::VIRTUAL, - __void__keyPress__Producer_KeyCharacter, - "", - ""); - I_Method1(void, keyRelease, IN, Producer::KeyCharacter, key, - Properties::VIRTUAL, - __void__keyRelease__Producer_KeyCharacter, - "", - ""); - I_Method1(void, specialKeyPress, IN, Producer::KeyCharacter, key, - Properties::VIRTUAL, - __void__specialKeyPress__Producer_KeyCharacter, - "", - ""); - I_Method1(void, specialKeyRelease, IN, Producer::KeyCharacter, key, - Properties::VIRTUAL, - __void__specialKeyRelease__Producer_KeyCharacter, - "", - ""); - I_Method4(void, windowConfig, IN, int, x, IN, int, y, IN, unsigned int, width, IN, unsigned int, height, - Properties::VIRTUAL, - __void__windowConfig__int__int__unsigned_int__unsigned_int, - "", - ""); - I_Method0(void, shutdown, - Properties::VIRTUAL, - __void__shutdown, - "", - ""); - I_Method1(void, setEscapeSetDone, IN, bool, esc, - Properties::NON_VIRTUAL, - __void__setEscapeSetDone__bool, - "", - ""); - I_Method0(bool, getEscapeSetDone, - Properties::NON_VIRTUAL, - __bool__getEscapeSetDone, - "", - ""); - I_Method1(void, setEventQueue, IN, osgGA::EventQueue *, eventQueue, - Properties::NON_VIRTUAL, - __void__setEventQueue__osgGA_EventQueue_P1, - "", - ""); - I_Method0(osgGA::EventQueue *, getEventQueue, - Properties::NON_VIRTUAL, - __osgGA_EventQueue_P1__getEventQueue, - "", - ""); - I_Method1(bool, takeEventQueue, IN, osgProducer::KeyboardMouseCallback::EventQueue &, queue, - Properties::NON_VIRTUAL, - __bool__takeEventQueue__EventQueue_R1, - "", - ""); - I_Method1(bool, copyEventQueue, IN, osgProducer::KeyboardMouseCallback::EventQueue &, queue, - Properties::NON_VIRTUAL, - __bool__copyEventQueue__EventQueue_R1, - "", - ""); - I_Method1(void, setEventQueue, IN, osgProducer::KeyboardMouseCallback::EventQueue &, queue, - Properties::NON_VIRTUAL, - __void__setEventQueue__EventQueue_R1, - "", - ""); - I_Method1(void, appendEventQueue, IN, osgProducer::KeyboardMouseCallback::EventQueue &, queue, - Properties::NON_VIRTUAL, - __void__appendEventQueue__EventQueue_R1, - "", - ""); - I_Method0(bool, done, - Properties::NON_VIRTUAL, - __bool__done, - "", - ""); - I_Method0(double, getTime, - Properties::NON_VIRTUAL, - __double__getTime, - "", - ""); - I_Method0(Producer::KeyboardMouse *, getKeyboardMouse, - Properties::NON_VIRTUAL, - __Producer_KeyboardMouse_P1__getKeyboardMouse, - "", - ""); - I_Method0(const Producer::KeyboardMouse *, getKeyboardMouse, - Properties::NON_VIRTUAL, - __C5_Producer_KeyboardMouse_P1__getKeyboardMouse, - "", - ""); - I_Method0(osgGA::GUIEventAdapter *, createEventAdapter, - Properties::NON_VIRTUAL, - __osgGA_GUIEventAdapter_P1__createEventAdapter, - "", - ""); - I_Method0(void, updateWindowSize, - Properties::NON_VIRTUAL, - __void__updateWindowSize, - "", - ""); - I_SimpleProperty(bool, EscapeSetDone, - __bool__getEscapeSetDone, - __void__setEscapeSetDone__bool); - I_SimpleProperty(osgGA::EventQueue *, EventQueue, - __osgGA_EventQueue_P1__getEventQueue, - __void__setEventQueue__osgGA_EventQueue_P1); - I_SimpleProperty(Producer::KeyboardMouse *, KeyboardMouse, - __Producer_KeyboardMouse_P1__getKeyboardMouse, - 0); - I_SimpleProperty(double, Time, - __double__getTime, - 0); -END_REFLECTOR - diff --git a/src/osgWrappers/osgProducer/OsgCameraGroup.cpp b/src/osgWrappers/osgProducer/OsgCameraGroup.cpp deleted file mode 100644 index b3c5d41c6..000000000 --- a/src/osgWrappers/osgProducer/OsgCameraGroup.cpp +++ /dev/null @@ -1,408 +0,0 @@ -// *************************************************************************** -// -// Generated automatically by genwrapper. -// Please DO NOT EDIT this file! -// -// *************************************************************************** - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// Must undefine IN and OUT macros defined in Windows headers -#ifdef IN -#undef IN -#endif -#ifdef OUT -#undef OUT -#endif - -TYPE_NAME_ALIAS(Producer::CameraGroup::ThreadModel, osgProducer::OsgCameraGroup::ThreadingModel); - -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgProducer::GraphicsContextImplementation > >, osgProducer::OsgCameraGroup::GraphicsContextList); - -TYPE_NAME_ALIAS(std::vector< Producer::ref_ptr< osgProducer::OsgSceneHandler > >, osgProducer::OsgCameraGroup::SceneHandlerList); - -BEGIN_VALUE_REFLECTOR(osgProducer::OsgCameraGroup) - I_Constructor0(____OsgCameraGroup, - "", - ""); - I_Constructor1(IN, Producer::CameraConfig *, cfg, - Properties::NON_EXPLICIT, - ____OsgCameraGroup__Producer_CameraConfig_P1, - "", - ""); - I_Constructor1(IN, const std::string &, configFile, - Properties::NON_EXPLICIT, - ____OsgCameraGroup__C5_std_string_R1, - "", - ""); - I_Constructor1(IN, osg::ArgumentParser &, arguments, - Properties::NON_EXPLICIT, - ____OsgCameraGroup__osg_ArgumentParser_R1, - "", - ""); - I_Method1(void, setApplicationUsage, IN, osg::ApplicationUsage *, au, - Properties::NON_VIRTUAL, - __void__setApplicationUsage__osg_ApplicationUsage_P1, - "", - ""); - I_Method0(osg::ApplicationUsage *, getApplicationUsage, - Properties::NON_VIRTUAL, - __osg_ApplicationUsage_P1__getApplicationUsage, - "", - ""); - I_Method0(const osg::ApplicationUsage *, getApplicationUsage, - Properties::NON_VIRTUAL, - __C5_osg_ApplicationUsage_P1__getApplicationUsage, - "", - ""); - I_Method1(void, setGraphicsContextList, IN, osgProducer::OsgCameraGroup::GraphicsContextList &, gcList, - Properties::NON_VIRTUAL, - __void__setGraphicsContextList__GraphicsContextList_R1, - "", - ""); - I_Method0(osgProducer::OsgCameraGroup::GraphicsContextList &, getGraphicsContextList, - Properties::NON_VIRTUAL, - __GraphicsContextList_R1__getGraphicsContextList, - "", - ""); - I_Method0(const osgProducer::OsgCameraGroup::GraphicsContextList &, getGraphicsContextList, - Properties::NON_VIRTUAL, - __C5_GraphicsContextList_R1__getGraphicsContextList, - "", - ""); - I_Method0(osgProducer::OsgCameraGroup::SceneHandlerList &, getSceneHandlerList, - Properties::NON_VIRTUAL, - __SceneHandlerList_R1__getSceneHandlerList, - "", - ""); - I_Method0(const osgProducer::OsgCameraGroup::SceneHandlerList &, getSceneHandlerList, - Properties::NON_VIRTUAL, - __C5_SceneHandlerList_R1__getSceneHandlerList, - "", - ""); - I_Method1(void, setSceneData, IN, osg::Node *, scene, - Properties::NON_VIRTUAL, - __void__setSceneData__osg_Node_P1, - "Set the scene data to be rendered. ", - " param scene The node to be used as the starting point during the rendering traversal of the scene graph. "); - I_Method0(osg::Node *, getSceneData, - Properties::NON_VIRTUAL, - __osg_Node_P1__getSceneData, - "Get the scene data being used for rendering. ", - "The node being used as the starting point during the rendering traversal of the scene graph. "); - I_Method0(const osg::Node *, getSceneData, - Properties::NON_VIRTUAL, - __C5_osg_Node_P1__getSceneData, - "", - ""); - I_Method1(void, setSceneDecorator, IN, osg::Group *, decorator, - Properties::NON_VIRTUAL, - __void__setSceneDecorator__osg_Group_P1, - "", - ""); - I_Method0(osg::Group *, getSceneDecorator, - Properties::NON_VIRTUAL, - __osg_Group_P1__getSceneDecorator, - "", - ""); - I_Method0(const osg::Group *, getSceneDecorator, - Properties::NON_VIRTUAL, - __C5_osg_Group_P1__getSceneDecorator, - "", - ""); - I_Method0(osg::Node *, getTopMostSceneData, - Properties::NON_VIRTUAL, - __osg_Node_P1__getTopMostSceneData, - "", - ""); - I_Method0(const osg::Node *, getTopMostSceneData, - Properties::NON_VIRTUAL, - __C5_osg_Node_P1__getTopMostSceneData, - "", - ""); - I_Method0(void, updatedSceneData, - Properties::VIRTUAL, - __void__updatedSceneData, - "Update internal structures w.r.t updated scene data. ", - ""); - I_Method1(void, setDisplaySettings, IN, osg::DisplaySettings *, ds, - Properties::NON_VIRTUAL, - __void__setDisplaySettings__osg_DisplaySettings_P1, - "", - ""); - I_Method0(osg::DisplaySettings *, getDisplaySettings, - Properties::NON_VIRTUAL, - __osg_DisplaySettings_P1__getDisplaySettings, - "", - ""); - I_Method0(const osg::DisplaySettings *, getDisplaySettings, - Properties::NON_VIRTUAL, - __C5_osg_DisplaySettings_P1__getDisplaySettings, - "", - ""); - I_Method1(void, setCullSettings, IN, const osg::CullSettings &, cs, - Properties::NON_VIRTUAL, - __void__setCullSettings__C5_osg_CullSettings_R1, - "", - ""); - I_Method0(osg::CullSettings &, getCullSettings, - Properties::NON_VIRTUAL, - __osg_CullSettings_R1__getCullSettings, - "", - ""); - I_Method0(const osg::CullSettings &, getCullSettings, - Properties::NON_VIRTUAL, - __C5_osg_CullSettings_R1__getCullSettings, - "", - ""); - I_Method1(void, setFrameStamp, IN, osg::FrameStamp *, fs, - Properties::NON_VIRTUAL, - __void__setFrameStamp__osg_FrameStamp_P1, - "", - ""); - I_Method0(osg::FrameStamp *, getFrameStamp, - Properties::NON_VIRTUAL, - __osg_FrameStamp_P1__getFrameStamp, - "", - ""); - I_Method0(const osg::FrameStamp *, getFrameStamp, - Properties::NON_VIRTUAL, - __C5_osg_FrameStamp_P1__getFrameStamp, - "", - ""); - I_Method1(void, setGlobalStateSet, IN, osg::StateSet *, sset, - Properties::NON_VIRTUAL, - __void__setGlobalStateSet__osg_StateSet_P1, - "", - ""); - I_Method0(osg::StateSet *, getGlobalStateSet, - Properties::NON_VIRTUAL, - __osg_StateSet_P1__getGlobalStateSet, - "", - ""); - I_Method0(const osg::StateSet *, getGlobalStateSet, - Properties::NON_VIRTUAL, - __C5_osg_StateSet_P1__getGlobalStateSet, - "", - ""); - I_Method1(void, setClearColor, IN, const osg::Vec4 &, clearColor, - Properties::NON_VIRTUAL, - __void__setClearColor__C5_osg_Vec4_R1, - "", - ""); - I_Method0(const osg::Vec4 &, getClearColor, - Properties::NON_VIRTUAL, - __C5_osg_Vec4_R1__getClearColor, - "", - ""); - I_Method1(void, setLODScale, IN, float, scale, - Properties::NON_VIRTUAL, - __void__setLODScale__float, - "", - ""); - I_Method0(float, getLODScale, - Properties::NON_VIRTUAL, - __float__getLODScale, - "", - ""); - I_MethodWithDefaults2(void, setFusionDistance, IN, osgUtil::SceneView::FusionDistanceMode, mode, , IN, float, value, 1.0f, - Properties::NON_VIRTUAL, - __void__setFusionDistance__osgUtil_SceneView_FusionDistanceMode__float, - "", - ""); - I_Method1(void, setRealizeSceneViewOptions, IN, unsigned int, options, - Properties::NON_VIRTUAL, - __void__setRealizeSceneViewOptions__unsigned_int, - "Set the options to set up SceneView with, see osgUtil::SceneView::Options for available options. ", - ""); - I_Method0(unsigned int, getRealizeSceneViewOptions, - Properties::NON_VIRTUAL, - __unsigned_int__getRealizeSceneViewOptions, - "Get the options to set up SceneView with. ", - ""); - I_Method1(void, setEnableProcessorAffinityHint, IN, bool, enableProccessAffinityHint, - Properties::NON_VIRTUAL, - __void__setEnableProcessorAffinityHint__bool, - "Set whether processor affinity should be enable where supported by hardware. ", - ""); - I_Method0(bool, getEnableProcessorAffinityHint, - Properties::NON_VIRTUAL, - __bool__getEnableProcessorAffinityHint, - "Get whether processor affinity should be enable where supported by hardware. ", - ""); - I_Method1(void, setRealizeCallback, IN, osgProducer::OsgCameraGroup::RealizeCallback *, cb, - Properties::NON_VIRTUAL, - __void__setRealizeCallback__RealizeCallback_P1, - "Set the realize callback to use when once the render surfaces are realized. ", - ""); - I_Method0(osgProducer::OsgCameraGroup::RealizeCallback *, getRealizeCallback, - Properties::NON_VIRTUAL, - __RealizeCallback_P1__getRealizeCallback, - "Get the realize callback. ", - ""); - I_Method0(const osgProducer::OsgCameraGroup::RealizeCallback *, getRealizeCallback, - Properties::NON_VIRTUAL, - __C5_RealizeCallback_P1__getRealizeCallback, - "Get the const realize callback. ", - ""); - I_Method0(void, advance, - Properties::NON_VIRTUAL, - __void__advance, - "", - ""); - I_Method1(bool, realize, IN, osgProducer::OsgCameraGroup::ThreadingModel, thread_model, - Properties::VIRTUAL, - __bool__realize__ThreadingModel, - "Set the threading model and then call realize(). ", - ""); - I_Method0(bool, realize, - Properties::VIRTUAL, - __bool__realize, - "Realize the render surfaces (OpenGL graphics) and various threads, and call any realize callbacks. ", - ""); - I_Method1(void, setView, IN, const osg::Matrixd &, matrix, - Properties::VIRTUAL, - __void__setView__C5_osg_Matrixd_R1, - "Set the model view matrix of the camera group, by individually set all the camera groups's camera. ", - ""); - I_Method0(osg::Matrixd, getViewMatrix, - Properties::NON_VIRTUAL, - __osg_Matrixd__getViewMatrix, - "Get the model view martrix of the camera group, taking its value for camera 0. ", - ""); - I_Method0(void, sync, - Properties::VIRTUAL, - __void__sync, - "", - ""); - I_Method0(void, frame, - Properties::VIRTUAL, - __void__frame, - "Dispatch the cull and draw for each of the Camera's for this frame. ", - ""); - I_Method0(void, cleanup_frame, - Properties::VIRTUAL, - __void__cleanup_frame, - "Dispatch a clean up frame that should be called before closing a OsgCameraGroup, i.e. ", - "on exit from an app. The clean up frame first release all GL objects associated with all the graphics context associated with the camera group, then runs a special frame that does the actual OpenGL deletion of GL objects for each graphics context. "); - I_SimpleProperty(osg::ApplicationUsage *, ApplicationUsage, - __osg_ApplicationUsage_P1__getApplicationUsage, - __void__setApplicationUsage__osg_ApplicationUsage_P1); - I_SimpleProperty(const osg::Vec4 &, ClearColor, - __C5_osg_Vec4_R1__getClearColor, - __void__setClearColor__C5_osg_Vec4_R1); - I_SimpleProperty(const osg::CullSettings &, CullSettings, - __C5_osg_CullSettings_R1__getCullSettings, - __void__setCullSettings__C5_osg_CullSettings_R1); - I_SimpleProperty(osg::DisplaySettings *, DisplaySettings, - __osg_DisplaySettings_P1__getDisplaySettings, - __void__setDisplaySettings__osg_DisplaySettings_P1); - I_SimpleProperty(bool, EnableProcessorAffinityHint, - __bool__getEnableProcessorAffinityHint, - __void__setEnableProcessorAffinityHint__bool); - I_SimpleProperty(osg::FrameStamp *, FrameStamp, - __osg_FrameStamp_P1__getFrameStamp, - __void__setFrameStamp__osg_FrameStamp_P1); - I_SimpleProperty(osg::StateSet *, GlobalStateSet, - __osg_StateSet_P1__getGlobalStateSet, - __void__setGlobalStateSet__osg_StateSet_P1); - I_SimpleProperty(osgProducer::OsgCameraGroup::GraphicsContextList &, GraphicsContextList, - __GraphicsContextList_R1__getGraphicsContextList, - __void__setGraphicsContextList__GraphicsContextList_R1); - I_SimpleProperty(float, LODScale, - __float__getLODScale, - __void__setLODScale__float); - I_SimpleProperty(osgProducer::OsgCameraGroup::RealizeCallback *, RealizeCallback, - __RealizeCallback_P1__getRealizeCallback, - __void__setRealizeCallback__RealizeCallback_P1); - I_SimpleProperty(unsigned int, RealizeSceneViewOptions, - __unsigned_int__getRealizeSceneViewOptions, - __void__setRealizeSceneViewOptions__unsigned_int); - I_SimpleProperty(osg::Node *, SceneData, - __osg_Node_P1__getSceneData, - __void__setSceneData__osg_Node_P1); - I_SimpleProperty(osg::Group *, SceneDecorator, - __osg_Group_P1__getSceneDecorator, - __void__setSceneDecorator__osg_Group_P1); - I_SimpleProperty(osgProducer::OsgCameraGroup::SceneHandlerList &, SceneHandlerList, - __SceneHandlerList_R1__getSceneHandlerList, - 0); - I_SimpleProperty(osg::Node *, TopMostSceneData, - __osg_Node_P1__getTopMostSceneData, - 0); - I_SimpleProperty(const osg::Matrixd &, View, - 0, - __void__setView__C5_osg_Matrixd_R1); - I_SimpleProperty(osg::Matrixd, ViewMatrix, - __osg_Matrixd__getViewMatrix, - 0); -END_REFLECTOR - -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgProducer::OsgCameraGroup::RealizeCallback) - I_BaseType(osg::Referenced); - I_Constructor0(____RealizeCallback, - "", - ""); -END_REFLECTOR - -BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgProducer::GraphicsContextImplementation >) - I_Constructor0(____ref_ptr, - "", - ""); - I_Constructor1(IN, osgProducer::GraphicsContextImplementation *, ptr, - Properties::NON_EXPLICIT, - ____ref_ptr__T_P1, - "", - ""); - I_Constructor1(IN, const osg::ref_ptr< osgProducer::GraphicsContextImplementation > &, rp, - Properties::NON_EXPLICIT, - ____ref_ptr__C5_ref_ptr_R1, - "", - ""); - I_Method0(osgProducer::GraphicsContextImplementation *, get, - Properties::NON_VIRTUAL, - __T_P1__get, - "", - ""); - I_Method0(bool, valid, - Properties::NON_VIRTUAL, - __bool__valid, - "", - ""); - I_Method0(osgProducer::GraphicsContextImplementation *, release, - Properties::NON_VIRTUAL, - __T_P1__release, - "", - ""); - I_Method1(void, swap, IN, osg::ref_ptr< osgProducer::GraphicsContextImplementation > &, rp, - Properties::NON_VIRTUAL, - __void__swap__ref_ptr_R1, - "", - ""); - I_SimpleProperty(osgProducer::GraphicsContextImplementation *, , - __T_P1__get, - 0); -END_REFLECTOR - -STD_VECTOR_REFLECTOR(std::vector< Producer::ref_ptr< osgProducer::OsgSceneHandler > >); - -STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgProducer::GraphicsContextImplementation > >); - diff --git a/src/osgWrappers/osgProducer/OsgSceneHandler.cpp b/src/osgWrappers/osgProducer/OsgSceneHandler.cpp deleted file mode 100644 index fc42b2e67..000000000 --- a/src/osgWrappers/osgProducer/OsgSceneHandler.cpp +++ /dev/null @@ -1,199 +0,0 @@ -// *************************************************************************** -// -// Generated automatically by genwrapper. -// Please DO NOT EDIT this file! -// -// *************************************************************************** - -#include -#include -#include -#include - -#include -#include -#include -#include - -// Must undefine IN and OUT macros defined in Windows headers -#ifdef IN -#undef IN -#endif -#ifdef OUT -#undef OUT -#endif - -BEGIN_OBJECT_REFLECTOR(osgProducer::OsgSceneHandler) - I_ConstructorWithDefaults1(IN, osg::DisplaySettings *, ds, NULL, - Properties::NON_EXPLICIT, - ____OsgSceneHandler__osg_DisplaySettings_P1, - "", - ""); - I_Method1(void, setSceneView, IN, osgUtil::SceneView *, sceneView, - Properties::NON_VIRTUAL, - __void__setSceneView__osgUtil_SceneView_P1, - "set the scene view to which will manage rendering of the OSG scene. ", - ""); - I_Method0(osgUtil::SceneView *, getSceneView, - Properties::NON_VIRTUAL, - __osgUtil_SceneView_P1__getSceneView, - "get the scene view. ", - ""); - I_Method0(const osgUtil::SceneView *, getSceneView, - Properties::NON_VIRTUAL, - __C5_osgUtil_SceneView_P1__getSceneView, - "get the const scene view. ", - ""); - I_Method0(void, init, - Properties::VIRTUAL, - __void__init, - "override the init method to force it be run one at a time. ", - ""); - I_Method1(void, clear, IN, Producer::Camera &, camera, - Properties::VIRTUAL, - __void__clear__Producer_Camera_R1, - "", - ""); - I_Method1(void, clearImplementation, IN, Producer::Camera &, camera, - Properties::VIRTUAL, - __void__clearImplementation__Producer_Camera_R1, - "", - ""); - I_Method1(void, setClearCallback, IN, osgProducer::OsgSceneHandler::Callback *, callback, - Properties::NON_VIRTUAL, - __void__setClearCallback__Callback_P1, - "", - ""); - I_Method0(osgProducer::OsgSceneHandler::Callback *, getClearCallback, - Properties::NON_VIRTUAL, - __Callback_P1__getClearCallback, - "", - ""); - I_Method0(const osgProducer::OsgSceneHandler::Callback *, getClearCallback, - Properties::NON_VIRTUAL, - __C5_Callback_P1__getClearCallback, - "", - ""); - I_Method1(void, cull, IN, Producer::Camera &, camera, - Properties::VIRTUAL, - __void__cull__Producer_Camera_R1, - "", - ""); - I_Method1(void, cullImplementation, IN, Producer::Camera &, camera, - Properties::VIRTUAL, - __void__cullImplementation__Producer_Camera_R1, - "", - ""); - I_Method1(void, setCullCallback, IN, osgProducer::OsgSceneHandler::Callback *, callback, - Properties::NON_VIRTUAL, - __void__setCullCallback__Callback_P1, - "", - ""); - I_Method0(osgProducer::OsgSceneHandler::Callback *, getCullCallback, - Properties::NON_VIRTUAL, - __Callback_P1__getCullCallback, - "", - ""); - I_Method0(const osgProducer::OsgSceneHandler::Callback *, getCullCallback, - Properties::NON_VIRTUAL, - __C5_Callback_P1__getCullCallback, - "", - ""); - I_Method1(void, draw, IN, Producer::Camera &, camera, - Properties::VIRTUAL, - __void__draw__Producer_Camera_R1, - "", - ""); - I_Method1(void, drawImplementation, IN, Producer::Camera &, camera, - Properties::VIRTUAL, - __void__drawImplementation__Producer_Camera_R1, - "", - ""); - I_Method1(void, setDrawCallback, IN, osgProducer::OsgSceneHandler::Callback *, callback, - Properties::NON_VIRTUAL, - __void__setDrawCallback__Callback_P1, - "", - ""); - I_Method0(osgProducer::OsgSceneHandler::Callback *, getDrawCallback, - Properties::NON_VIRTUAL, - __Callback_P1__getDrawCallback, - "", - ""); - I_Method0(const osgProducer::OsgSceneHandler::Callback *, getDrawCallback, - Properties::NON_VIRTUAL, - __C5_Callback_P1__getDrawCallback, - "", - ""); - I_Method1(void, setCollectStats, IN, bool, collectStats, - Properties::NON_VIRTUAL, - __void__setCollectStats__bool, - "", - ""); - I_Method0(bool, getCollectStats, - Properties::NON_VIRTUAL, - __bool__getCollectStats, - "", - ""); - I_Method1(bool, getStats, IN, osgUtil::Statistics &, primStats, - Properties::NON_VIRTUAL, - __bool__getStats__osgUtil_Statistics_R1, - "", - ""); - I_Method1(void, setContextID, IN, int, id, - Properties::NON_VIRTUAL, - __void__setContextID__int, - "", - ""); - I_Method1(void, setFlushOfAllDeletedGLObjectsOnNextFrame, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setFlushOfAllDeletedGLObjectsOnNextFrame__bool, - "", - ""); - I_Method0(bool, getFlushOfAllDeletedGLObjectsOnNextFrame, - Properties::NON_VIRTUAL, - __bool__getFlushOfAllDeletedGLObjectsOnNextFrame, - "", - ""); - I_Method1(void, setCleanUpOnNextFrame, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setCleanUpOnNextFrame__bool, - "", - ""); - I_Method0(bool, getCleanUpOnNextFrame, - Properties::NON_VIRTUAL, - __bool__getCleanUpOnNextFrame, - "", - ""); - I_SimpleProperty(bool, CleanUpOnNextFrame, - __bool__getCleanUpOnNextFrame, - __void__setCleanUpOnNextFrame__bool); - I_SimpleProperty(osgProducer::OsgSceneHandler::Callback *, ClearCallback, - __Callback_P1__getClearCallback, - __void__setClearCallback__Callback_P1); - I_SimpleProperty(bool, CollectStats, - __bool__getCollectStats, - __void__setCollectStats__bool); - I_SimpleProperty(int, ContextID, - 0, - __void__setContextID__int); - I_SimpleProperty(osgProducer::OsgSceneHandler::Callback *, CullCallback, - __Callback_P1__getCullCallback, - __void__setCullCallback__Callback_P1); - I_SimpleProperty(osgProducer::OsgSceneHandler::Callback *, DrawCallback, - __Callback_P1__getDrawCallback, - __void__setDrawCallback__Callback_P1); - I_SimpleProperty(bool, FlushOfAllDeletedGLObjectsOnNextFrame, - __bool__getFlushOfAllDeletedGLObjectsOnNextFrame, - __void__setFlushOfAllDeletedGLObjectsOnNextFrame__bool); - I_SimpleProperty(osgUtil::SceneView *, SceneView, - __osgUtil_SceneView_P1__getSceneView, - __void__setSceneView__osgUtil_SceneView_P1); -END_REFLECTOR - -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgProducer::OsgSceneHandler::Callback) - I_BaseType(osg::Referenced); - I_Constructor0(____Callback, - "", - ""); -END_REFLECTOR - diff --git a/src/osgWrappers/osgProducer/Viewer.cpp b/src/osgWrappers/osgProducer/Viewer.cpp deleted file mode 100644 index c1b04d3fb..000000000 --- a/src/osgWrappers/osgProducer/Viewer.cpp +++ /dev/null @@ -1,526 +0,0 @@ -// *************************************************************************** -// -// Generated automatically by genwrapper. -// Please DO NOT EDIT this file! -// -// *************************************************************************** - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// Must undefine IN and OUT macros defined in Windows headers -#ifdef IN -#undef IN -#endif -#ifdef OUT -#undef OUT -#endif - -TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >, osgProducer::Viewer::EventHandlerList); - -BEGIN_ENUM_REFLECTOR(osgProducer::Viewer::ViewerOptions) - I_EnumLabel(osgProducer::Viewer::NO_EVENT_HANDLERS); - I_EnumLabel(osgProducer::Viewer::TRACKBALL_MANIPULATOR); - I_EnumLabel(osgProducer::Viewer::DRIVE_MANIPULATOR); - I_EnumLabel(osgProducer::Viewer::FLIGHT_MANIPULATOR); - I_EnumLabel(osgProducer::Viewer::TERRAIN_MANIPULATOR); - I_EnumLabel(osgProducer::Viewer::UFO_MANIPULATOR); - I_EnumLabel(osgProducer::Viewer::STATE_MANIPULATOR); - I_EnumLabel(osgProducer::Viewer::HEAD_LIGHT_SOURCE); - I_EnumLabel(osgProducer::Viewer::SKY_LIGHT_SOURCE); - I_EnumLabel(osgProducer::Viewer::STATS_MANIPULATOR); - I_EnumLabel(osgProducer::Viewer::VIEWER_MANIPULATOR); - I_EnumLabel(osgProducer::Viewer::ESCAPE_SETS_DONE); - I_EnumLabel(osgProducer::Viewer::STANDARD_SETTINGS); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osgProducer::Viewer) - I_BaseType(osgProducer::OsgCameraGroup); - I_BaseType(osgGA::GUIActionAdapter); - I_Constructor0(____Viewer, - "", - ""); - I_Constructor1(IN, Producer::CameraConfig *, cfg, - Properties::NON_EXPLICIT, - ____Viewer__Producer_CameraConfig_P1, - "", - ""); - I_Constructor1(IN, const std::string &, configFile, - Properties::NON_EXPLICIT, - ____Viewer__C5_std_string_R1, - "", - ""); - I_Constructor1(IN, osg::ArgumentParser &, arguments, - Properties::NON_EXPLICIT, - ____Viewer__osg_ArgumentParser_R1, - "", - ""); - I_MethodWithDefaults1(void, setUpViewer, IN, unsigned int, options, osgProducer::Viewer::STANDARD_SETTINGS, - Properties::NON_VIRTUAL, - __void__setUpViewer__unsigned_int, - "Set up the viewer, allowing to control some aspects of its behavior. ", - " param options One or more of the options defined by the ViewerOptions enumeration, combined using the bitwise OR operator (``|''). "); - I_Method1(void, setDoneAtElapsedTime, IN, double, elapsedTime, - Properties::NON_VIRTUAL, - __void__setDoneAtElapsedTime__double, - "Set the viewer so it sets done to true once the refrence time equals or exceeds specified elapsed time. ", - "Automatically does a setDoneAtElapsedTimeEnabled(true). "); - I_Method0(double, getDoneAtElapsedTime, - Properties::NON_VIRTUAL, - __double__getDoneAtElapsedTime, - "Get the elapsed time that will cause done to be set to be true. ", - ""); - I_Method1(void, setDoneAtElapsedTimeEnabled, IN, bool, enabled, - Properties::NON_VIRTUAL, - __void__setDoneAtElapsedTimeEnabled__bool, - "Set whether to use a elapsed time to limit the run of the viewer. ", - ""); - I_Method0(bool, getDoneAtElapsedTimeEnabled, - Properties::NON_VIRTUAL, - __bool__getDoneAtElapsedTimeEnabled, - "Get whether to use a elapsed time to limit the run of the viewer. ", - ""); - I_Method1(void, setDoneAtFrameNumber, IN, unsigned int, frameNumber, - Properties::NON_VIRTUAL, - __void__setDoneAtFrameNumber__unsigned_int, - "Set the viewer so it sets done to true once the frame number equals or exceeds specified frame number. ", - "Automatically does a setDoneAtFrameNumberEnabled(true). "); - I_Method0(unsigned int, getDoneAtFrameNumber, - Properties::NON_VIRTUAL, - __unsigned_int__getDoneAtFrameNumber, - "Get the frame number that will cause done to be set to be true. ", - ""); - I_Method1(void, setDoneAtFrameNumberEnabled, IN, bool, enabled, - Properties::NON_VIRTUAL, - __void__setDoneAtFrameNumberEnabled__bool, - "Set whether to use a frame number to limit the run of the viewer. ", - ""); - I_Method0(bool, getDoneAtFrameNumberEnabled, - Properties::NON_VIRTUAL, - __bool__getDoneAtFrameNumberEnabled, - "Get whether to use a frame number to limit the run of the viewer. ", - ""); - I_Method1(void, setDone, IN, bool, done, - Properties::NON_VIRTUAL, - __void__setDone__bool, - "Set the done flag signalling that the viewer exit. ", - ""); - I_Method0(bool, getDone, - Properties::NON_VIRTUAL, - __bool__getDone, - "Get the done flag which signals that the viewer exit. ", - ""); - I_Method0(bool, done, - Properties::VIRTUAL, - __bool__done, - "Return true if the application is done and should exit. ", - ""); - I_Method1(void, setWriteImageWhenDone, IN, bool, enabled, - Properties::NON_VIRTUAL, - __void__setWriteImageWhenDone__bool, - "Set the viewer to take an image snapshot on the last frame() when done is enabled. ", - ""); - I_Method0(bool, getWriteImageWhenDone, - Properties::NON_VIRTUAL, - __bool__getWriteImageWhenDone, - "Set the viewer to take an image snapshot on the last frame() when done is enabled. ", - ""); - I_Method1(void, setWriteImageFileName, IN, const std::string &, filename, - Properties::NON_VIRTUAL, - __void__setWriteImageFileName__C5_std_string_R1, - "Set the filename to write to when the viewer takes an image snapshot on the last frame() when done is enabled. ", - ""); - I_Method0(const std::string &, getWriteImageFileName, - Properties::NON_VIRTUAL, - __C5_std_string_R1__getWriteImageFileName, - "Get the filename to write to when the viewer takes an image snapshot on the last frame() when done is enabled. ", - ""); - I_Method1(void, setViewByMatrix, IN, const Producer::Matrix &, pm, - Properties::VIRTUAL, - __void__setViewByMatrix__C5_Producer_Matrix_R1, - "Override the Producer::CameraGroup::setViewByMatrix to catch all changes to view. ", - ""); - I_Method1(bool, realize, IN, osgProducer::OsgCameraGroup::ThreadingModel, thread_model, - Properties::VIRTUAL, - __bool__realize__ThreadingModel, - "Set the threading model and then call realize(). ", - ""); - I_Method0(bool, realize, - Properties::VIRTUAL, - __bool__realize, - "Realize the render surfaces (OpenGL graphics) and various threads, and call any realize callbacks. ", - ""); - I_Method0(void, update, - Properties::VIRTUAL, - __void__update, - "Updated the scene. ", - "Handle any queued up events, do an update traversal and set the CameraGroup's setViewByMatrix if any camera manipulators are active. "); - I_Method1(void, setUpdateVisitor, IN, osg::NodeVisitor *, nv, - Properties::NON_VIRTUAL, - __void__setUpdateVisitor__osg_NodeVisitor_P1, - "Set the update visitor which does the update traversal of the scene graph. ", - "Automatically called by the update() method. "); - I_Method0(osg::NodeVisitor *, getUpdateVisitor, - Properties::NON_VIRTUAL, - __osg_NodeVisitor_P1__getUpdateVisitor, - "Get the update visitor. ", - ""); - I_Method0(const osg::NodeVisitor *, getUpdateVisitor, - Properties::NON_VIRTUAL, - __C5_osg_NodeVisitor_P1__getUpdateVisitor, - "Get the const update visitor. ", - ""); - I_Method1(void, setEventVisitor, IN, osgGA::EventVisitor *, nv, - Properties::NON_VIRTUAL, - __void__setEventVisitor__osgGA_EventVisitor_P1, - "Set the update visitor which does the event traversal of the scene graph. ", - "Automatically called by the update() method. "); - I_Method0(osgGA::EventVisitor *, getEventVisitor, - Properties::NON_VIRTUAL, - __osgGA_EventVisitor_P1__getEventVisitor, - "Get the update visitor. ", - ""); - I_Method0(const osgGA::EventVisitor *, getEventVisitor, - Properties::NON_VIRTUAL, - __C5_osgGA_EventVisitor_P1__getEventVisitor, - "Get the const update visitor. ", - ""); - I_Method0(void, computeActiveCoordinateSystemNodePath, - Properties::NON_VIRTUAL, - __void__computeActiveCoordinateSystemNodePath, - "", - ""); - I_Method1(void, setCoordinateSystemNodePath, IN, const osg::NodePath &, nodePath, - Properties::NON_VIRTUAL, - __void__setCoordinateSystemNodePath__C5_osg_NodePath_R1, - "", - ""); - I_Method0(osg::NodePath, getCoordinateSystemNodePath, - Properties::NON_VIRTUAL, - __osg_NodePath__getCoordinateSystemNodePath, - "", - ""); - I_Method0(void, frame, - Properties::VIRTUAL, - __void__frame, - "Dispatch the cull and draw for each of the Camera's for this frame. ", - ""); - I_Method0(void, requestRedraw, - Properties::VIRTUAL, - __void__requestRedraw, - "requestRedraw() requests a single redraw. ", - ""); - I_Method1(void, requestContinuousUpdate, IN, bool, x, - Properties::VIRTUAL, - __void__requestContinuousUpdate__bool, - "requestContinousUpdate(bool) is for en/disabling a throw or idle callback to be requested by a GUIEventHandler (typically a MatrixManipulator, though other GUIEventHandler's may also provide functionality). ", - "GUI toolkits can respond to this immediately by registering an idle/timed callback, or can delay setting the callback and update at their own leisure."); - I_Method2(void, requestWarpPointer, IN, float, x, IN, float, y, - Properties::VIRTUAL, - __void__requestWarpPointer__float__float, - "requestWarpPointer(int,int) is requesting a repositioning of the mouse pointer to a specified x,y location on the window. ", - "This is used by some camera manipulators to initialise the mouse pointer when mouse position relative to a controls neutral mouse position is required, i.e when mimicking a aircrafts joystick."); - I_Method5(bool, computePixelCoords, IN, float, x, IN, float, y, IN, unsigned int, cameraNum, IN, float &, pixel_x, IN, float &, pixel_y, - Properties::NON_VIRTUAL, - __bool__computePixelCoords__float__float__unsigned_int__float_R1__float_R1, - "Compute, from normalized mouse coords, for sepecified Camera, the pixel coords relative to that Camera's RenderSurface. ", - ""); - I_Method5(bool, computeNearFarPoints, IN, float, x, IN, float, y, IN, unsigned int, cameraNum, IN, osg::Vec3 &, near, IN, osg::Vec3 &, far, - Properties::NON_VIRTUAL, - __bool__computeNearFarPoints__float__float__unsigned_int__osg_Vec3_R1__osg_Vec3_R1, - "Compute, from normalized mouse coords, for sepecified Camera, the near and far points in worlds coords. ", - ""); - I_MethodWithDefaults6(bool, computeIntersections, IN, float, x, , IN, float, y, , IN, unsigned int, cameraNum, , IN, osg::Node *, node, , IN, osgUtil::IntersectVisitor::HitList &, hits, , IN, osg::Node::NodeMask, traversalMask, 0xffffffff, - Properties::NON_VIRTUAL, - __bool__computeIntersections__float__float__unsigned_int__osg_Node_P1__osgUtil_IntersectVisitor_HitList_R1__osg_Node_NodeMask, - "Compute, from normalized mouse coords, for all Cameras, intersections with the specified subgraph. ", - ""); - I_MethodWithDefaults5(bool, computeIntersections, IN, float, x, , IN, float, y, , IN, unsigned int, cameraNum, , IN, osgUtil::IntersectVisitor::HitList &, hits, , IN, osg::Node::NodeMask, traversalMask, 0xffffffff, - Properties::NON_VIRTUAL, - __bool__computeIntersections__float__float__unsigned_int__osgUtil_IntersectVisitor_HitList_R1__osg_Node_NodeMask, - "Compute, from normalized mouse coords, for sepecified Camera, intersections with the scene. ", - ""); - I_MethodWithDefaults5(bool, computeIntersections, IN, float, x, , IN, float, y, , IN, osg::Node *, node, , IN, osgUtil::IntersectVisitor::HitList &, hits, , IN, osg::Node::NodeMask, traversalMask, 0xffffffff, - Properties::NON_VIRTUAL, - __bool__computeIntersections__float__float__osg_Node_P1__osgUtil_IntersectVisitor_HitList_R1__osg_Node_NodeMask, - "Compute, from normalized mouse coords, for all Cameras, intersections with specified subgraph. ", - ""); - I_MethodWithDefaults4(bool, computeIntersections, IN, float, x, , IN, float, y, , IN, osgUtil::IntersectVisitor::HitList &, hits, , IN, osg::Node::NodeMask, traversalMask, 0xffffffff, - Properties::NON_VIRTUAL, - __bool__computeIntersections__float__float__osgUtil_IntersectVisitor_HitList_R1__osg_Node_NodeMask, - "Compute, from normalized mouse coords, for all Cameras, intersections with the scene. ", - ""); - I_Method1(void, setEventQueue, IN, osgGA::EventQueue *, eventQueue, - Properties::NON_VIRTUAL, - __void__setEventQueue__osgGA_EventQueue_P1, - "Set the EventQueue - a thread safe queue for registering events. ", - ""); - I_Method0(osgGA::EventQueue *, getEventQueue, - Properties::NON_VIRTUAL, - __osgGA_EventQueue_P1__getEventQueue, - "Get the EventQueue. ", - ""); - I_Method1(void, setKeyboardMouse, IN, Producer::KeyboardMouse *, kbm, - Properties::NON_VIRTUAL, - __void__setKeyboardMouse__Producer_KeyboardMouse_P1, - "", - ""); - I_Method0(Producer::KeyboardMouse *, getKeyboardMouse, - Properties::NON_VIRTUAL, - __Producer_KeyboardMouse_P1__getKeyboardMouse, - "", - ""); - I_Method0(const Producer::KeyboardMouse *, getKeyboardMouse, - Properties::NON_VIRTUAL, - __C5_Producer_KeyboardMouse_P1__getKeyboardMouse, - "", - ""); - I_Method1(void, setKeyboardMouseCallback, IN, osgProducer::KeyboardMouseCallback *, kbmcb, - Properties::NON_VIRTUAL, - __void__setKeyboardMouseCallback__osgProducer_KeyboardMouseCallback_P1, - "", - ""); - I_Method0(osgProducer::KeyboardMouseCallback *, getKeyboardMouseCallback, - Properties::NON_VIRTUAL, - __osgProducer_KeyboardMouseCallback_P1__getKeyboardMouseCallback, - "", - ""); - I_Method0(const osgProducer::KeyboardMouseCallback *, getKeyboardMouseCallback, - Properties::NON_VIRTUAL, - __C5_osgProducer_KeyboardMouseCallback_P1__getKeyboardMouseCallback, - "", - ""); - I_Method0(osgProducer::Viewer::EventHandlerList &, getEventHandlerList, - Properties::NON_VIRTUAL, - __EventHandlerList_R1__getEventHandlerList, - "", - ""); - I_Method0(const osgProducer::Viewer::EventHandlerList &, getEventHandlerList, - Properties::NON_VIRTUAL, - __C5_EventHandlerList_R1__getEventHandlerList, - "", - ""); - I_Method0(osgGA::KeySwitchMatrixManipulator *, getKeySwitchMatrixManipulator, - Properties::NON_VIRTUAL, - __osgGA_KeySwitchMatrixManipulator_P1__getKeySwitchMatrixManipulator, - "", - ""); - I_Method0(const osgGA::KeySwitchMatrixManipulator *, getKeySwitchMatrixManipulator, - Properties::NON_VIRTUAL, - __C5_osgGA_KeySwitchMatrixManipulator_P1__getKeySwitchMatrixManipulator, - "", - ""); - I_Method1(unsigned int, addCameraManipulator, IN, osgGA::MatrixManipulator *, cm, - Properties::NON_VIRTUAL, - __unsigned_int__addCameraManipulator__osgGA_MatrixManipulator_P1, - "", - ""); - I_Method1(void, selectCameraManipulator, IN, unsigned int, no, - Properties::NON_VIRTUAL, - __void__selectCameraManipulator__unsigned_int, - "", - ""); - I_Method1(void, getCameraManipulatorNameList, IN, std::list< std::string > &, nameList, - Properties::NON_VIRTUAL, - __void__getCameraManipulatorNameList__std_listT1_std_string__R1, - "", - ""); - I_Method1(bool, selectCameraManipulatorByName, IN, const std::string &, name, - Properties::NON_VIRTUAL, - __bool__selectCameraManipulatorByName__C5_std_string_R1, - "", - ""); - I_Method1(osgGA::MatrixManipulator *, getCameraManipulatorByName, IN, const std::string &, name, - Properties::NON_VIRTUAL, - __osgGA_MatrixManipulator_P1__getCameraManipulatorByName__C5_std_string_R1, - "", - ""); - I_Method1(void, setRecordingAnimationPath, IN, bool, on, - Properties::NON_VIRTUAL, - __void__setRecordingAnimationPath__bool, - "", - ""); - I_Method0(bool, getRecordingAnimationPath, - Properties::NON_VIRTUAL, - __bool__getRecordingAnimationPath, - "", - ""); - I_Method1(void, setAnimationPath, IN, osg::AnimationPath *, path, - Properties::NON_VIRTUAL, - __void__setAnimationPath__osg_AnimationPath_P1, - "", - ""); - I_Method0(osg::AnimationPath *, getAnimationPath, - Properties::NON_VIRTUAL, - __osg_AnimationPath_P1__getAnimationPath, - "", - ""); - I_Method0(const osg::AnimationPath *, getAnimationPath, - Properties::NON_VIRTUAL, - __C5_osg_AnimationPath_P1__getAnimationPath, - "", - ""); - I_Method0(const double *, getPosition, - Properties::NON_VIRTUAL, - __C5_double_P1__getPosition, - "", - ""); - I_Method0(double, getSpeed, - Properties::NON_VIRTUAL, - __double__getSpeed, - "", - ""); - I_Method0(osg::Quat, getOrientation, - Properties::NON_VIRTUAL, - __osg_Quat__getOrientation, - "", - ""); - I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, - Properties::VIRTUAL, - __void__getUsage__osg_ApplicationUsage_R1, - "Get the keyboard and mouse usage of this viewer. ", - ""); - I_Method0(void, updatedSceneData, - Properties::VIRTUAL, - __void__updatedSceneData, - "Update internal structures w.r.t updated scene data. ", - ""); - I_Method0(void, cleanup_frame, - Properties::VIRTUAL, - __void__cleanup_frame, - "Dispatch a clean up frame that should be called before closing a OsgCameraGroup, i.e. ", - "on exit from an app. The clean up frame first release all GL objects associated with all the graphics context associated with the camera group, then runs a special frame that does the actual OpenGL deletion of GL objects for each graphics context. "); - I_StaticMethod0(const char *, getDefaultImageFileName, - __C5_char_P1__getDefaultImageFileName_S, - "Get the default filename for writing an image snapshot. ", - ""); - I_SimpleProperty(osg::AnimationPath *, AnimationPath, - __osg_AnimationPath_P1__getAnimationPath, - __void__setAnimationPath__osg_AnimationPath_P1); - I_SimpleProperty(osg::NodePath, CoordinateSystemNodePath, - __osg_NodePath__getCoordinateSystemNodePath, - __void__setCoordinateSystemNodePath__C5_osg_NodePath_R1); - I_SimpleProperty(bool, Done, - __bool__getDone, - __void__setDone__bool); - I_SimpleProperty(double, DoneAtElapsedTime, - __double__getDoneAtElapsedTime, - __void__setDoneAtElapsedTime__double); - I_SimpleProperty(bool, DoneAtElapsedTimeEnabled, - __bool__getDoneAtElapsedTimeEnabled, - __void__setDoneAtElapsedTimeEnabled__bool); - I_SimpleProperty(unsigned int, DoneAtFrameNumber, - __unsigned_int__getDoneAtFrameNumber, - __void__setDoneAtFrameNumber__unsigned_int); - I_SimpleProperty(bool, DoneAtFrameNumberEnabled, - __bool__getDoneAtFrameNumberEnabled, - __void__setDoneAtFrameNumberEnabled__bool); - I_SimpleProperty(osgProducer::Viewer::EventHandlerList &, EventHandlerList, - __EventHandlerList_R1__getEventHandlerList, - 0); - I_SimpleProperty(osgGA::EventQueue *, EventQueue, - __osgGA_EventQueue_P1__getEventQueue, - __void__setEventQueue__osgGA_EventQueue_P1); - I_SimpleProperty(osgGA::EventVisitor *, EventVisitor, - __osgGA_EventVisitor_P1__getEventVisitor, - __void__setEventVisitor__osgGA_EventVisitor_P1); - I_SimpleProperty(osgGA::KeySwitchMatrixManipulator *, KeySwitchMatrixManipulator, - __osgGA_KeySwitchMatrixManipulator_P1__getKeySwitchMatrixManipulator, - 0); - I_SimpleProperty(Producer::KeyboardMouse *, KeyboardMouse, - __Producer_KeyboardMouse_P1__getKeyboardMouse, - __void__setKeyboardMouse__Producer_KeyboardMouse_P1); - I_SimpleProperty(osgProducer::KeyboardMouseCallback *, KeyboardMouseCallback, - __osgProducer_KeyboardMouseCallback_P1__getKeyboardMouseCallback, - __void__setKeyboardMouseCallback__osgProducer_KeyboardMouseCallback_P1); - I_SimpleProperty(osg::Quat, Orientation, - __osg_Quat__getOrientation, - 0); - I_SimpleProperty(const double *, Position, - __C5_double_P1__getPosition, - 0); - I_SimpleProperty(bool, RecordingAnimationPath, - __bool__getRecordingAnimationPath, - __void__setRecordingAnimationPath__bool); - I_SimpleProperty(double, Speed, - __double__getSpeed, - 0); - I_SimpleProperty(unsigned int, UpViewer, - 0, - __void__setUpViewer__unsigned_int); - I_SimpleProperty(osg::NodeVisitor *, UpdateVisitor, - __osg_NodeVisitor_P1__getUpdateVisitor, - __void__setUpdateVisitor__osg_NodeVisitor_P1); - I_SimpleProperty(const Producer::Matrix &, ViewByMatrix, - 0, - __void__setViewByMatrix__C5_Producer_Matrix_R1); - I_SimpleProperty(const std::string &, WriteImageFileName, - __C5_std_string_R1__getWriteImageFileName, - __void__setWriteImageFileName__C5_std_string_R1); - I_SimpleProperty(bool, WriteImageWhenDone, - __bool__getWriteImageWhenDone, - __void__setWriteImageWhenDone__bool); -END_REFLECTOR - -BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::GUIEventHandler >) - I_Constructor0(____ref_ptr, - "", - ""); - I_Constructor1(IN, osgGA::GUIEventHandler *, ptr, - Properties::NON_EXPLICIT, - ____ref_ptr__T_P1, - "", - ""); - I_Constructor1(IN, const osg::ref_ptr< osgGA::GUIEventHandler > &, rp, - Properties::NON_EXPLICIT, - ____ref_ptr__C5_ref_ptr_R1, - "", - ""); - I_Method0(osgGA::GUIEventHandler *, get, - Properties::NON_VIRTUAL, - __T_P1__get, - "", - ""); - I_Method0(bool, valid, - Properties::NON_VIRTUAL, - __bool__valid, - "", - ""); - I_Method0(osgGA::GUIEventHandler *, release, - Properties::NON_VIRTUAL, - __T_P1__release, - "", - ""); - I_Method1(void, swap, IN, osg::ref_ptr< osgGA::GUIEventHandler > &, rp, - Properties::NON_VIRTUAL, - __void__swap__ref_ptr_R1, - "", - ""); - I_SimpleProperty(osgGA::GUIEventHandler *, , - __T_P1__get, - 0); -END_REFLECTOR - -STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >); - -STD_LIST_REFLECTOR(std::list< std::string >); - diff --git a/src/osgWrappers/osgProducer/ViewerEventHandler.cpp b/src/osgWrappers/osgProducer/ViewerEventHandler.cpp deleted file mode 100644 index d4dbb8534..000000000 --- a/src/osgWrappers/osgProducer/ViewerEventHandler.cpp +++ /dev/null @@ -1,131 +0,0 @@ -// *************************************************************************** -// -// Generated automatically by genwrapper. -// Please DO NOT EDIT this file! -// -// *************************************************************************** - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -// Must undefine IN and OUT macros defined in Windows headers -#ifdef IN -#undef IN -#endif -#ifdef OUT -#undef OUT -#endif - -BEGIN_ENUM_REFLECTOR(osgProducer::ViewerEventHandler::FrameStatsMode) - I_EnumLabel(osgProducer::ViewerEventHandler::NO_STATS); - I_EnumLabel(osgProducer::ViewerEventHandler::FRAME_RATE); - I_EnumLabel(osgProducer::ViewerEventHandler::CAMERA_STATS); - I_EnumLabel(osgProducer::ViewerEventHandler::SCENE_STATS); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osgProducer::ViewerEventHandler) - I_BaseType(osgGA::GUIEventHandler); - I_Constructor1(IN, osgProducer::OsgCameraGroup *, cg, - Properties::NON_EXPLICIT, - ____ViewerEventHandler__OsgCameraGroup_P1, - "", - ""); - I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, - Properties::VIRTUAL, - __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, - "deprecated, Handle events, return true if handled, false otherwise. ", - ""); - I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, - Properties::VIRTUAL, - __void__getUsage__osg_ApplicationUsage_R1, - "Get the keyboard and mouse usage of this manipulator. ", - ""); - I_Method0(osgProducer::OsgCameraGroup *, getOsgCameraGroup, - Properties::NON_VIRTUAL, - __OsgCameraGroup_P1__getOsgCameraGroup, - "", - ""); - I_Method0(const osgProducer::OsgCameraGroup *, getOsgCameraGroup, - Properties::NON_VIRTUAL, - __C5_OsgCameraGroup_P1__getOsgCameraGroup, - "", - ""); - I_Method1(void, setWriteNodeFileName, IN, const std::string &, filename, - Properties::NON_VIRTUAL, - __void__setWriteNodeFileName__C5_std_string_R1, - "", - ""); - I_Method0(const std::string &, getWriteNodeFileName, - Properties::NON_VIRTUAL, - __C5_std_string_R1__getWriteNodeFileName, - "", - ""); - I_Method1(void, setDisplayHelp, IN, bool, displayHelp, - Properties::NON_VIRTUAL, - __void__setDisplayHelp__bool, - "", - ""); - I_Method0(bool, getDisplayHelp, - Properties::NON_VIRTUAL, - __bool__getDisplayHelp, - "", - ""); - I_Method1(void, setFrameStatsMode, IN, osgProducer::ViewerEventHandler::FrameStatsMode, mode, - Properties::NON_VIRTUAL, - __void__setFrameStatsMode__FrameStatsMode, - "", - ""); - I_Method0(osgProducer::ViewerEventHandler::FrameStatsMode, getFrameStatsMode, - Properties::NON_VIRTUAL, - __FrameStatsMode__getFrameStatsMode, - "", - ""); - I_Method1(void, setWriteImageOnNextFrame, IN, bool, writeImageOnNextFrame, - Properties::NON_VIRTUAL, - __void__setWriteImageOnNextFrame__bool, - "", - ""); - I_Method1(void, setWriteImageFileName, IN, const std::string &, filename, - Properties::NON_VIRTUAL, - __void__setWriteImageFileName__C5_std_string_R1, - "", - ""); - I_Method0(const std::string &, getWriteImageFileName, - Properties::NON_VIRTUAL, - __C5_std_string_R1__getWriteImageFileName, - "", - ""); - I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0, - Properties::VIRTUAL, - __void__releaseGLObjects__osg_State_P1, - "release OpenGL objects in specified graphics context if State object is passed, otherwise release OpenGL objexts for all graphics context if State object pointer NULL. ", - ""); - I_SimpleProperty(bool, DisplayHelp, - __bool__getDisplayHelp, - __void__setDisplayHelp__bool); - I_SimpleProperty(osgProducer::ViewerEventHandler::FrameStatsMode, FrameStatsMode, - __FrameStatsMode__getFrameStatsMode, - __void__setFrameStatsMode__FrameStatsMode); - I_SimpleProperty(osgProducer::OsgCameraGroup *, OsgCameraGroup, - __OsgCameraGroup_P1__getOsgCameraGroup, - 0); - I_SimpleProperty(const std::string &, WriteImageFileName, - __C5_std_string_R1__getWriteImageFileName, - __void__setWriteImageFileName__C5_std_string_R1); - I_SimpleProperty(bool, WriteImageOnNextFrame, - 0, - __void__setWriteImageOnNextFrame__bool); - I_SimpleProperty(const std::string &, WriteNodeFileName, - __C5_std_string_R1__getWriteNodeFileName, - __void__setWriteNodeFileName__C5_std_string_R1); -END_REFLECTOR - diff --git a/src/osgWrappers/osgViewer/SimpleViewer.cpp b/src/osgWrappers/osgViewer/SimpleViewer.cpp index 3fd5cc7bb..b7a249cbc 100644 --- a/src/osgWrappers/osgViewer/SimpleViewer.cpp +++ b/src/osgWrappers/osgViewer/SimpleViewer.cpp @@ -173,3 +173,44 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgViewer::SimpleViewer) 0); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::GUIEventHandler >) + I_Constructor0(____ref_ptr, + "", + ""); + I_Constructor1(IN, osgGA::GUIEventHandler *, ptr, + Properties::NON_EXPLICIT, + ____ref_ptr__T_P1, + "", + ""); + I_Constructor1(IN, const osg::ref_ptr< osgGA::GUIEventHandler > &, rp, + Properties::NON_EXPLICIT, + ____ref_ptr__C5_ref_ptr_R1, + "", + ""); + I_Method0(osgGA::GUIEventHandler *, get, + Properties::NON_VIRTUAL, + __T_P1__get, + "", + ""); + I_Method0(bool, valid, + Properties::NON_VIRTUAL, + __bool__valid, + "", + ""); + I_Method0(osgGA::GUIEventHandler *, release, + Properties::NON_VIRTUAL, + __T_P1__release, + "", + ""); + I_Method1(void, swap, IN, osg::ref_ptr< osgGA::GUIEventHandler > &, rp, + Properties::NON_VIRTUAL, + __void__swap__ref_ptr_R1, + "", + ""); + I_SimpleProperty(osgGA::GUIEventHandler *, , + __T_P1__get, + 0); +END_REFLECTOR + +STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >); + diff --git a/src/osgWrappers/osgViewer/View.cpp b/src/osgWrappers/osgViewer/View.cpp index 248a45978..73bd6d018 100644 --- a/src/osgWrappers/osgViewer/View.cpp +++ b/src/osgWrappers/osgViewer/View.cpp @@ -11,8 +11,10 @@ #include #include +#include #include #include +#include #include #include #include @@ -74,6 +76,35 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::View) I_Constructor0(____View, "", ""); + I_ConstructorWithDefaults2(IN, const osgViewer::View &, view, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____View__C5_osgViewer_View_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "Clone the type of an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, + Properties::VIRTUAL, + __osg_Object_P1__clone__C5_osg_CopyOp_R1, + "Clone an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the object's library. ", + "Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. "); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "return the name of the object's class type. ", + "Must be defined by derived classes. "); I_Method0(osgViewer::Scene *, getScene, Properties::NON_VIRTUAL, __Scene_P1__getScene,