From bee892904a2fd7b940280e859bd1203d824b84af Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sun, 8 Dec 2002 19:45:03 +0000
Subject: [PATCH] Fixes for VisualStudio build of txp plugin.

---
 VisualStudio/Demos/osgtxp/osgtxp.dsp | 14 +++++++-------
 VisualStudio/VisualStudio.dsw        | 27 +++++++++++++++++++++++++++
 VisualStudio/osgPlugins/txp/txp.dsp  |  8 ++++++--
 3 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/VisualStudio/Demos/osgtxp/osgtxp.dsp b/VisualStudio/Demos/osgtxp/osgtxp.dsp
index 4a959bcd4..a1b9ecafd 100644
--- a/VisualStudio/Demos/osgtxp/osgtxp.dsp
+++ b/VisualStudio/Demos/osgtxp/osgtxp.dsp
@@ -13,12 +13,12 @@ CFG=osgtxp - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "osgtxp.mak" CFG="osgtxp - Win32 Debug"
+!MESSAGE NMAKE /f "osgtxp.mak" CFG="Demo osgtxp - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "osgtxp - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "osgtxp - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Demo osgtxp - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Demo osgtxp - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=osgtxp - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "osgtxp - Win32 Release"
+!IF  "$(CFG)" == "Demo osgtxp - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -52,7 +52,7 @@ 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  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib glut32.lib /nologo /subsystem:console /machine:I386 /out:"../../../bin/osgtxp.exe"
 
-!ELSEIF  "$(CFG)" == "osgtxp - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Demo osgtxp - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -80,8 +80,8 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "osgtxp - Win32 Release"
-# Name "osgtxp - Win32 Debug"
+# Name "Demo osgtxp - Win32 Release"
+# Name "Demo osgtxp - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/VisualStudio/VisualStudio.dsw b/VisualStudio/VisualStudio.dsw
index 6947e47ee..6281a8e63 100644
--- a/VisualStudio/VisualStudio.dsw
+++ b/VisualStudio/VisualStudio.dsw
@@ -481,6 +481,33 @@ Package=<4>
     End Project Dependency
 }}}
 
+###############################################################################
+
+Project: "Demo osgtxp"=.\Demos\osgtxp\osgtxp.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name Core osg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name Core osgDB
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name Core osgGA
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name Core osgGLUT
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name Core osgUtil
+    End Project Dependency
+}}}
+
 ##############################################################################################################################################################
 
 Project: "Demo osggeometry"=.\Demos\osggeometry\osggeometry.dsp - Package Owner=<4>
diff --git a/VisualStudio/osgPlugins/txp/txp.dsp b/VisualStudio/osgPlugins/txp/txp.dsp
index 59a211dd0..d1534af05 100644
--- a/VisualStudio/osgPlugins/txp/txp.dsp
+++ b/VisualStudio/osgPlugins/txp/txp.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSGTXP_LIBRARY" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x41a /d "NDEBUG"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /vmg /vd0 /GR /GX /Zi /Od /I "../../../include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D __COMP_DLL=7931 /D "WIN32" /D "_DEBUG" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /vmg /vd0 /GR /GX /Zi /Od /I "../../../include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D __COMP_DLL=7931 /D "WIN32" /D "_DEBUG" /D "OSGTXP_LIBRARY"/YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x41a /d "_DEBUG"
@@ -118,6 +118,10 @@ SOURCE=..\..\..\src\osgPlugins\txp\trpage_light.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\src\osgPlugins\txp\trpage_managers.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\src\osgPlugins\txp\trpage_material.cpp
 # End Source File
 # Begin Source File