[Python-ogre-commit] SF.net SVN: python-ogre: [604] trunk/python-ogre

[<and...@us...>]

Revision: 604
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=604&view=rev
Author:   andy_miller
Date:     2008-06-22 23:26:56 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
Navi 1.6 now compiles
my patches to theoravideo

Modified Paths:
--------------
    trunk/python-ogre/PythonOgreConfig_nt.py
    trunk/python-ogre/PythonOgreConfig_posix.py
    trunk/python-ogre/code_generators/navi/generate_code.py
    trunk/python-ogre/environment.py

Added Paths:
-----------
    trunk/python-ogre/patch/ogre_1.7.patch
    trunk/python-ogre/patch/theoravideo.patch

Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py	2008-06-22 11:59:01 UTC (rev 603)
+++ trunk/python-ogre/PythonOgreConfig_nt.py	2008-06-23 06:26:56 UTC (rev 604)
@@ -159,6 +159,8 @@
 PATH_INCLUDE_freetype=      os.path.join(PATH_INCLUDE_quickgui,'FreeType2.3.5')    
 PATH_INCLUDE_betagui =      PATH_betagui
 PATH_INCLUDE_Theora =       os.path.join (PATH_Theora,'include')
+PATH_INCLUDE_TheoraDemo =       os.path.join (PATH_Theora,'..', 'CEGUI_TheoraDemo','include')
+
 PATH_INCLUDE_ogrevideoffmpeg =  PATH_ogrevideoffmpeg
 PATH_INCLUDE_ffmpeg =       os.path.join (PATH_ffmpeg,'include')
 PATH_INCLUDE_ogredshow =    PATH_ogredshow

Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py	2008-06-22 11:59:01 UTC (rev 603)
+++ trunk/python-ogre/PythonOgreConfig_posix.py	2008-06-23 06:26:56 UTC (rev 604)
@@ -158,6 +158,8 @@
 PATH_INCLUDE_Bullet = 		os.path.join( PATH_Bullet, 'src')
 PATH_INCLUDE_betagui =       PATH_betagui
 PATH_INCLUDE_Theora =       os.path.join (PATH_Theora,'include')
+PATH_INCLUDE_TheoraDemo =       os.path.join (PATH_Theora,'..', 'CEGUI_TheoraDemo','include')
+
 PATH_INCLUDE_ogrevideoffmpeg =  PATH_ogrevideoffmpeg
 PATH_INCLUDE_ffmpeg =       os.path.join (PATH_ffmpeg,'include')
 PATH_INCLUDE_plib =         PATH_plib

Modified: trunk/python-ogre/code_generators/navi/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/navi/generate_code.py	2008-06-22 11:59:01 UTC (rev 603)
+++ trunk/python-ogre/code_generators/navi/generate_code.py	2008-06-23 06:26:56 UTC (rev 604)
@@ -52,6 +52,15 @@
 def ManualExclude ( mb ):
     global_ns = mb.global_ns
     main_ns = global_ns.namespace( MAIN_NAMESPACE )
+    
+    for c in main_ns.classes():
+        print "C:", c
+    for c in main_ns.member_functions():
+        print "F:", c
+    for c in main_ns.variables():
+        print "V:", c
+        
+#     sys.exit(-1)    
      
     # things not yet implemented in the C source..
     excludes=[]
@@ -62,13 +71,17 @@
                     m.exclude()
     
     ### Member Functions
-    excludes=[] ## '::NaviLibrary::Navi::bind' ]  ## has a default parameter of InlineVector which we can't create :(
-#     ['::NaviLibrary::NaviDataValue::isEmpty'
-#                ,'::NaviLibrary::NaviDataValue::isNumber' ## inline functions
-#          ]
+    excludes=[ '::NaviLibrary::Navi::navigateRefresh'
+               ,'::NaviLibrary::Singleton<class NaviLibrary::NaviManager>::instance'
+               ,'::NaviLibrary::Navi::bind' #needs inline vector class
+               ,'::NaviLibrary::Navi::evaluateJS'
+            ]
     for e in excludes:
         print "excluding ", e
-        main_ns.member_functions(e).exclude()
+        try:
+            main_ns.member_functions(e).exclude()
+        except:
+            print "FAILED.."            
     
         
     for c in main_ns.classes():
@@ -76,7 +89,7 @@
         if c.name.startswith ( "Inline" ):
             print "setting noncopyable on ", c
             c.noncopyable = True
-#             c.exclude() 
+            c.exclude() 
            
                 
     ### Free Functions
@@ -85,9 +98,14 @@
         main_ns.free_functions(e).exclude()
         
     ## Classes
-    excludes = [] ## '::NaviLibrary::NaviUtilities::InlineVector<std::string>'  ]
+    excludes = ['::NaviLibrary::Singleton<class NaviLibrary::NaviManager>'
+                ] ## '::NaviLibrary::NaviUtilities::InlineVector<std::string>'  ]
     for e in excludes:
-        main_ns.class_(e).exclude()
+        print "Excluding class:", e
+        try:
+            main_ns.class_(e).exclude()
+        except:
+            print "FAILED"            
     
         
     ## I have a challenge that Py++ doesn't recognise these classes by full name (perhaps because they are structs?)
@@ -103,7 +121,9 @@
 #     cls.variable("StaticFunction").exclude()
 #     
     
-    excludes = []# 'FastDelegate1::m_Closure']
+    excludes = ['::NaviLibrary::Singleton<NaviLibrary::NaviMouse>::instance'
+                ,'::NaviLibrary::Singleton<NaviLibrary::NaviManager>::instance'
+                ]
     for e in excludes:
         print "Excluding Var", e
         main_ns.variable(e).exclude()
@@ -448,8 +468,9 @@
                         os.path.join( environment.navi.root_dir, "python_navi.h" )
                         , environment.navi.cache_file )
 
-    defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY', 'NAVI_NONCLIENT_BUILD', '__VECTOR_C']
-#     undefined_symbols = ['FASTDLGT_HASINHERITANCE_KEYWORDS']
+    defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY', 
+                    'NAVI_DYNAMIC_LIB', 
+                    '__VECTOR_C','_WIN32']
     
     if environment._USE_THREADS:
         defined_symbols.append('BOOST_HAS_THREADS')

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2008-06-22 11:59:01 UTC (rev 603)
+++ trunk/python-ogre/environment.py	2008-06-23 06:26:56 UTC (rev 604)
@@ -958,7 +958,7 @@
     version="1.6"
     parent="ogre/gui"
     name ='navi'
-    CCFLAGS = '-D"WIN32" -D"NDEBUG", -D"WINDOWS"' 
+    CCFLAGS = '-D"WIN32" -D"NDEBUG", -D"WINDOWS", -D"_WIN32", -D"NAVI_DYNAMIC_LIB" ' 
     cflags=""
     base = 'navi'
     include_dirs = [ Config.PATH_Boost
@@ -1088,6 +1088,8 @@
     include_dirs = [ Config.PATH_Boost,
                     Config.PATH_INCLUDE_Ogre,
                     Config.PATH_INCLUDE_Theora,
+                    Config.PATH_INCLUDE_TheoraDemo
+                    
                     ]
     for d in Config.PATH_INCLUDE_OggVorbisTheora:
         include_dirs.append( d )

Added: trunk/python-ogre/patch/ogre_1.7.patch
===================================================================
--- trunk/python-ogre/patch/ogre_1.7.patch	                        (rev 0)
+++ trunk/python-ogre/patch/ogre_1.7.patch	2008-06-23 06:26:56 UTC (rev 604)
@@ -0,0 +1,91 @@
+
+--- ogre/configure.in	2007-05-15 22:43:31.000000000 +0800
++++ ogre/configure.in	2007-05-15 22:43:18.000000000 +0800
+@@ -59,6 +58,7 @@
+         ;;
+     esac
+     ])
++CFLAGS_VISIBILITY=""
+ AC_SUBST(CFLAGS_VISIBILITY)
+ AC_LANG_POP
+
+--- ogre/OgreMain/include/OgreDataStream.h	23 Aug 2006 08:18:33 -0000	1.12
++++ ogre/OgreMain/include/OgreDataStream.h	24 Nov 2007 00:35:47 -0000
+@@ -33,6 +33,7 @@
+ #include "OgreString.h"
+ #include "OgreSharedPtr.h"
+ #include <istream>
++#include <stdexcept>
+ 
+ namespace Ogre {
+ 
+@@ -79,7 +80,7 @@
+ 		@param count Number of bytes to read
+ 		@returns The number of bytes read
+ 		*/
+-		virtual size_t read(void* buf, size_t count) = 0;
++		virtual size_t read(void* buf, size_t count) { throw std::runtime_error ( std::string ("Virtual function DataStream::read called!") ); }
+ 		/** Get a single line from the stream.
+ 		@remarks
+ 			The delimiter character is not included in the data
+@@ -146,7 +147,7 @@
+ 		/** Returns the total size of the data to be read from the stream, 
+ 			or 0 if this is indeterminate for this stream. 
+ 		*/
+-        size_t size(void) const { return mSize; }
++        virtual size_t size(void) const { return mSize; }
+ 
+         /** Close the stream; this makes further operations invalid. */
+         virtual void close(void) = 0;
+         
+--- ogre/OgreMain/include/OgreHardwareBuffer.h	23 Aug 2006 08:18:33 -0000	1.17
++++ ogre/OgreMain/include/OgreHardwareBuffer.h	24 Nov 2007 00:37:00 -0000
+@@ -31,6 +31,8 @@
+ 
+ // Precompiler options
+ #include "OgrePrerequisites.h"
++#include <stdexcept>
++
+ 
+ namespace Ogre {
+ 
+@@ -244,7 +246,7 @@
+             @param pDest The area of memory in which to place the data, must be large enough to 
+                 accommodate the data!
+             */
+-            virtual void readData(size_t offset, size_t length, void* pDest) = 0;
++            virtual void readData(size_t offset, size_t length, void* pDest) { throw std::runtime_error ( std::string ("Virtual function HardwareBuffer::readData called!") ); }
+             /** Writes data to the buffer from an area of system memory; note that you must
+                 ensure that your buffer is big enough.
+ 		    @param offset The byte offset from the start of the buffer to start writing
+
+--- ogre/OgreMain/include/OgreRenderQueueListener.h	23 Aug 2006 08:18:35 -0000	1.10
++++ ogre/OgreMain/include/OgreRenderQueueListener.h	24 Nov 2007 00:34:52 -0000
+@@ -31,6 +31,8 @@
+ 
+ #include "OgrePrerequisites.h"
+ #include "OgreRenderQueue.h"
++#include <stdexcept>
++
+ 
+ namespace Ogre {
+ 
+@@ -65,7 +67,7 @@
+ 			for this queue group.
+         */
+         virtual void renderQueueStarted(uint8 queueGroupId, const String& invocation, 
+-			bool& skipThisInvocation) = 0;
++			bool& skipThisInvocation) { throw std::runtime_error ( std::string ("Virtual function RenderQueueListener::renderQueueStarted called!") ); }
+ 
+         /** Event raised after a queue group is rendered. 
+         @remarks
+@@ -80,7 +82,7 @@
+ 			events will also be fired for it again.
+         */
+         virtual void renderQueueEnded(uint8 queueGroupId, const String& invocation, 
+-			bool& repeatThisInvocation) = 0;
++			bool& repeatThisInvocation) { throw std::runtime_error ( std::string ("Virtual function RenderQueueListener::renderQueueEnded called!") ); }
+     };
+ 
+ }
+ 

Added: trunk/python-ogre/patch/theoravideo.patch
===================================================================
--- trunk/python-ogre/patch/theoravideo.patch	                        (rev 0)
+++ trunk/python-ogre/patch/theoravideo.patch	2008-06-23 06:26:56 UTC (rev 604)
@@ -0,0 +1,2999 @@
+Index: CEGUI_TheoraDemo/include/SoundManager.h
+===================================================================
+--- CEGUI_TheoraDemo/include/SoundManager.h	(revision 2450)
++++ CEGUI_TheoraDemo/include/SoundManager.h	(working copy)
+@@ -16,14 +16,10 @@
+ 
+ #include "TheoraAudioDriver.h"
+ 
+-namespace CEGUI
+-{
+-	class ProgressBar;
+-}
+ 
+ namespace Ogre
+ {
+-	class SoundManager
++	class _OgreTheoraExport SoundManager
+ 	{
+ 	protected:
+ 		SoundManager() {}
+Index: CEGUI_TheoraDemo/scripts/VC8_GuiTesting.vcproj
+===================================================================
+--- CEGUI_TheoraDemo/scripts/VC8_GuiTesting.vcproj	(revision 2450)
++++ CEGUI_TheoraDemo/scripts/VC8_GuiTesting.vcproj	(working copy)
+@@ -1,256 +1,255 @@
+-<?xml version="1.0" encoding="Windows-1252"?>
+-<VisualStudioProject
+-	ProjectType="Visual C++"
+-	Version="8,00"
+-	Name="GuiTesting"
+-	ProjectGUID="{F71CD603-13C3-4131-9E5B-9FC319C01C51}"
+-	>
+-	<Platforms>
+-		<Platform
+-			Name="Win32"
+-		/>
+-	</Platforms>
+-	<ToolFiles>
+-	</ToolFiles>
+-	<Configurations>
+-		<Configuration
+-			Name="Release|Win32"
+-			OutputDirectory="../obj/Release"
+-			IntermediateDirectory="../obj/Release"
+-			ConfigurationType="1"
+-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+-			UseOfMFC="0"
+-			ATLMinimizesCRunTimeLibraryUsage="false"
+-			CharacterSet="2"
+-			>
+-			<Tool
+-				Name="VCPreBuildEventTool"
+-			/>
+-			<Tool
+-				Name="VCCustomBuildTool"
+-			/>
+-			<Tool
+-				Name="VCXMLDataGeneratorTool"
+-			/>
+-			<Tool
+-				Name="VCWebServiceProxyGeneratorTool"
+-			/>
+-			<Tool
+-				Name="VCMIDLTool"
+-				PreprocessorDefinitions="NDEBUG"
+-				MkTypLibCompatible="true"
+-				SuppressStartupBanner="true"
+-				TargetEnvironment="1"
+-				TypeLibraryName=".\../obj/Release/GuiTesting.tlb"
+-			/>
+-			<Tool
+-				Name="VCCLCompilerTool"
+-				InlineFunctionExpansion="1"
+-				AdditionalIncludeDirectories="..\..\TheoraVideo\include;..\include;..\..\..\..\ogrenew\OgreMain\include;..\..\theora\include;&quot;..\..\ptypes-1.8.3\include&quot;;..\..\..\..\ogrenew\OgreMain\include;..\..\theora\include;&quot;..\..\ptypes-1.8.3\include&quot;;..\..\..\..\ogrenew\Samples\Common\CEGUIRenderer\include;..\..\..\..\ogrenew\Dependencies\include"
+-				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
+-				StringPooling="true"
+-				RuntimeLibrary="2"
+-				EnableFunctionLevelLinking="true"
+-				UsePrecompiledHeader="0"
+-				PrecompiledHeaderFile=".\../obj/Release/GuiTesting.pch"
+-				AssemblerListingLocation=".\../obj/Release/"
+-				ObjectFile=".\../obj/Release/"
+-				ProgramDataBaseFileName=".\../obj/Release/"
+-				BrowseInformation="1"
+-				WarningLevel="3"
+-				SuppressStartupBanner="true"
+-				CompileAs="0"
+-			/>
+-			<Tool
+-				Name="VCManagedResourceCompilerTool"
+-			/>
+-			<Tool
+-				Name="VCResourceCompilerTool"
+-				PreprocessorDefinitions="NDEBUG"
+-				Culture="1033"
+-			/>
+-			<Tool
+-				Name="VCPreLinkEventTool"
+-			/>
+-			<Tool
+-				Name="VCLinkerTool"
+-				AdditionalOptions="/MACHINE:I386"
+-				AdditionalDependencies="odbc32.lib odbccp32.lib CEGUIBase.lib OgreMain.lib OgreGUIRenderer.lib Plugin_TheoraVideoSystem.lib"
+-				OutputFile="../Bin/Release/GuiTesting.exe"
+-				LinkIncremental="1"
+-				SuppressStartupBanner="true"
+-				AdditionalLibraryDirectories="..\..\TheoraVideo\bin\release;..\..\..\..\ogrenew\ogremain\lib\release;..\..\..\..\ogrenew\Dependencies\lib\release;..\..\..\..\ogrenew\Samples\Common\CEGUIRenderer\lib"
+-				ProgramDatabaseFile=".\../obj/Release/GuiTesting.pdb"
+-				SubSystem="2"
+-			/>
+-			<Tool
+-				Name="VCALinkTool"
+-			/>
+-			<Tool
+-				Name="VCManifestTool"
+-			/>
+-			<Tool
+-				Name="VCXDCMakeTool"
+-			/>
+-			<Tool
+-				Name="VCBscMakeTool"
+-			/>
+-			<Tool
+-				Name="VCFxCopTool"
+-			/>
+-			<Tool
+-				Name="VCAppVerifierTool"
+-			/>
+-			<Tool
+-				Name="VCWebDeploymentTool"
+-			/>
+-			<Tool
+-				Name="VCPostBuildEventTool"
+-			/>
+-		</Configuration>
+-		<Configuration
+-			Name="Debug|Win32"
+-			OutputDirectory="../obj/Debug"
+-			IntermediateDirectory="../obj/Debug"
+-			ConfigurationType="1"
+-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+-			UseOfMFC="0"
+-			ATLMinimizesCRunTimeLibraryUsage="false"
+-			CharacterSet="2"
+-			>
+-			<Tool
+-				Name="VCPreBuildEventTool"
+-			/>
+-			<Tool
+-				Name="VCCustomBuildTool"
+-			/>
+-			<Tool
+-				Name="VCXMLDataGeneratorTool"
+-			/>
+-			<Tool
+-				Name="VCWebServiceProxyGeneratorTool"
+-			/>
+-			<Tool
+-				Name="VCMIDLTool"
+-				PreprocessorDefinitions="_DEBUG"
+-				MkTypLibCompatible="true"
+-				SuppressStartupBanner="true"
+-				TargetEnvironment="1"
+-				TypeLibraryName=".\../obj/Debug/GuiTesting.tlb"
+-			/>
+-			<Tool
+-				Name="VCCLCompilerTool"
+-				AdditionalOptions="/Zm200 "
+-				Optimization="0"
+-				AdditionalIncludeDirectories="..\..\TheoraVideo\include;..\include;..\..\..\..\ogrenew\OgreMain\include;..\..\theora\include;&quot;..\..\ptypes-1.8.3\include&quot;;..\..\..\..\ogrenew\Samples\Common\CEGUIRenderer\include;..\..\..\..\ogrenew\Dependencies\include"
+-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_DEBUG"
+-				BasicRuntimeChecks="3"
+-				RuntimeLibrary="3"
+-				UsePrecompiledHeader="0"
+-				PrecompiledHeaderFile=".\../obj/Debug/GuiTesting.pch"
+-				AssemblerListingLocation=".\../obj/Debug/"
+-				ObjectFile=".\../obj/Debug/"
+-				ProgramDataBaseFileName=".\../obj/Debug/"
+-				BrowseInformation="1"
+-				WarningLevel="3"
+-				SuppressStartupBanner="true"
+-				DebugInformationFormat="4"
+-				CompileAs="0"
+-			/>
+-			<Tool
+-				Name="VCManagedResourceCompilerTool"
+-			/>
+-			<Tool
+-				Name="VCResourceCompilerTool"
+-				PreprocessorDefinitions="_DEBUG"
+-				Culture="1033"
+-			/>
+-			<Tool
+-				Name="VCPreLinkEventTool"
+-			/>
+-			<Tool
+-				Name="VCLinkerTool"
+-				AdditionalOptions="/MACHINE:I386"
+-				AdditionalDependencies="odbc32.lib odbccp32.lib CEGUIBase_d.lib OgreMain_d.lib OgreGUIRenderer_d.lib Plugin_TheoraVideoSystem.lib"
+-				OutputFile="../bin/Debug/GuiTesting.exe"
+-				LinkIncremental="2"
+-				SuppressStartupBanner="true"
+-				AdditionalLibraryDirectories="..\..\TheoraVideo\bin\debug;..\..\..\..\ogrenew\ogremain\lib\debug;..\..\..\..\ogrenew\Dependencies\lib\Debug;..\..\..\..\ogrenew\Samples\Common\CEGUIRenderer\lib"
+-				GenerateDebugInformation="true"
+-				ProgramDatabaseFile="../obj/GuiTesting.pdb"
+-				SubSystem="2"
+-			/>
+-			<Tool
+-				Name="VCALinkTool"
+-			/>
+-			<Tool
+-				Name="VCManifestTool"
+-			/>
+-			<Tool
+-				Name="VCXDCMakeTool"
+-			/>
+-			<Tool
+-				Name="VCBscMakeTool"
+-			/>
+-			<Tool
+-				Name="VCFxCopTool"
+-			/>
+-			<Tool
+-				Name="VCAppVerifierTool"
+-			/>
+-			<Tool
+-				Name="VCWebDeploymentTool"
+-			/>
+-			<Tool
+-				Name="VCPostBuildEventTool"
+-			/>
+-		</Configuration>
+-	</Configurations>
+-	<References>
+-	</References>
+-	<Files>
+-		<Filter
+-			Name="Source Files"
+-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+-			>
+-			<File
+-				RelativePath="..\src\MainModule.cpp"
+-				>
+-			</File>
+-			<File
+-				RelativePath="..\src\MovieLogic.cpp"
+-				>
+-			</File>
+-			<File
+-				RelativePath="..\src\SoundManager.cpp"
+-				>
+-			</File>
+-		</Filter>
+-		<Filter
+-			Name="Includes"
+-			>
+-			<File
+-				RelativePath="..\include\ExampleApplication.h"
+-				>
+-			</File>
+-			<File
+-				RelativePath="..\include\ExampleFrameListener.h"
+-				>
+-			</File>
+-			<File
+-				RelativePath="..\include\MainModule.h"
+-				>
+-			</File>
+-			<File
+-				RelativePath="..\include\MovieLogic.h"
+-				>
+-			</File>
+-			<File
+-				RelativePath="..\include\SoundManager.h"
+-				>
+-			</File>
+-		</Filter>
+-	</Files>
+-	<Globals>
+-	</Globals>
+-</VisualStudioProject>
++<?xml version="1.0" encoding="Windows-1252"?>
++<VisualStudioProject
++	ProjectType="Visual C++"
++	Version="9.00"
++	Name="GuiTesting"
++	ProjectGUID="{F71CD603-13C3-4131-9E5B-9FC319C01C51}"
++	TargetFrameworkVersion="131072"
++	>
++	<Platforms>
++		<Platform
++			Name="Win32"
++		/>
++	</Platforms>
++	<ToolFiles>
++	</ToolFiles>
++	<Configurations>
++		<Configuration
++			Name="Release|Win32"
++			OutputDirectory="../obj/Release"
++			IntermediateDirectory="../obj/Release"
++			ConfigurationType="1"
++			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
++			UseOfMFC="0"
++			ATLMinimizesCRunTimeLibraryUsage="false"
++			CharacterSet="2"
++			>
++			<Tool
++				Name="VCPreBuildEventTool"
++			/>
++			<Tool
++				Name="VCCustomBuildTool"
++			/>
++			<Tool
++				Name="VCXMLDataGeneratorTool"
++			/>
++			<Tool
++				Name="VCWebServiceProxyGeneratorTool"
++			/>
++			<Tool
++				Name="VCMIDLTool"
++				PreprocessorDefinitions="NDEBUG"
++				MkTypLibCompatible="true"
++				SuppressStartupBanner="true"
++				TargetEnvironment="1"
++				TypeLibraryName=".\../obj/Release/GuiTesting.tlb"
++			/>
++			<Tool
++				Name="VCCLCompilerTool"
++				InlineFunctionExpansion="1"
++				AdditionalIncludeDirectories="..\..\TheoraVideo\include;..\include;..\..\..\..\ogrenew\OgreMain\include;..\..\theora\include;&quot;..\..\ptypes-1.8.3\include&quot;;..\..\..\..\ogrenew\OgreMain\include;..\..\theora\include;&quot;..\..\ptypes-1.8.3\include&quot;;..\..\..\..\ogrenew\Samples\Common\CEGUIRenderer\include;..\..\..\..\ogrenew\Dependencies\include"
++				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
++				StringPooling="true"
++				RuntimeLibrary="2"
++				EnableFunctionLevelLinking="true"
++				UsePrecompiledHeader="0"
++				PrecompiledHeaderFile=".\../obj/Release/GuiTesting.pch"
++				AssemblerListingLocation=".\../obj/Release/"
++				ObjectFile=".\../obj/Release/"
++				ProgramDataBaseFileName=".\../obj/Release/"
++				BrowseInformation="1"
++				WarningLevel="3"
++				SuppressStartupBanner="true"
++				CompileAs="0"
++			/>
++			<Tool
++				Name="VCManagedResourceCompilerTool"
++			/>
++			<Tool
++				Name="VCResourceCompilerTool"
++				PreprocessorDefinitions="NDEBUG"
++				Culture="1033"
++			/>
++			<Tool
++				Name="VCPreLinkEventTool"
++			/>
++			<Tool
++				Name="VCLinkerTool"
++				AdditionalOptions="/MACHINE:I386"
++				AdditionalDependencies="odbc32.lib odbccp32.lib CEGUIBase.lib OgreMain.lib OgreGUIRenderer.lib Plugin_TheoraVideoSystem.lib"
++				OutputFile="../Bin/Release/GuiTesting.exe"
++				LinkIncremental="1"
++				SuppressStartupBanner="true"
++				AdditionalLibraryDirectories="..\..\TheoraVideo\bin\release;..\..\..\..\ogrenew\ogremain\lib\release;..\..\..\..\ogrenew\Dependencies\lib\release;..\..\..\..\ogrenew\Samples\Common\CEGUIRenderer\lib"
++				ProgramDatabaseFile=".\../obj/Release/GuiTesting.pdb"
++				SubSystem="2"
++				RandomizedBaseAddress="1"
++				DataExecutionPrevention="0"
++			/>
++			<Tool
++				Name="VCALinkTool"
++			/>
++			<Tool
++				Name="VCManifestTool"
++			/>
++			<Tool
++				Name="VCXDCMakeTool"
++			/>
++			<Tool
++				Name="VCBscMakeTool"
++			/>
++			<Tool
++				Name="VCFxCopTool"
++			/>
++			<Tool
++				Name="VCAppVerifierTool"
++			/>
++			<Tool
++				Name="VCPostBuildEventTool"
++			/>
++		</Configuration>
++		<Configuration
++			Name="Debug|Win32"
++			OutputDirectory="../obj/Debug"
++			IntermediateDirectory="../obj/Debug"
++			ConfigurationType="1"
++			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
++			UseOfMFC="0"
++			ATLMinimizesCRunTimeLibraryUsage="false"
++			CharacterSet="2"
++			>
++			<Tool
++				Name="VCPreBuildEventTool"
++			/>
++			<Tool
++				Name="VCCustomBuildTool"
++			/>
++			<Tool
++				Name="VCXMLDataGeneratorTool"
++			/>
++			<Tool
++				Name="VCWebServiceProxyGeneratorTool"
++			/>
++			<Tool
++				Name="VCMIDLTool"
++				PreprocessorDefinitions="_DEBUG"
++				MkTypLibCompatible="true"
++				SuppressStartupBanner="true"
++				TargetEnvironment="1"
++				TypeLibraryName=".\../obj/Debug/GuiTesting.tlb"
++			/>
++			<Tool
++				Name="VCCLCompilerTool"
++				AdditionalOptions="/Zm200 "
++				Optimization="0"
++				AdditionalIncludeDirectories="..\..\TheoraVideo\include;..\include;..\..\..\..\ogrenew\OgreMain\include;..\..\theora\include;&quot;..\..\ptypes-1.8.3\include&quot;;..\..\..\..\ogrenew\Samples\Common\CEGUIRenderer\include;..\..\..\..\ogrenew\Dependencies\include"
++				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_DEBUG"
++				BasicRuntimeChecks="3"
++				RuntimeLibrary="3"
++				UsePrecompiledHeader="0"
++				PrecompiledHeaderFile=".\../obj/Debug/GuiTesting.pch"
++				AssemblerListingLocation=".\../obj/Debug/"
++				ObjectFile=".\../obj/Debug/"
++				ProgramDataBaseFileName=".\../obj/Debug/"
++				BrowseInformation="1"
++				WarningLevel="3"
++				SuppressStartupBanner="true"
++				DebugInformationFormat="4"
++				CompileAs="0"
++			/>
++			<Tool
++				Name="VCManagedResourceCompilerTool"
++			/>
++			<Tool
++				Name="VCResourceCompilerTool"
++				PreprocessorDefinitions="_DEBUG"
++				Culture="1033"
++			/>
++			<Tool
++				Name="VCPreLinkEventTool"
++			/>
++			<Tool
++				Name="VCLinkerTool"
++				AdditionalOptions="/MACHINE:I386"
++				AdditionalDependencies="odbc32.lib odbccp32.lib CEGUIBase_d.lib OgreMain_d.lib OgreGUIRenderer_d.lib Plugin_TheoraVideoSystem.lib"
++				OutputFile="../bin/Debug/GuiTesting.exe"
++				LinkIncremental="2"
++				SuppressStartupBanner="true"
++				AdditionalLibraryDirectories="..\..\TheoraVideo\bin\debug;..\..\..\..\ogrenew\ogremain\lib\debug;..\..\..\..\ogrenew\Dependencies\lib\Debug;..\..\..\..\ogrenew\Samples\Common\CEGUIRenderer\lib"
++				GenerateDebugInformation="true"
++				ProgramDatabaseFile="../obj/GuiTesting.pdb"
++				SubSystem="2"
++				RandomizedBaseAddress="1"
++				DataExecutionPrevention="0"
++			/>
++			<Tool
++				Name="VCALinkTool"
++			/>
++			<Tool
++				Name="VCManifestTool"
++			/>
++			<Tool
++				Name="VCXDCMakeTool"
++			/>
++			<Tool
++				Name="VCBscMakeTool"
++			/>
++			<Tool
++				Name="VCFxCopTool"
++			/>
++			<Tool
++				Name="VCAppVerifierTool"
++			/>
++			<Tool
++				Name="VCPostBuildEventTool"
++			/>
++		</Configuration>
++	</Configurations>
++	<References>
++	</References>
++	<Files>
++		<Filter
++			Name="Source Files"
++			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
++			>
++			<File
++				RelativePath="..\src\MainModule.cpp"
++				>
++			</File>
++			<File
++				RelativePath="..\src\MovieLogic.cpp"
++				>
++			</File>
++			<File
++				RelativePath="..\src\SoundManager.cpp"
++				>
++			</File>
++		</Filter>
++		<Filter
++			Name="Includes"
++			>
++			<File
++				RelativePath="..\include\ExampleApplication.h"
++				>
++			</File>
++			<File
++				RelativePath="..\include\ExampleFrameListener.h"
++				>
++			</File>
++			<File
++				RelativePath="..\include\MainModule.h"
++				>
++			</File>
++			<File
++				RelativePath="..\include\MovieLogic.h"
++				>
++			</File>
++			<File
++				RelativePath="..\include\SoundManager.h"
++				>
++			</File>
++		</Filter>
++	</Files>
++	<Globals>
++	</Globals>
++</VisualStudioProject>
+Index: CEGUI_TheoraDemo/scripts/VC8_FMOD_MOD.vcproj
+===================================================================
+--- CEGUI_TheoraDemo/scripts/VC8_FMOD_MOD.vcproj	(revision 2450)
++++ CEGUI_TheoraDemo/scripts/VC8_FMOD_MOD.vcproj	(working copy)
+@@ -1,204 +1,203 @@
+-<?xml version="1.0" encoding="Windows-1252"?>
+-<VisualStudioProject
+-	ProjectType="Visual C++"
+-	Version="8,00"
+-	Name="AUDIO_Fmod"
+-	ProjectGUID="{74DDB799-AD94-42F2-A99C-B89EA8A01AD9}"
+-	Keyword="Win32Proj"
+-	>
+-	<Platforms>
+-		<Platform
+-			Name="Win32"
+-		/>
+-	</Platforms>
+-	<ToolFiles>
+-	</ToolFiles>
+-	<Configurations>
+-		<Configuration
+-			Name="Debug|Win32"
+-			OutputDirectory="fmoddebug"
+-			IntermediateDirectory="fmoddebug"
+-			ConfigurationType="2"
+-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+-			CharacterSet="2"
+-			>
+-			<Tool
+-				Name="VCPreBuildEventTool"
+-			/>
+-			<Tool
+-				Name="VCCustomBuildTool"
+-			/>
+-			<Tool
+-				Name="VCXMLDataGeneratorTool"
+-			/>
+-			<Tool
+-				Name="VCWebServiceProxyGeneratorTool"
+-			/>
+-			<Tool
+-				Name="VCMIDLTool"
+-			/>
+-			<Tool
+-				Name="VCCLCompilerTool"
+-				Optimization="0"
+-				AdditionalIncludeDirectories="..\..\TheoraVideo\include;..\include;..\..\..\..\ogrenew\OgreMain\include;..\..\theora\include;&quot;..\..\ptypes-1.8.3\include&quot;;..\..\..\..\ogrenew\Samples\Common\CEGUIRenderer\include;..\..\..\..\ogrenew\Dependencies\include"
+-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FMOD_MOD_EXPORTS;_STLP_DEBUG"
+-				MinimalRebuild="true"
+-				BasicRuntimeChecks="3"
+-				RuntimeLibrary="3"
+-				UsePrecompiledHeader="0"
+-				ObjectFile="FmodDebug/"
+-				ProgramDataBaseFileName="FmodDebug/vc70.pdb"
+-				WarningLevel="3"
+-				Detect64BitPortabilityProblems="true"
+-				DebugInformationFormat="4"
+-			/>
+-			<Tool
+-				Name="VCManagedResourceCompilerTool"
+-			/>
+-			<Tool
+-				Name="VCResourceCompilerTool"
+-			/>
+-			<Tool
+-				Name="VCPreLinkEventTool"
+-			/>
+-			<Tool
+-				Name="VCLinkerTool"
+-				AdditionalDependencies="OgreMain_d.lib Plugin_TheoraVideoSystem.lib"
+-				OutputFile="../bin/Debug/FMOD_MOD.dll"
+-				LinkIncremental="2"
+-				AdditionalLibraryDirectories="..\..\TheoraVideo\bin\debug;..\..\..\..\ogrenew\ogremain\lib\debug;..\..\..\..\ogrenew\Dependencies\lib\Debug;..\..\..\..\ogrenew\Samples\Common\CEGUIRenderer\lib"
+-				GenerateDebugInformation="true"
+-				ProgramDatabaseFile="FmodDebug/FMOD_MOD.pdb"
+-				SubSystem="2"
+-				ImportLibrary="FmodDebug/FMOD_MOD.lib"
+-				TargetMachine="1"
+-			/>
+-			<Tool
+-				Name="VCALinkTool"
+-			/>
+-			<Tool
+-				Name="VCManifestTool"
+-			/>
+-			<Tool
+-				Name="VCXDCMakeTool"
+-			/>
+-			<Tool
+-				Name="VCBscMakeTool"
+-			/>
+-			<Tool
+-				Name="VCFxCopTool"
+-			/>
+-			<Tool
+-				Name="VCAppVerifierTool"
+-			/>
+-			<Tool
+-				Name="VCWebDeploymentTool"
+-			/>
+-			<Tool
+-				Name="VCPostBuildEventTool"
+-			/>
+-		</Configuration>
+-		<Configuration
+-			Name="Release|Win32"
+-			OutputDirectory="fmodrelease"
+-			IntermediateDirectory="fmodrelease"
+-			ConfigurationType="2"
+-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+-			CharacterSet="2"
+-			>
+-			<Tool
+-				Name="VCPreBuildEventTool"
+-			/>
+-			<Tool
+-				Name="VCCustomBuildTool"
+-			/>
+-			<Tool
+-				Name="VCXMLDataGeneratorTool"
+-			/>
+-			<Tool
+-				Name="VCWebServiceProxyGeneratorTool"
+-			/>
+-			<Tool
+-				Name="VCMIDLTool"
+-			/>
+-			<Tool
+-				Name="VCCLCompilerTool"
+-				Optimization="2"
+-				InlineFunctionExpansion="1"
+-				OmitFramePointers="true"
+-				AdditionalIncludeDirectories="..\..\TheoraVideo\include;..\include;..\..\..\..\ogrenew\OgreMain\include;..\..\theora\include;&quot;..\..\ptypes-1.8.3\include&quot;;..\..\..\..\ogrenew\Samples\Common\CEGUIRenderer\include;..\..\..\..\ogrenew\Dependencies\include"
+-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FMOD_MOD_EXPORTS"
+-				StringPooling="true"
+-				RuntimeLibrary="2"
+-				EnableFunctionLevelLinking="true"
+-				UsePrecompiledHeader="0"
+-				ObjectFile="FmodRelease/"
+-				ProgramDataBaseFileName="FmodRelease/vc70.pdb"
+-				WarningLevel="3"
+-				Detect64BitPortabilityProblems="true"
+-				DebugInformationFormat="3"
+-			/>
+-			<Tool
+-				Name="VCManagedResourceCompilerTool"
+-			/>
+-			<Tool
+-				Name="VCResourceCompilerTool"
+-			/>
+-			<Tool
+-				Name="VCPreLinkEventTool"
+-			/>
+-			<Tool
+-				Name="VCLinkerTool"
+-				AdditionalDependencies="OgreMain.lib Plugin_TheoraVideoSystem.lib"
+-				OutputFile="../bin/Release/FMOD_MOD.dll"
+-				LinkIncremental="1"
+-				AdditionalLibraryDirectories="..\..\TheoraVideo\bin\release;..\..\..\..\ogrenew\ogremain\lib\release"
+-				GenerateDebugInformation="true"
+-				ProgramDatabaseFile="FmodRelease/$(ProjectName).pdb"
+-				SubSystem="2"
+-				OptimizeReferences="2"
+-				EnableCOMDATFolding="2"
+-				ImportLibrary="FmodRelease/FMOD_MOD.lib"
+-				TargetMachine="1"
+-			/>
+-			<Tool
+-				Name="VCALinkTool"
+-			/>
+-			<Tool
+-				Name="VCManifestTool"
+-			/>
+-			<Tool
+-				Name="VCXDCMakeTool"
+-			/>
+-			<Tool
+-				Name="VCBscMakeTool"
+-			/>
+-			<Tool
+-				Name="VCFxCopTool"
+-			/>
+-			<Tool
+-				Name="VCAppVerifierTool"
+-			/>
+-			<Tool
+-				Name="VCWebDeploymentTool"
+-			/>
+-			<Tool
+-				Name="VCPostBuildEventTool"
+-			/>
+-		</Configuration>
+-	</Configurations>
+-	<References>
+-	</References>
+-	<Files>
+-		<File
+-			RelativePath="..\src\SoundModules\FmodSoundModule.cpp"
+-			>
+-		</File>
+-		<File
+-			RelativePath="..\src\SoundModules\FmodSoundModule.h"
+-			>
+-		</File>
+-	</Files>
+-	<Globals>
+-	</Globals>
+-</VisualStudioProject>
++<?xml version="1.0" encoding="Windows-1252"?>
++<VisualStudioProject
++	ProjectType="Visual C++"
++	Version="9.00"
++	Name="AUDIO_Fmod"
++	ProjectGUID="{74DDB799-AD94-42F2-A99C-B89EA8A01AD9}"
++	Keyword="Win32Proj"
++	TargetFrameworkVersion="131072"
++	>
++	<Platforms>
++		<Platform
++			Name="Win32"
++		/>
++	</Platforms>
++	<ToolFiles>
++	</ToolFiles>
++	<Configurations>
++		<Configuration
++			Name="Debug|Win32"
++			OutputDirectory="fmoddebug"
++			IntermediateDirectory="fmoddebug"
++			ConfigurationType="2"
++			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
++			CharacterSet="2"
++			>
++			<Tool
++				Name="VCPreBuildEventTool"
++			/>
++			<Tool
++				Name="VCCustomBuildTool"
++			/>
++			<Tool
++				Name="VCXMLDataGeneratorTool"
++			/>
++			<Tool
++				Name="VCWebServiceProxyGeneratorTool"
++			/>
++			<Tool
++				Name="VCMIDLTool"
++			/>
++			<Tool
++				Name="VCCLCompilerTool"
++				Optimization="0"
++				AdditionalIncludeDirectories="..\..\TheoraVideo\include;..\include;..\..\..\..\ogrenew\OgreMain\include;..\..\theora\include;&quot;..\..\ptypes-1.8.3\include&quot;;..\..\..\..\ogrenew\Samples\Common\CEGUIRenderer\include;..\..\..\..\ogrenew\Dependencies\include"
++				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FMOD_MOD_EXPORTS;_STLP_DEBUG"
++				MinimalRebuild="true"
++				BasicRuntimeChecks="3"
++				RuntimeLibrary="3"
++				UsePrecompiledHeader="0"
++				ObjectFile="FmodDebug/"
++				ProgramDataBaseFileName="FmodDebug/vc70.pdb"
++				WarningLevel="3"
++				Detect64BitPortabilityProblems="true"
++				DebugInformationFormat="4"
++			/>
++			<Tool
++				Name="VCManagedResourceCompilerTool"
++			/>
++			<Tool
++				Name="VCResourceCompilerTool"
++			/>
++			<Tool
++				Name="VCPreLinkEventTool"
++			/>
++			<Tool
++				Name="VCLinkerTool"
++				AdditionalDependencies="OgreMain_d.lib Plugin_TheoraVideoSystem.lib"
++				OutputFile="../bin/Debug/FMOD_MOD.dll"
++				LinkIncremental="2"
++				AdditionalLibraryDirectories="..\..\TheoraVideo\bin\debug;..\..\..\..\ogrenew\ogremain\lib\debug;..\..\..\..\ogrenew\Dependencies\lib\Debug;..\..\..\..\ogrenew\Samples\Common\CEGUIRenderer\lib"
++				GenerateDebugInformation="true"
++				ProgramDatabaseFile="FmodDebug/FMOD_MOD.pdb"
++				SubSystem="2"
++				RandomizedBaseAddress="1"
++				DataExecutionPrevention="0"
++				ImportLibrary="FmodDebug/FMOD_MOD.lib"
++				TargetMachine="1"
++			/>
++			<Tool
++				Name="VCALinkTool"
++			/>
++			<Tool
++				Name="VCManifestTool"
++			/>
++			<Tool
++				Name="VCXDCMakeTool"
++			/>
++			<Tool
++				Name="VCBscMakeTool"
++			/>
++			<Tool
++				Name="VCFxCopTool"
++			/>
++			<Tool
++				Name="VCAppVerifierTool"
++			/>
++			<Tool
++				Name="VCPostBuildEventTool"
++			/>
++		</Configuration>
++		<Configuration
++			Name="Release|Win32"
++			OutputDirectory="fmodrelease"
++			IntermediateDirectory="fmodrelease"
++			ConfigurationType="2"
++			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
++			CharacterSet="2"
++			>
++			<Tool
++				Name="VCPreBuildEventTool"
++			/>
++			<Tool
++				Name="VCCustomBuildTool"
++			/>
++			<Tool
++				Name="VCXMLDataGeneratorTool"
++			/>
++			<Tool
++				Name="VCWebServiceProxyGeneratorTool"
++			/>
++			<Tool
++				Name="VCMIDLTool"
++			/>
++			<Tool
++				Name="VCCLCompilerTool"
++				Optimization="2"
++				InlineFunctionExpansion="1"
++				OmitFramePointers="true"
++				AdditionalIncludeDirectories="c:\development\vorbis\include;c:\development\ogg\include;&quot;c:\development\FMOD SoundSystem\FMOD Programmers API Win32\api\inc&quot;;..\..\..\..\theora\include;..\..\TheoraVideo\include;..\include;..\..\..\..\ogre\OgreMain\include;&quot;..\..\ptypes-1.8.3\include&quot;;..\..\..\..\ogre\Samples\Common\CEGUIRenderer\include;..\..\..\..\ogre\Dependencies\include"
++				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FMOD_MOD_EXPORTS"
++				StringPooling="true"
++				RuntimeLibrary="2"
++				EnableFunctionLevelLinking="true"
++				UsePrecompiledHeader="0"
++				ObjectFile="FmodRelease/"
++				ProgramDataBaseFileName="FmodRelease/vc70.pdb"
++				WarningLevel="3"
++				Detect64BitPortabilityProblems="true"
++				DebugInformationFormat="3"
++			/>
++			<Tool
++				Name="VCManagedResourceCompilerTool"
++			/>
++			<Tool
++				Name="VCResourceCompilerTool"
++			/>
++			<Tool
++				Name="VCPreLinkEventTool"
++			/>
++			<Tool
++				Name="VCLinkerTool"
++				AdditionalDependencies="OgreMain.lib Plugin_TheoraVideoSystem.lib"
++				OutputFile="../bin/Release/FMOD_MOD.dll"
++				LinkIncremental="1"
++				AdditionalLibraryDirectories="..\..\TheoraVideo\bin\release;..\..\..\..\ogre\lib"
++				GenerateDebugInformation="true"
++				ProgramDatabaseFile="FmodRelease/$(ProjectName).pdb"
++				SubSystem="2"
++				OptimizeReferences="2"
++				EnableCOMDATFolding="2"
++				RandomizedBaseAddress="1"
++				DataExecutionPrevention="0"
++				ImportLibrary="FmodRelease/FMOD_MOD.lib"
++				TargetMachine="1"
++			/>
++			<Tool
++				Name="VCALinkTool"
++			/>
++			<Tool
++				Name="VCManifestTool"
++			/>
++			<Tool
++				Name="VCXDCMakeTool"
++			/>
++			<Tool
++				Name="VCBscMakeTool"
++			/>
++			<Tool
++				Name="VCFxCopTool"
++			/>
++			<Tool
++				Name="VCAppVerifierTool"
++			/>
++			<Tool
++				Name="VCPostBuildEventTool"
++			/>
++		</Configuration>
++	</Configurations>
++	<References>
++	</References>
++	<Files>
++		<File
++			RelativePath="..\src\SoundModules\FmodSoundModule.cpp"
++			>
++		</File>
++		<File
++			RelativePath="..\src\SoundModules\FmodSoundModule.h"
++			>
++		</File>
++	</Files>
++	<Globals>
++	</Globals>
++</VisualStudioProject>
+Index: CEGUI_TheoraDemo/scripts/VC8_OAL_MOD.vcproj
+===================================================================
+--- CEGUI_TheoraDemo/scripts/VC8_OAL_MOD.vcproj	(revision 2450)
++++ CEGUI_TheoraDemo/scripts/VC8_OAL_MOD.vcproj	(working copy)
+@@ -1,204 +1,203 @@
+-<?xml version="1.0" encoding="Windows-1252"?>
+-<VisualStudioProject
+-	ProjectType="Visual C++"
+-	Version="8,00"
+-	Name="AUDIO_OpenAL"
+-	ProjectGUID="{74DDB799-AD94-42F2-A99C-B89EA4A01AD9}"
+-	Keyword="Win32Proj"
+-	>
+-	<Platforms>
+-		<Platform
+-			Name="Win32"
+-		/>
+-	</Platforms>
+-	<ToolFiles>
+-	</ToolFiles>
+-	<Configurations>
+-		<Configuration
+-			Name="Debug|Win32"
+-			OutputDirectory="oaldebug"
+-			IntermediateDirectory="oaldebug"
+-			ConfigurationType="2"
+-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+-			CharacterSet="2"
+-			>
+-			<Tool
+-				Name="VCPreBuildEventTool"
+-			/>
+-			<Tool
+-				Name="VCCustomBuildTool"
+-			/>
+-			<Tool
+-				Name="VCXMLDataGeneratorTool"
+-			/>
+-			<Tool
+-				Name="VCWebServiceProxyGeneratorTool"
+-			/>
+-			<Tool
+-				Name="VCMIDLTool"
+-			/>
+-			<Tool
+-				Name="VCCLCompilerTool"
+-				Optimization="0"
+-				AdditionalIncludeDirectories="..\..\TheoraVideo\include;..\include;..\..\..\..\ogrenew\OgreMain\include;..\..\theora\include;&quot;..\..\ptypes-1.8.3\include&quot;;..\..\..\..\ogrenew\Samples\Common\CEGUIRenderer\include;..\..\..\..\ogrenew\Dependencies\include"
+-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OAL_MOD_EXPORTS;_STLP_DEBUG"
+-				MinimalRebuild="true"
+-				BasicRuntimeChecks="3"
+-				RuntimeLibrary="3"
+-				UsePrecompiledHeader="0"
+-				ObjectFile="oalDebug/"
+-				ProgramDataBaseFileName="oalDebug/vc70.pdb"
+-				WarningLevel="3"
+-				Detect64BitPortabilityProblems="true"
+-				DebugInformationFormat="4"
+-			/>
+-			<Tool
+-				Name="VCManagedResourceCompilerTool"
+-			/>
+-			<Tool
+-				Name="VCResourceCompilerTool"
+-			/>
+-			<Tool
+-				Name="VCPreLinkEventTool"
+-			/>
+-			<Tool
+-				Name="VCLinkerTool"
+-				AdditionalDependencies="OgreMain_d.lib Plugin_TheoraVideoSystem.lib OpenAL32.lib"
+-				OutputFile="../bin/Debug/OAL_MOD.dll"
+-				LinkIncremental="2"
+-				AdditionalLibraryDirectories="..\..\TheoraVideo\bin\debug;..\..\..\..\ogrenew\ogremain\lib\debug;..\..\..\..\ogrenew\Dependencies\lib\Debug;..\..\..\..\ogrenew\Samples\Common\CEGUIRenderer\lib"
+-				GenerateDebugInformation="true"
+-				ProgramDatabaseFile="oalDebug/OAL_MOD.pdb"
+-				SubSystem="2"
+-				ImportLibrary="oalDebug/OAL_MOD.lib"
+-				TargetMachine="1"
+-			/>
+-			<Tool
+-				Name="VCALinkTool"
+-			/>
+-			<Tool
+-				Name="VCManifestTool"
+-			/>
+-			<Tool
+-				Name="VCXDCMakeTool"
+-			/>
+-			<Tool
+-				Name="VCBscMakeTool"
+-			/>
+-			<Tool
+-				Name="VCFxCopTool"
+-			/>
+-			<Tool
+-				Name="VCAppVerifierTool"
+-			/>
+-			<Tool
+-				Name="VCWebDeploymentTool"
+-			/>
+-			<Tool
+-				Name="VCPostBuildEventTool"
+-			/>
+-		</Configuration>
+-		<Configuration
+-			Name="Release|Win32"
+-			OutputDirectory="oalrelease"
+-			IntermediateDirectory="oalrelease"
+-			ConfigurationType="2"
+-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+-			CharacterSet="2"
+-			>
+-			<Tool
+-				Name="VCPreBuildEventTool"
+-			/>
+-			<Tool
+-				Name="VCCustomBuildTool"
+-			/>
+-			<Tool
+-				Name="VCXMLDataGeneratorTool"
+-			/>
+-			<Tool
+-				Name="VCWebServiceProxyGeneratorTool"
+-			/>
+-			<Tool
+-				Name="VCMIDLTool"
+-			/>
+-			<Tool
+-				Name="VCCLCompilerTool"
+-				Optimization="2"
+-				InlineFunctionExpansion="1"
+-				OmitFramePointers="true"
+-				AdditionalIncludeDirectories="..\..\TheoraVideo\include;..\include;..\..\..\..\ogrenew\OgreMain\include;..\..\theora\include;&quot;..\..\ptypes-1.8.3\include&quot;;..\..\..\..\ogrenew\Samples\Common\CEGUIRenderer\include;..\..\..\..\ogrenew\Dependencies\include"
+-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OAL_MOD_EXPORTS"
+-				StringPooling="true"
+-				RuntimeLibrary="2"
+-				EnableFunctionLevelLinking="true"
+-				UsePrecompiledHeader="0"
+-				ObjectFile="oalRelease/"
+-				ProgramDataBaseFileName="oalRelease/vc70.pdb"
+-				WarningLevel="3"
+-				Detect64BitPortabilityProblems="true"
+-				DebugInformationFormat="3"
+-			/>
+-			<Tool
+-				Name="VCManagedResourceCompilerTool"
+-			/>
+-			<Tool
+-				Name="VCResourceCompilerTool"
+-			/>
+-			<Tool
+-				Name="VCPreLinkEventTool"
+-			/>
+-			<Tool
+-				Name="VCLinkerTool"
+-				AdditionalDependencies="OgreMain.lib Plugin_TheoraVideoSystem.lib OpenAL32.lib"
+-				OutputFile="../bin/Release/OAL_MOD.dll"
+-				LinkIncremental="1"
+-				AdditionalLibraryDirectories="..\..\TheoraVideo\bin\release;..\..\..\..\ogrenew\ogremain\lib\release"
+-				GenerateDebugInformation="true"
+-				ProgramDatabaseFile="oalRelease/$(ProjectName).pdb"
+-				SubSystem="2"
+-				OptimizeReferences="2"
+-				EnableCOMDATFolding="2"
+-				ImportLibrary="oalRelease/OAL_MOD.lib"
+-				TargetMachine="1"
+-			/>
+-			<Tool
+-				Name="VCALinkTool"
+-			/>
+-			<Tool
+-				Name="VCManifestTool"
+-			/>
+-			<Tool
+-				Name="VCXDCMakeTool"
+-			/>
+-			<Tool
+-				Name="VCBscMakeTool"
+-			/>
+-			<Tool
+-				Name="VCFxCopTool"
+-			/>
+-			<Tool
+-				Name="VCAppVerifierTool"
+-			/>
+-			<Tool
+-				Name="VCWebDeploymentTool"
+-			/>
+-			<Tool
+-				Name="VCPostBuildEventTool"
+-			/>
+-		</Configuration>
+-	</Configurations>
+-	<References>
+-	</References>
+-	<Files>
+-		<File
+-			RelativePath="..\src\SoundModules\OpenALSoundIO.cpp"
+-			>
+-		</File>
+-		<File
+-			RelativePath="..\src\SoundModules\OpenALSoundIO.h"
+-			>
+-		</File>
+-	</Files>
+-	<Globals>
+-	</Globals>
+-</VisualStudioProject>
++<?xml version="1.0" encoding="Windows-1252"?>
++<VisualStudioProject
++	ProjectType="Visual C++"
++	Version="9.00"
++	Name="AUDIO_OpenAL"
++	ProjectGUID="{74DDB799-AD94-42F2-A99C-B89EA4A01AD9}"
++	Keyword="Win32Proj"
++	TargetFrameworkVersion="131072"
++	>
++	<Platforms>
++		<Platform
++			Name="Win32"
++		/>
++	</Platforms>
++	<ToolFiles>
++	</ToolFiles>
++	<Configurations>
++		<Configuration
++			Name="Debug|Win32"
++			OutputDirectory="oaldebug"
++			IntermediateDirectory="oaldebug"
++			ConfigurationType="2"
++			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
++			CharacterSet="2"
++			>
++			<Tool
++				Name="VCPreBuildEventTool"
++			/>
++			<Tool
++				Name="VCCustomBuildTool"
++			/>
++			<Tool
++				Name="VCXMLDataGeneratorTool"
++			/>
++			<Tool
++				Name="VCWebServiceProxyGeneratorTool"
++			/>
++			<Tool
++				Name="VCMIDLTool"
++			/>
++			<Tool
++				Name="VCCLCompilerTool"
++				Optimization="0"
++				AdditionalIncludeDirectories="..\..\TheoraVideo\include;..\include;..\..\..\..\ogrenew\OgreMain\include;..\..\theora\include;&quot;..\..\ptypes-1.8.3\include&quot;;..\..\..\..\ogrenew\Samples\Common\CEGUIRenderer\include;..\..\..\..\ogrenew\Dependencies\include"
++				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OAL_MOD_EXPORTS;_STLP_DEBUG"
++				MinimalRebuild="true"
++				BasicRuntimeChecks="3"
++				RuntimeLibrary="3"
++				UsePrecompiledHeader="0"
++				ObjectFile="oalDebug/"
++				ProgramDataBaseFileName="oalDebug/vc70.pdb"
++				WarningLevel="3"
++				Detect64BitPortabilityProblems="true"
++				DebugInformationFormat="4"
++			/>
++			<Tool
++				Name="VCManagedResourceCompilerTool"
++			/>
++			<Tool
++				Name="VCResourceCompilerTool"
++			/>
++			<Tool
++				Name="VCPreLinkEventTool"
++			/>
++			<Tool
++				Name="VCLinkerTool"
++				AdditionalDependencies="OgreMain_d.lib Plugin_TheoraVideoSystem.lib OpenAL32.lib"
++				OutputFile="../bin/Debug/OAL_MOD.dll"
++				LinkIncremental="2"
++				AdditionalLibraryDirectories="..\..\TheoraVideo\bin\debug;..\..\..\..\ogrenew\ogremain\lib\debug;..\..\..\..\ogrenew\Dependencies\lib\Debug;..\..\..\..\ogrenew\Samples\Common\CEGUIRenderer\lib"
++				GenerateDebugInformation="true"
++				ProgramDatabaseFile="oalDebug/OAL_MOD.pdb"
++				SubSystem="2"
++				RandomizedBaseAddress="1"
++				DataExecutionPrevention="0"
++				ImportLibrary="oalDebug/OAL_MOD.lib"
++				TargetMachine="1"
++			/>
++			<Tool
++				Name="VCALinkTool"
++			/>
++			<Tool
++				Name="VCManifestTool"
++			/>
++			<Tool
++				Name="VCXDCMakeTool"
++			/>
++			<Tool
++				Name="VCBscMakeTool"
++			/>
++			<Tool
++				Name="VCFxCopTool"
++			/>
++			<Tool
++				Name="VCAppVerifierTool"
++			/>
++			<Tool
++				Name="VCPostBuildEventTool"
++			/>
++		</Configuration>
++		<Configuration
++			Name="Release|Win32"
++			OutputDirectory="oalrelease"
++			IntermediateDirectory="oalrelease"
++			ConfigurationType="2"
++			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
++			CharacterSet="2"
++			>
++			<Tool
++				Name="VCPreBuildEventTool"
++			/>
++			<Tool
++				Name="VCCustomBuildTool"
++			/>
++			<Tool
++				Name="VCXMLDataGeneratorTool"
++			/>
++			<Tool
++				Name="VCWebServiceProxyGeneratorTool"
++			/>
++			<Tool
++				Name="VCMIDLTool"
++			/>
++			<Tool
++				Name="VCCLCompilerTool"
++				Optimization="2"
++				InlineFunctionExpansion="1"
++				OmitFramePointers="true"
++				AdditionalIncludeDirectories="\development\openal\include;\development\vorbis\include;\development\ogg\include;..\..\TheoraVideo\include;..\include;..\..\..\..\ogre\OgreMain\include;..\..\..\..\theora\include;&quot;..\..\ptypes-1.8.3\include&quot;;..\..\..\..\ogre\Samples\Common\CEGUIRenderer\include;..\..\..\..\ogre\Dependencies\include"
++				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OAL_MOD_EXPORTS"
++				StringPooling="true"
++				RuntimeLibrary="2"
++				EnableFunctionLevelLinking="true"
++				UsePrecompiledHeader="0"
++				ObjectFile="oalRelease/"
++				ProgramDataBaseFileName="oalRelease/vc70.pdb"
++				WarningLevel="3"
++				Detect64BitPortabilityProblems="true"
++				DebugInformationFormat="3"
++			/>
++			<Tool
++				Name="VCManagedResourceCompilerTool"
++			/>
++			<Tool
++				Name="VCResourceCompilerTool"
++			/>
++			<Tool
++				Name="VCPreLinkEventTool"
++			/>
++			<Tool
++				Name="VCLinkerTool"
++				AdditionalDependencies="OgreMain.lib Plugin_TheoraVideoSystem.lib OpenAL32.lib"
++				OutputFile="../bin/Release/OAL_MOD.dll"
++				LinkIncremental="1"
++				AdditionalLibraryDirectories="c:\development\openal\libs\Win32;..\..\TheoraVideo\bin\release;..\..\..\..\ogre\lib\"
++				GenerateDebugInformation="true"
++				ProgramDatabaseFile="oalRelease/$(ProjectName).pdb"
++				SubSystem="2"
++				OptimizeReferences="2"
++				EnableCOMDATFolding="2"
++				RandomizedBaseAddress="1"
++				DataExecutionPrevention="0"
++				ImportLibrary="oalRelease/OAL_MOD.lib"
++				TargetMachine="1"
++			/>
++			<Tool
++				Name="VCALinkTool"
++			/>
++			<Tool
++				Name="VCManifestTool"
++			/>
++			<Tool
++				Name="VCXDCMakeTool"
++			/>
++			<Tool
++				Name="VCBscMakeTool"
++			/>
++			<Tool
++				Name="VCFxCopTool"
++			/>
++			<Tool
++				Name="VCAppVerifierTool"
++			/>
++			<Tool
++				Name="VCPostBuildEventTool"
++			/>
++		</Configuration>
++	</Configurations>
++	<References>
++	</References>
++	<Files>
++		<File
++			RelativePath="..\src\SoundModules\OpenALSoundIO.cpp"
++			>
++		</File>
++		<File
++			RelativePath="..\src\SoundModules\OpenALSoundIO.h"
++			>
++		</File>
++	</Files>
++	<Globals>
++	</Globals>
++</VisualStudioProject>
+Index: CEGUI_TheoraDemo/src/SoundModules/OpenALSoundIO.cpp
+===================================================================
+--- CEGUI_TheoraDemo/src/SoundModules/OpenALSoundIO.cpp	(revision 2450)
++++ CEGUI_TheoraDemo/src/SoundModules/OpenALSoundIO.cpp	(working copy)
+@@ -3,7 +3,7 @@
+ #include "OgreRoot.h"
+ #include "OgreTimer.h"
+ #include "OgreLogManager.h"
+-#include "OgrePlatformManager.h"
++//#include "OgrePlatformManager.h"
+ #include "OgreRoot.h"
+ 
+ using namespace Ogre;
+@@ -39,7 +39,7 @@
+ //-----------------------------------------------------------------------//
+ void OpenALSoundManager::start()
+ {
+-	mSoundDevice = alcOpenDevice((ALCubyte*)"DirectSound3D");
++	mSoundDevice = alcOpenDevice((ALCchar*)"DirectSound3D");
+ 	mSoundContext = alcCreateContext(mSoundDevice, NULL);
+ 	alcMakeContextCurrent( mSoundContext );
+ }
+@@ -59,14 +59,14 @@
+ 	pauseTimeAdjustmentStop = 0;
+ 	pauseTimeAdjustmentTotal = 0;
+ 
+-	mTimer = Ogre::PlatformManager::getSingleton().createTimer();
++	mTimer = new Ogre::Timer();
+ }
+ 
+ 
+ //-----------------------------------------------------------------------//
+ AudioClip::~AudioClip()
+ {
+-	Ogre::PlatformManager::getSingleton().destroyTimer( mTimer );
++	delete mTimer;
+ 	delete [] mAudioBuffer;
+ }
+ 
+Index: CEGUI_TheoraDemo/src/SoundModules/FmodSoundModule.h
+===================================================================
+--- CEGUI_TheoraDemo/src/SoundModules/FmodSoundModule.h	(revision 2450)
++++ CEGUI_TheoraDemo/src/SoundModules/FmodSoundModule.h	(working copy)
+@@ -13,7 +13,7 @@
+ LGPL like the rest of the engine.
+ -----------------------------------------------------------------------------
+ */
+-#include "fmoddyn.h"
++#include "fmod.h"
+ #include "SoundManager.h"
+ 
+ #if defined(_WINDOWS) || defined(WIN32)
+Index: TheoraVideo/scripts/VC8_TheoraVideo.sln
+===================================================================
+--- TheoraVideo/scripts/VC8_TheoraVideo.sln	(revision 2450)
++++ TheoraVideo/scripts/VC8_TheoraVideo.sln	(working copy)
+@@ -1,56 +1,48 @@
+-Microsoft Visual Studio Solution File, Format Version 9.00
+-# Visual C++ Express 2005
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTypes_Lib", "..\..\ptypes-1.8.3\win32\VC8_PTypes_Lib.vcproj", "{8D0E0535-B27C-42D9-83AA-9A0FDBB53C1E}"
+-EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TheoraVideo", "VC8_TheoraVideo.vcproj", "{388E4B0F-0860-40C7-8530-FD6F79E7AB3E}"
+-	ProjectSection(ProjectDependencies) = postProject
+-		{33AD57E0-0222-4F53-9BF6-44DA1B6D8B8A} = {33AD57E0-0222-4F53-9BF6-44DA1B6D8B8A}
+-		{8D0E0535-B27C-42D9-83AA-9A0FDBB53C1E} = {8D0E0535-B27C-42D9-83AA-9A0FDBB53C1E}
+-	EndProjectSection
+-EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "theora_static", "..\..\theora\win32\VC8_theora_static.vcproj", "{33AD57E0-0222-4F53-9BF6-44DA1B6D8B8A}"
+-EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GuiTesting", "..\..\CEGUI_TheoraDemo\scripts\VC8_GuiTesting.vcproj", "{F71CD603-13C3-4131-9E5B-9FC319C01C51}"
+-	ProjectSection(ProjectDependencies) = postProject
+-		{388E4B0F-0860-40C7-8530-FD6F79E7AB3E} = {388E4B0F-0860-40C7-8530-FD6F79E7AB3E}
+-	EndProjectSection
+-EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AUDIO_OpenAL", "..\..\CEGUI_TheoraDemo\scripts\VC8_OAL_MOD.vcproj", "{74DDB799-AD94-42F2-A99C-B89EA4A01AD9}"
+-EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AUDIO_Fmod", "..\..\CEGUI_TheoraDemo\scripts\VC8_FMOD_MOD.vcproj", "{74DDB799-AD94-42F2-A99C-B89EA8A01AD9}"
+-EndProject
+-Global
+-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+-		Debug|Win32 = Debug|Win32
+-		Release|Win32 = Release|Win32
+-	EndGlobalSection
+-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+-		{8D0E0535-B27C-42D9-83AA-9A0FDBB53C1E}.Debug|Win32.ActiveCfg = Debug|Win32
+-		{8D0E0535-B27C-42D9-83AA-9A0FDBB53C1E}.Debug|Win32.Build.0 = Debug|Win32
+-		{8D0E0535-B27C-42D9-83AA-9A0FDBB53C1E}.Release|Win32.ActiveCfg = Release|Win32
+-		{8D0E0535-B27C-42D9-83AA-9A0FDBB53C1E}.Release|Win32.Build.0 = Release|Win32
+-		{388E4B0F-0860-40C7-8530-FD6F79E7AB3E}.Debug|Win32.ActiveCfg = Debug|Win32
+-		{388E4B0F-0860-40C7-8530-FD6F79E7AB3E}.Debug|Win32.Build.0 = Debug|Win32
+-		{388E4B0F-0860-40C7-8530-FD6F79E7AB3E}.Release|Win32.ActiveCfg = Release|Win32
+-		{388E4B0F-0860-40C7-8530-FD6F79E7AB3E}.Release|Win32.Build.0 = Release|Win32
+-		{33AD57E0-0222-4F53-9BF6-44DA1B6D8B8A}.Debug|Win32.ActiveCfg = Debug|Win32
+-		{33AD57E0-0222-4F53-9BF6-44DA1B6D8B8A}.Debug|Win32.Build.0 = Debug|Win32
+-		{33AD57E0-0222-4F53-9BF6-44DA1B6D8B8A}.Release|Win32.ActiveCfg = Release|Win32
+-		{33AD57E0-0222-4F53-9BF6-44DA1B6D8B8A}.Release|Win32.Build.0 = Release|Win32
+-		{F71CD603-13C3-4131-9E5B-9FC319C01C51}.Debug|Win32.ActiveCfg = Debug|Win32
+-		{F71CD603-13C3-4131-9E5B-9FC319C01C51}.Debug|Win32.Build.0 = Debug|Win32
+-		{F71CD603-13C3-4131-9E5B-9FC319C01C51}.Release|Win32.ActiveCfg = Release|Win32
+-		{F71CD603-13C3-4131-9E5B-9FC319C01C51}.Release|Win32.Build.0 = Release|Win32
+-		{74DDB799-AD94-42F2-A99C-B89EA4A01AD9}.Debug|Win32.ActiveCfg = Debug|Win32
+-		{74DDB799-AD94-42F2-A99C-B89EA4A01AD9}.Debug|Win32.Build.0 = Debug|Win32
+-		{74DDB799-AD94-42F2-A99C-B89EA4A01AD9}.Release|Win32.ActiveCfg = Release|Win32
+-		{74DDB799-AD94-42F2-A99C-B89EA4A01AD9}.Release|Win32.Build.0 = Release|Win32
+-		{74DDB799-AD94-42F2-A99C-B89EA8A01AD9}.Debug|Win32.ActiveCfg = Debug|Win32
+-		{74DDB799-AD94-42F2-A99C-B89EA8A01AD9}.Debug|Win32.Build.0 = Debug|Win32
+-		{74DDB799-AD94-42F2-A99C-B89EA8A01AD9}.Release|Win32.ActiveCfg = Release|Win32
+-		{74DDB799-AD94-42F2-A99C-B89EA8A01AD9}.Release|Win32.Build.0 = Release|Win32
+-	EndGlobalSection
+-	GlobalSection(SolutionProperties) = preSolution
+-		HideSolutionNode = FALSE
+-	EndGlobalSection
+-EndGlobal
++Microsoft Visual Studio Solution File, Format Version 10.00
++# Visual C++ Express 2008
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTypes_Lib", "..\..\ptypes-1.8.3\win32\VC8_PTypes_Lib.vcproj", "{8D0E0535-B27C-42D9-83AA-9A0FDBB53C1E}"
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TheoraVideo", "VC8_TheoraVideo.vcproj", "{388E4B0F-0860-40C7-8530-FD6F79E7AB3E}"
++	ProjectSection(ProjectDependencies) = postProject
++		{8D0E0535-B27C-42D9-83AA-9A0FDBB53C1E} = {8D0E0535-B27C-42D9-83AA-9A0FDBB53C1E}
++	EndProjectSection
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GuiTesting", "..\..\CEGUI_TheoraDemo\scripts\VC8_GuiTesting.vcproj", "{F71CD603-13C3-4131-9E5B-9FC319C01C51}"
++	ProjectSection(ProjectDependencies) = postProject
++		{388E4B0F-0860-40C7-8530-FD6F79E7AB3E} = {388E4B0F-0860-40C7-8530-FD6F79E7AB3E}
++	EndProjectSection
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AUDIO_OpenAL", "..\..\CEGUI_TheoraDemo\scripts\VC8_OAL_MOD.vcproj", "{74DDB799-AD94-42F2-A99C-B89EA4A01AD9}"
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AUDIO_Fmod", "..\..\CEGUI_TheoraDemo\scripts\VC8_FMOD_MOD.vcproj", "{74DDB799-AD94-42F2-A99C-B89EA8A01AD9}"
++EndProject
++Global
++	GlobalSection(SolutionConfigurationPlatforms) = preSolution
++		Debug|Win32 = Debug|Win32
++		Release|Win32 = Release|Win32
++	EndGlobalSection
++	GlobalSection(ProjectConfigurationPlatforms) = postSolution
++		{8D0E0535-B27C-42D9-83AA-9A0FDBB53C1E}.Debug|Win32.ActiveCfg = Debug|Win32
++		{8D0E0535-B27C-42D9-83AA-9A0FDBB53C1E}.Debug|Win32.Build.0 = Debug|Win32
++		{8D0E0535-B27C-42D9-83AA-9A0FDBB53C1E}.Release|Win32.ActiveCfg = Release|Win32
++		{8D0E0535-B27C-42D9-83AA-9A0FDBB53C1E}.Release|Win32.Build.0 = Release|Win32
++		{388E4B0F-0860-40C7-8530-FD6F79E7AB3E}.Debug|Win32.ActiveCfg = Debug|Win32
++		{388E4B0F-0860-40C7-8530-FD6F79E7AB3E}.Debug|Win32.Build.0 = Debug|Win32
++		{388E4B0F-0860-40C7-8530-FD6F79E7AB3E}.Release|Win32.ActiveCfg = Release|Win32
++		{388E4B0F-0860-40C7-8530-FD6F79E7AB3E}.Release|Win32.Build.0 = Release|Win32
++		{F71CD603-13C3-4131-9E5B-9FC319C01C51}.Debug|Win32.ActiveCfg = Debug|Win32
++		{F71CD603-13C3-4131-9E5B-9FC319C01C51}.Debug|Win32.Build.0 = Debug|Win32
++		{F71CD603-13C3-4131-9E5B-9FC319C01C51}.Release|Win32.ActiveCfg = Release|Win32
++		{74DDB799-AD94-42F2-A99C-B89EA4A01AD9}.Debug|Win32.ActiveCfg = Debug|Win32
++		{74DDB799-AD94-42F2-A99C-B89EA4A01AD9}.Debug|Win32.Build.0 = Debug|Win32
++		{74DDB799-AD94-42F2-A99C-B89EA4A01AD9}.Release|Win32.ActiveCfg = Release|Win32
++		{74DDB799-AD94-42F2-A99C-B89EA4A01AD9}.Release|Win32.Build.0 = Release|Win32
++		{74DDB799-AD94-42F2-A99C-B89EA8A01AD9}.Debug|Win32.ActiveCfg = Debug|Win32
++		{74DDB799-AD94-42F2-A99C-B89EA8A01AD9}.Debug|Win32.Build.0 = Debug|Win32
++		{74DDB799-AD94-42F2-A99C-B89EA8A01AD9}.Release|Win32.ActiveCfg = Release|Win32
++		{74DDB799-AD94-42F2-A99C-B89EA8A01AD9}.Release|Win32.Build.0 = Release|Win32
++	EndGlobalSection
++	GlobalSection(SolutionProperties) = preSolution
++		HideSolutionNode = FALSE
++	EndGlobalSection
++EndGlobal
+Index: TheoraVideo/scripts/VC8_TheoraVideo.vcproj
+===================================================================
+--- TheoraVideo/scripts/VC8_TheoraVideo.vcproj	(revision 2450)
++++ TheoraVideo/scripts/VC8_TheoraVideo.vcproj	(working copy)
+@@ -1,296 +1,303 @@
+-<?xml version="1.0" encoding="Windows-1252"?>
+-<VisualStudioProject
+-	ProjectType="Visual C++"
+-	Version="8,00"
+-	Name="TheoraVideo"
+-	ProjectGUID="{388E4B0F-0860-40C7-8530-FD6F79E7AB3E}"
+-	>
+-	<Platforms>
+-		<Platform
+-			Name="Win32"
+-		/>
+-	</Platforms>
+-	<ToolFiles>
+-	</ToolFiles>
+-	<Configurations>
+-		<Configuration
+-			Name="Debug|Win32"
+-			OutputDirectory=".\..\bin\Debug"
+-			IntermediateDirectory=".\..\obj\Debug"
+-			ConfigurationType="2"
+-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+-			UseOfMFC="0"
+-			ATLMinimizesCRunTimeLibraryUsage="false"
+-			CharacterSet="2"
+-			>
+-			<Tool
+-				Name="VCPreBuildEventTool"
+-				CommandLine="mkdir ..\..\ptypes-1.8.3\include\ptypes,&#x0D;&#x0A;copy ..\..\ptypes-1.8.3\include\*.h ..\..\ptypes-1.8.3\include\ptypes&#x0D;&#x0A;"
+-			/>
+-			<Tool
+-				Name="VCCustomBuildTool"
+-			/>
+-			<Tool
+-				Name="VCXMLDataGeneratorTool"
+-			/>
+-			<Tool
+-				Name="VCWebServiceProxyGeneratorTool"
+-			/>
+-			<Tool
+-				Name="VCMIDLTool"
+-				PreprocessorDefinitions="_DEBUG"
+-				MkTypLibCompatible="true"
+-				SuppressStartupBanner="true"
+-				TargetEnvironment="1"
+-				TypeLibraryName=".\..\bin\Debug/TheoraVideo.tlb"
+-			/>
+-			<Tool
+-				Name="VCCLCompilerTool"
+-				Optimization="0"
+-				AdditionalIncludeDirectories="..\include\;..\..\..\..\ogrenew\OgreMain\include;..\..\theora\include;&quot;..\..\ptypes-1.8.3\include&quot;"
+-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;THEORAVIDEO_PLUGIN_EXPORTS;_STLP_DEBUG"
+-				BasicRuntimeChecks="3"
+-				RuntimeLibrary="3"
+-				PrecompiledHeaderFile=".\..\obj\Debug/TheoraVideo.pch"
+-				AssemblerListingLocation=".\..\obj\Debug/"
+-				ObjectFile=".\..\obj\Debug/"
+-				ProgramDataBaseFileName=".\..\obj\Debug/"
+-				BrowseInformation="1"
+-				WarningLevel="3"
+-				SuppressStartupBanner="true"
+-				DebugInformationFormat="4"
+-				CompileAs="0"
+-			/>
+-			<Tool
+-				Name="VCManagedResourceCompilerTool"
+-			/>
+-			<Tool
+-				Name="VCResourceCompilerTool"
+-				PreprocessorDefinitions="_DEBUG"
+-				Culture="1033"
+-			/>
+-			<Tool
+-				Name="VCPreLinkEventTool"
+-			/>
+-			<Tool
+-				Name="VCLinkerTool"
+-				AdditionalOptions="/MACHINE:I386"
+-				AdditionalDependencies="odbc32.lib odbccp32.lib ogremain_d.lib ptypes.lib theora_static_d.lib ogg_static_d.lib vorbis_static_d.lib"
+-				OutputFile="..\bin\debug/Plugin_TheoraVideoSystem.dll"
+-				LinkIncremental="2"
+-				SuppressStartupBanner="true"
+-				AdditionalLibraryDirectories="..\..\..\..\ogrenew\lib;&quot;../../ptypes-1.8.3/Win32/Debug&quot;;../../theora/win32/Static_Debug"
+-				ModuleDefinitionFile="..\misc\TheoraVideoPlugin.def"
+-				GenerateDebugInformation="true"
+-				ProgramDatabaseFile=".\..\bin\Debug/Plugin_TheoraVideoSystem.pdb"
+-				ImportLibrary=".\..\bin\Debug/Plugin_TheoraVideoSystem.lib"
+-			/>
+-			<Tool
+-				Name="VCALinkTool"
+-			/>
+-			<Tool
+-				Name="VCManifestTool"
+-			/>
+-			<Tool
+-				Name="VCXDCMakeTool"
+-			/>
+-			<Tool
+-				Name="VCBscMakeTool"
+-			/>
+-			<Tool
+-				Name="VCFxCopTool"
+-			/>
+-			<Tool
+-				Name="VCAppVerifierTool...
 
[truncated message content]