[xiph-commits] r8544 - in trunk/oggdsf/src:
lib/codecs/cmml/dsfCMMLDecoder
lib/codecs/cmml/dsfCMMLRawSource lib/codecs/cmml/libCMMLTags
lib/codecs/cmml/libCMMLTagsDotNET
lib/codecs/cmml/libWinCMMLParse lib/player/libDSPlayDotNET
lib/plugin/axAnxOggPlayer tests/testCMMLParser
ozone at motherfish-iii.xiph.org
ozone at motherfish-iii.xiph.org
Tue Dec 28 17:40:23 PST 2004
Author: ozone
Date: 2004-12-28 17:40:23 -0800 (Tue, 28 Dec 2004)
New Revision: 8544
Modified:
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/ICMMLCallbacks.h
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.vcproj
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.h
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/dsfCMMLRawSource.vcproj
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HeadTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TextFieldTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/cpp_lib_cmml.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.vcproj
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/AnchorTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/BaseTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLDoc.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLPreamble.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLRootTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/DescTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HeadTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HumReadCMMLTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImageTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/StreamTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TextFieldTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TitleTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/libCMMLTagsDotNET.vcproj
trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.cpp
trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.h
trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/libWinCMMLParse.cpp
trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/libWinCMMLParse.vcproj
trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/stdafx.h
trunk/oggdsf/src/lib/player/libDSPlayDotNET/libDSPlayDotNET.vcproj
trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayer.vcproj
trunk/oggdsf/src/tests/testCMMLParser/testCMMLParser.cpp
trunk/oggdsf/src/tests/testCMMLParser/testCMMLParser.vcproj
Log:
oggdsf:
* Change #including libCMMLTag and libWinCMMLParse libraries to include library name (i.e. #include "CMMLParser.h" -> #include <libWinCMMLParse/CMMLParser.h>)
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -37,9 +37,9 @@
#include <string>
#include <fstream>
#include <libilliCore/StringHelper.h>
-#include "libWinCMMLParse.h"
-#include "CMMLParser.h"
-#include "libCMMLTags.h"
+#include <libWinCMMLParse/libWinCMMLParse.h>
+#include <libWinCMMLParse/CMMLParser.h>
+#include <libCMMLTags/libCMMLTags.h>
#include "ICMMLAppControl.h"
using namespace std;
class CMMLDecodeFilter
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/ICMMLCallbacks.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/ICMMLCallbacks.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/ICMMLCallbacks.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -33,7 +33,7 @@
//===========================================================================
#pragma once
-#include "libCMMLTags.h"
+#include <libCMMLTags/libCMMLTags.h>
class ICMMLCallbacks
{
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.vcproj 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.vcproj 2004-12-29 01:40:23 UTC (rev 8544)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\libCMMLTags;..\libWinCMMLParse;..\..\..\helper"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..;..;..\..\..\helper"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFCMMLDECODER_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -80,7 +80,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="2"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\libCMMLTags;..\libWinCMMLParse;..\..\..\helper"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..;..;..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFCMMLDECODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -143,7 +143,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\libCMMLTags;..\libWinCMMLParse;..\..\..\helper"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..;..;..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFCMMLDECODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -207,7 +207,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\libCMMLTags;..\libWinCMMLParse;..\..\..\helper"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..;..;..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFCMMLDECODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -1,8 +1,8 @@
#pragma once
#include <string>
-#include "libWinCMMLParse.h"
-#include "CMMLParser.h"
+#include <libWinCMMLParse/libWinCMMLParse.h>
+#include <libWinCMMLParse/CMMLParser.h>
#include "CMMLRawSourcePin.h"
using namespace std;
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/dsfCMMLRawSource.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/dsfCMMLRawSource.vcproj 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/dsfCMMLRawSource.vcproj 2004-12-29 01:40:23 UTC (rev 8544)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\helper;..\..\cmml\libWinCMMLParse;..\..\cmml\libCMMLTags"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\helper;..\..\cmml;..\..\cmml"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFCMMLRAWSOURCE_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -72,7 +72,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\helper;..\..\cmml\libWinCMMLParse;..\..\cmml\libCMMLTags"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\helper;..\..\cmml;..\..\cmml"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFCMMLRAWSOURCE_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\helper;..\..\cmml\libWinCMMLParse;..\..\cmml\libCMMLTags"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\helper;..\..\cmml;..\..\cmml"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFCMMLRAWSOURCE_EXPORTS"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="2"
@@ -179,7 +179,7 @@
<Tool
Name="VCCLCompilerTool"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\helper;..\..\cmml\libWinCMMLParse;..\..\cmml\libCMMLTags"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\helper;..\..\cmml;..\..\cmml"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFCMMLRAWSOURCE_EXPORTS"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="1"
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -39,7 +39,7 @@
using namespace std;
//Local Include Files
-#include "C_TextFieldTag.h"
+#include <libCMMLTags/C_TextFieldTag.h>
class LIBCMMLTAGS_API C_AnchorTag
//Derived Classes
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -38,7 +38,7 @@
using namespace std;
//Local Include Files
-#include "C_CMMLTag.h"
+#include <libCMMLTags/C_CMMLTag.h>
class LIBCMMLTAGS_API C_BaseTag
//Derived Classes
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -45,9 +45,9 @@
using namespace std;
//Local Include Files
-#include "C_CMMLPreamble.h"
-#include "C_CMMLRootTag.h"
-//#include "C_CMMLError.h"
+#include <libCMMLTags/C_CMMLPreamble.h>
+#include <libCMMLTags/C_CMMLRootTag.h>
+//#include <libCMMLTags/C_CMMLError.h>
//typedef int (*CMMLReadStreamCB) (const C_StreamTag *inStream, void * user_data);
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -38,11 +38,11 @@
using namespace std;
//Local Include Files
-#include "C_CMMLTag.h"
-#include "C_HumReadCMMLTag.h"
-#include "C_StreamTag.h"
-#include "C_HeadTag.h"
-#include "C_ClipTagList.h"
+#include <libCMMLTags/C_CMMLTag.h>
+#include <libCMMLTags/C_HumReadCMMLTag.h>
+#include <libCMMLTags/C_StreamTag.h>
+#include <libCMMLTags/C_HeadTag.h>
+#include <libCMMLTags/C_ClipTagList.h>
class LIBCMMLTAGS_API C_CMMLRootTag :
//Derived Classes
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -39,11 +39,11 @@
using namespace std;
//Local Include Files
-#include "C_HumReadCMMLTag.h"
-#include "C_MetaTagList.h"
-#include "C_AnchorTag.h"
-#include "C_ImageTag.h"
-#include "C_DescTag.h"
+#include <libCMMLTags/C_HumReadCMMLTag.h>
+#include <libCMMLTags/C_MetaTagList.h>
+#include <libCMMLTags/C_AnchorTag.h>
+#include <libCMMLTags/C_ImageTag.h>
+#include <libCMMLTags/C_DescTag.h>
class LIBCMMLTAGS_API C_ClipTag :
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTagList.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTagList.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -38,8 +38,8 @@
using namespace std;
//Local Include Files
-#include "C_TagList.h"
-#include "C_ClipTag.h"
+#include <libCMMLTags/C_TagList.h>
+#include <libCMMLTags/C_ClipTag.h>
//TO DO:::Make this class !
class LIBCMMLTAGS_API C_ClipTagList :
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -38,7 +38,7 @@
using namespace std;
//Local Include Files
-#include "C_TextFieldTag.h"
+#include <libCMMLTags/C_TextFieldTag.h>
class LIBCMMLTAGS_API C_DescTag
//Derived Classes
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HeadTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HeadTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HeadTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -38,10 +38,10 @@
using namespace std;
//Local Include Files
-#include "C_HumReadCMMLTag.h"
-#include "C_TitleTag.h"
-#include "C_BaseTag.h"
-#include "C_MetaTagList.h"
+#include <libCMMLTags/C_HumReadCMMLTag.h>
+#include <libCMMLTags/C_TitleTag.h>
+#include <libCMMLTags/C_BaseTag.h>
+#include <libCMMLTags/C_MetaTagList.h>
class LIBCMMLTAGS_API C_HeadTag
//Derived Classes
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -38,9 +38,9 @@
using namespace std;
//Local Include Files
-#include "C_HumReadCMMLTag.h"
-#include "C_ParamTagList.h"
-#include "C_CMMLTime.h"
+#include <libCMMLTags/C_HumReadCMMLTag.h>
+#include <libCMMLTags/C_ParamTagList.h>
+#include <libCMMLTags/C_CMMLTime.h>
class LIBCMMLTAGS_API C_ImportTag
//Derived Classes
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTagList.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTagList.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -38,8 +38,8 @@
using namespace std;
//Local Include Files
-#include "C_TagList.h"
-#include "C_ImportTag.h"
+#include <libCMMLTags/C_TagList.h>
+#include <libCMMLTags/C_ImportTag.h>
class LIBCMMLTAGS_API C_ImportTagList
//Derived Classes
: public C_TagList
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -38,7 +38,7 @@
using namespace std;
//Local Include Files
-#include "C_HumReadCMMLTag.h"
+#include <libCMMLTags/C_HumReadCMMLTag.h>
class LIBCMMLTAGS_API C_MappedTag
//Derived Classes
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTagList.cpp 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTagList.cpp 2004-12-29 01:40:23 UTC (rev 8544)
@@ -99,7 +99,7 @@
}
void C_MappedTagList::privateClone(C_MappedTagList* outTagList) {
- for(int i = 0; i < mTagList.size(); i++) {
+ for(unsigned int i = 0; i < mTagList.size(); i++) {
outTagList->addTag(mTagList[i]->mappedClone());
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTagList.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTagList.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -39,7 +39,7 @@
using namespace std;
//Local Include Files
-#include "C_MappedTag.h"
+#include <libCMMLTags/C_MappedTag.h>
class LIBCMMLTAGS_API C_MappedTagList
{
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -38,7 +38,7 @@
using namespace std;
//Local Include Files
-#include "C_MappedTag.h"
+#include <libCMMLTags/C_MappedTag.h>
class LIBCMMLTAGS_API C_MetaTag
//Derived Classes
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTagList.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTagList.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -32,8 +32,8 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#pragma once
-#include "C_MappedTagList.h"
-#include "C_MetaTag.h"
+#include <libCMMLTags/C_MappedTagList.h>
+#include <libCMMLTags/C_MetaTag.h>
class LIBCMMLTAGS_API C_MetaTagList
: public C_MappedTagList
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTagList.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTagList.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -39,8 +39,8 @@
using namespace std;
//Local Include Files
-#include "C_ParamTag.h"
-#include "C_MappedTagList.h"
+#include <libCMMLTags/C_ParamTag.h>
+#include <libCMMLTags/C_MappedTagList.h>
class LIBCMMLTAGS_API C_ParamTagList
//Derived Classes
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -38,8 +38,8 @@
using namespace std;
//Local Include Files
-#include "C_CMMLTag.h"
-#include "C_ImportTagList.h"
+#include <libCMMLTags/C_CMMLTag.h>
+#include <libCMMLTags/C_ImportTagList.h>
class LIBCMMLTAGS_API C_StreamTag
//Derived Classes
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.cpp 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.cpp 2004-12-29 01:40:23 UTC (rev 8544)
@@ -77,7 +77,7 @@
}
void C_TagList::privateClone(C_TagList* outTagList) {
- for (int i = 0; i < mTagList.size(); i++) {
+ for (unsigned int i = 0; i < mTagList.size(); i++) {
outTagList->addTag(mTagList[i]->genericClone());
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -39,7 +39,7 @@
using namespace std;
//Local Include Files
-#include "C_CMMLTag.h"
+#include <libCMMLTags/C_CMMLTag.h>
class LIBCMMLTAGS_API C_TagList
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TextFieldTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TextFieldTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TextFieldTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -38,7 +38,7 @@
using namespace std;
//Local Include Files
-#include "C_HumReadCMMLTag.h"
+#include <libCMMLTags/C_HumReadCMMLTag.h>
class LIBCMMLTAGS_API C_TextFieldTag
//Derived Classes
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -38,7 +38,7 @@
using namespace std;
//Local Include Files
-#include "C_TextFieldTag.h"
+#include <libCMMLTags/C_TextFieldTag.h>
class LIBCMMLTAGS_API C_TitleTag
//Derived Classes
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/cpp_lib_cmml.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/cpp_lib_cmml.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/cpp_lib_cmml.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -34,29 +34,29 @@
#include "config.h"
// These classes are exported from the cpp_lib_cmml.dll
-#include "C_AnchorTag.h"
-#include "C_BaseTag.h"
-#include "C_ClipTag.h"
-#include "C_ClipTagList.h"
-#include "C_CMMLDoc.h"
-#include "C_CMMLPreamble.h"
-#include "C_CMMLRootTag.h"
-#include "C_CMMLTag.h"
-#include "C_DescTag.h"
-#include "C_HeadTag.h"
-#include "C_HumReadCMMLTag.h"
-#include "C_ImageTag.h"
-#include "C_ImportTag.h"
-#include "C_ImportTagList.h"
-#include "C_Int64.h" //Remove ??
-#include "C_MappedTag.h"
-#include "C_MappedTagList.h"
-#include "C_MetaTag.h"
-#include "C_MetaTagList.h"
-#include "C_ParamTag.h"
-#include "C_ParamTagList.h"
-#include "C_StreamTag.h"
-#include "C_TagList.h"
-#include "C_TextFieldTag.h"
-#include "C_TitleTag.h"
+#include <libCMMLTags/C_AnchorTag.h>
+#include <libCMMLTags/C_BaseTag.h>
+#include <libCMMLTags/C_ClipTag.h>
+#include <libCMMLTags/C_ClipTagList.h>
+#include <libCMMLTags/C_CMMLDoc.h>
+#include <libCMMLTags/C_CMMLPreamble.h>
+#include <libCMMLTags/C_CMMLRootTag.h>
+#include <libCMMLTags/C_CMMLTag.h>
+#include <libCMMLTags/C_DescTag.h>
+#include <libCMMLTags/C_HeadTag.h>
+#include <libCMMLTags/C_HumReadCMMLTag.h>
+#include <libCMMLTags/C_ImageTag.h>
+#include <libCMMLTags/C_ImportTag.h>
+#include <libCMMLTags/C_ImportTagList.h>
+#include <libCMMLTags/C_Int64.h> //Remove ??
+#include <libCMMLTags/C_MappedTag.h>
+#include <libCMMLTags/C_MappedTagList.h>
+#include <libCMMLTags/C_MetaTag.h>
+#include <libCMMLTags/C_MetaTagList.h>
+#include <libCMMLTags/C_ParamTag.h>
+#include <libCMMLTags/C_ParamTagList.h>
+#include <libCMMLTags/C_StreamTag.h>
+#include <libCMMLTags/C_TagList.h>
+#include <libCMMLTags/C_TextFieldTag.h>
+#include <libCMMLTags/C_TitleTag.h>
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -48,29 +48,29 @@
#include "config.h"
// These classes are exported from the cpp_lib_cmml.dll
-#include "C_AnchorTag.h"
-#include "C_BaseTag.h"
-#include "C_ClipTag.h"
-#include "C_ClipTagList.h"
-#include "C_CMMLDoc.h"
-#include "C_CMMLPreamble.h"
-#include "C_CMMLRootTag.h"
-#include "C_CMMLTag.h"
-#include "C_DescTag.h"
-#include "C_HeadTag.h"
-#include "C_HumReadCMMLTag.h"
-#include "C_ImageTag.h"
-#include "C_ImportTag.h"
-#include "C_ImportTagList.h"
-#include "C_Int64.h" //Remove ??
-#include "C_MappedTag.h"
-#include "C_MappedTagList.h"
-#include "C_MetaTag.h"
-#include "C_MetaTagList.h"
-#include "C_ParamTag.h"
-#include "C_ParamTagList.h"
-#include "C_StreamTag.h"
-#include "C_TagList.h"
-#include "C_TextFieldTag.h"
-#include "C_TitleTag.h"
+#include <libCMMLTags/C_AnchorTag.h>
+#include <libCMMLTags/C_BaseTag.h>
+#include <libCMMLTags/C_ClipTag.h>
+#include <libCMMLTags/C_ClipTagList.h>
+#include <libCMMLTags/C_CMMLDoc.h>
+#include <libCMMLTags/C_CMMLPreamble.h>
+#include <libCMMLTags/C_CMMLRootTag.h>
+#include <libCMMLTags/C_CMMLTag.h>
+#include <libCMMLTags/C_DescTag.h>
+#include <libCMMLTags/C_HeadTag.h>
+#include <libCMMLTags/C_HumReadCMMLTag.h>
+#include <libCMMLTags/C_ImageTag.h>
+#include <libCMMLTags/C_ImportTag.h>
+#include <libCMMLTags/C_ImportTagList.h>
+#include <libCMMLTags/C_Int64.h> //Remove ??
+#include <libCMMLTags/C_MappedTag.h>
+#include <libCMMLTags/C_MappedTagList.h>
+#include <libCMMLTags/C_MetaTag.h>
+#include <libCMMLTags/C_MetaTagList.h>
+#include <libCMMLTags/C_ParamTag.h>
+#include <libCMMLTags/C_ParamTagList.h>
+#include <libCMMLTags/C_StreamTag.h>
+#include <libCMMLTags/C_TagList.h>
+#include <libCMMLTags/C_TextFieldTag.h>
+#include <libCMMLTags/C_TitleTag.h>
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.vcproj 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.vcproj 2004-12-29 01:40:23 UTC (rev 8544)
@@ -19,6 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
+ AdditionalIncludeDirectories=".."
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCMMLTAGS_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -76,6 +77,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
+ AdditionalIncludeDirectories=".."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCMMLTAGS_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -135,6 +137,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
+ AdditionalIncludeDirectories=".."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCMMLTAGS_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -195,6 +198,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
+ AdditionalIncludeDirectories=".."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCMMLTAGS_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/AnchorTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/AnchorTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/AnchorTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -42,7 +42,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_AnchorTag.h>
+#include <libCMMLTags/C_AnchorTag.h>
#pragma managed
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/BaseTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/BaseTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/BaseTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -43,7 +43,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_BaseTag.h>
+#include <libCMMLTags/C_BaseTag.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLDoc.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLDoc.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLDoc.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -48,7 +48,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_CMMLDoc.h>
+#include <libCMMLTags/C_CMMLDoc.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLPreamble.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLPreamble.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLPreamble.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -40,7 +40,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_CMMLPreamble.h>
+#include <libCMMLTags/C_CMMLPreamble.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLRootTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLRootTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLRootTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -44,7 +44,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_CMMLRootTag.h>
+#include <libCMMLTags/C_CMMLRootTag.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -39,7 +39,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_CMMLTag.h>
+#include <libCMMLTags/C_CMMLTag.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -45,7 +45,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_ClipTag.h>
+#include <libCMMLTags/C_ClipTag.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTagList.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTagList.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -43,7 +43,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_ClipTagList.h>
+#include <libCMMLTags/C_ClipTagList.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/DescTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/DescTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/DescTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -41,7 +41,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_DescTag.h>
+#include <libCMMLTags/C_DescTag.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HeadTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HeadTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HeadTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -45,7 +45,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_HeadTag.h>
+#include <libCMMLTags/C_HeadTag.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HumReadCMMLTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HumReadCMMLTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HumReadCMMLTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -44,7 +44,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_HumReadCMMLTag.h>
+#include <libCMMLTags/C_HumReadCMMLTag.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImageTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImageTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImageTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -43,7 +43,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_ImageTag.h>
+#include <libCMMLTags/C_ImageTag.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -42,7 +42,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_ImportTag.h>
+#include <libCMMLTags/C_ImportTag.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTagList.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTagList.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -42,7 +42,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_ImportTagList.h>
+#include <libCMMLTags/C_ImportTagList.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -42,7 +42,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_MappedTag.h>
+#include <libCMMLTags/C_MappedTag.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTagList.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTagList.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -40,7 +40,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_MappedTagList.h>
+#include <libCMMLTags/C_MappedTagList.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -41,7 +41,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_MetaTag.h>
+#include <libCMMLTags/C_MetaTag.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTagList.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTagList.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -42,7 +42,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_MetaTagList.h>
+#include <libCMMLTags/C_MetaTagList.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -42,7 +42,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_ParamTag.h>
+#include <libCMMLTags/C_ParamTag.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTagList.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTagList.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -42,7 +42,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_ParamTagList.h>
+#include <libCMMLTags/C_ParamTagList.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/StreamTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/StreamTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/StreamTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -45,7 +45,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_StreamTag.h>
+#include <libCMMLTags/C_StreamTag.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TagList.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TagList.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -41,7 +41,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_TagList.h>
+#include <libCMMLTags/C_TagList.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TextFieldTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TextFieldTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TextFieldTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -41,7 +41,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_TextFieldTag.h>
+#include <libCMMLTags/C_TextFieldTag.h>
#pragma managed
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TitleTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TitleTag.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TitleTag.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -48,7 +48,7 @@
#pragma unmanaged
#include <config.h>
-#include <C_TitleTag.h>
+#include <libCMMLTags/C_TitleTag.h>
#pragma managed
namespace illiminable {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/libCMMLTagsDotNET.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/libCMMLTagsDotNET.vcproj 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/libCMMLTagsDotNET.vcproj 2004-12-29 01:40:23 UTC (rev 8544)
@@ -20,7 +20,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\helper\libiWrapper;..\libCMMLTags"
+ AdditionalIncludeDirectories="..\..\..\helper\libiWrapper;.."
AdditionalUsingDirectories="..\..\..\helper\libiWrapper\Debug"
PreprocessorDefinitions="WIN32;_DEBUG"
MinimalRebuild="FALSE"
@@ -74,7 +74,7 @@
EnableIntrinsicFunctions="TRUE"
FavorSizeOrSpeed="1"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\helper\libiWrapper;..\libCMMLTags"
+ AdditionalIncludeDirectories="..\..\..\helper\libiWrapper;.."
AdditionalUsingDirectories="..\..\..\helper\libiWrapper\Release"
PreprocessorDefinitions="WIN32;NDEBUG"
MinimalRebuild="FALSE"
@@ -127,7 +127,7 @@
EnableIntrinsicFunctions="TRUE"
FavorSizeOrSpeed="1"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\helper\libiWrapper;..\libCMMLTags"
+ AdditionalIncludeDirectories="..\..\..\helper\libiWrapper;.."
AdditionalUsingDirectories="..\..\..\helper\libiWrapper\Release"
PreprocessorDefinitions="WIN32;NDEBUG"
MinimalRebuild="FALSE"
@@ -181,7 +181,7 @@
EnableIntrinsicFunctions="TRUE"
FavorSizeOrSpeed="1"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\helper\libiWrapper;..\libCMMLTags"
+ AdditionalIncludeDirectories="..\..\..\helper\libiWrapper;.."
AdditionalUsingDirectories="..\..\..\helper\libiWrapper\Release"
PreprocessorDefinitions="WIN32;NDEBUG"
MinimalRebuild="FALSE"
Modified: trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.cpp 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.cpp 2004-12-29 01:40:23 UTC (rev 8544)
@@ -32,7 +32,7 @@
//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//===========================================================================
#include "stdafx.h"
-#include "cmmlparser.h"
+#include <libWinCMMLParse/CMMLParser.h>
CMMLParser::CMMLParser(void)
{
Modified: trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -35,7 +35,7 @@
#pragma once
#include <string>
-#include "libCMMLTags.h"
+#include <libCMMLTags/libCMMLTags.h>
#import <msxml3.dll> raw_interfaces_only
using namespace MSXML2;
Modified: trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/libWinCMMLParse.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/libWinCMMLParse.cpp 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/libWinCMMLParse.cpp 2004-12-29 01:40:23 UTC (rev 8544)
@@ -36,7 +36,7 @@
//
#include "stdafx.h"
-#include "libWinCMMLParse.h"
+#include <libWinCMMLParse/libWinCMMLParse.h>
BOOL APIENTRY DllMain( HANDLE hModule,
DWORD ul_reason_for_call,
LPVOID lpReserved
Modified: trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/libWinCMMLParse.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/libWinCMMLParse.vcproj 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/libWinCMMLParse.vcproj 2004-12-29 01:40:23 UTC (rev 8544)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\libCMMLTags"
+ AdditionalIncludeDirectories=".."
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBWINCMMLPARSE_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -77,7 +77,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\libCMMLTags"
+ AdditionalIncludeDirectories=".."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBWINCMMLPARSE_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -137,7 +137,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\libCMMLTags"
+ AdditionalIncludeDirectories=".."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBWINCMMLPARSE_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -198,7 +198,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\libCMMLTags"
+ AdditionalIncludeDirectories=".."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBWINCMMLPARSE_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/stdafx.h 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/stdafx.h 2004-12-29 01:40:23 UTC (rev 8544)
@@ -43,4 +43,4 @@
// Windows Header Files:
#include <windows.h>
-#include "libWinCMMLParse.h"
+#include <libWinCMMLParse/libWinCMMLParse.h>
Modified: trunk/oggdsf/src/lib/player/libDSPlayDotNET/libDSPlayDotNET.vcproj
===================================================================
--- trunk/oggdsf/src/lib/player/libDSPlayDotNET/libDSPlayDotNET.vcproj 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/player/libDSPlayDotNET/libDSPlayDotNET.vcproj 2004-12-29 01:40:23 UTC (rev 8544)
@@ -20,7 +20,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\helper\libiWrapper;..\..\codecs\cmml\dsfCMMLDecoder;..\..\codecs\cmml\libCMMLTags;C:\DXSDK\Include"
+ AdditionalIncludeDirectories="..\..\helper\libiWrapper;..\..\codecs\cmml\dsfCMMLDecoder;..\..\codecs\cmml;C:\DXSDK\Include"
AdditionalUsingDirectories="..\..\helper\libiWrapper\Debug;..\..\codecs\cmml\libCMMLTagsDotNET\Debug"
PreprocessorDefinitions="WIN32;_DEBUG"
MinimalRebuild="FALSE"
@@ -77,7 +77,7 @@
EnableIntrinsicFunctions="TRUE"
FavorSizeOrSpeed="1"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\helper\libiWrapper;..\..\codecs\cmml\dsfCMMLDecoder;..\..\codecs\cmml\libCMMLTags;C:\DXSDK\Include"
+ AdditionalIncludeDirectories="..\..\helper\libiWrapper;..\..\codecs\cmml\dsfCMMLDecoder;..\..\codecs\cmml;C:\DXSDK\Include"
AdditionalUsingDirectories="..\..\helper\libiWrapper\Release;..\..\codecs\cmml\libCMMLTagsDotNET\Release"
PreprocessorDefinitions="WIN32;NDEBUG"
MinimalRebuild="FALSE"
@@ -134,7 +134,7 @@
EnableIntrinsicFunctions="TRUE"
FavorSizeOrSpeed="1"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\helper\libiWrapper;..\..\codecs\cmml\dsfCMMLDecoder;..\..\codecs\cmml\libCMMLTags;C:\DXSDK\Include"
+ AdditionalIncludeDirectories="..\..\helper\libiWrapper;..\..\codecs\cmml\dsfCMMLDecoder;..\..\codecs\cmml;C:\DXSDK\Include"
AdditionalUsingDirectories="..\..\helper\libiWrapper\Release;..\..\codecs\cmml\libCMMLTagsDotNET\Release"
PreprocessorDefinitions="WIN32;NDEBUG"
MinimalRebuild="FALSE"
@@ -192,7 +192,7 @@
EnableIntrinsicFunctions="TRUE"
FavorSizeOrSpeed="1"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\helper\libiWrapper;..\..\codecs\cmml\dsfCMMLDecoder;..\..\codecs\cmml\libCMMLTags;C:\DXSDK\Include"
+ AdditionalIncludeDirectories="..\..\helper\libiWrapper;..\..\codecs\cmml\dsfCMMLDecoder;..\..\codecs\cmml;C:\DXSDK\Include"
AdditionalUsingDirectories="..\..\helper\libiWrapper\Release;..\..\codecs\cmml\libCMMLTagsDotNET\Release"
PreprocessorDefinitions="WIN32;NDEBUG"
MinimalRebuild="FALSE"
Modified: trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayer.vcproj
===================================================================
--- trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayer.vcproj 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayer.vcproj 2004-12-29 01:40:23 UTC (rev 8544)
@@ -20,7 +20,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\codecs\cmml\dsfCMMLDecoder;..\..\codecs\cmml\libCMMLTags;C:\DXSDK\Include;..\..\helper"
+ AdditionalIncludeDirectories="..\..\codecs\cmml\dsfCMMLDecoder;..\..\codecs\cmml;C:\DXSDK\Include;..\..\helper"
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -83,7 +83,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\codecs\cmml\dsfCMMLDecoder;..\..\codecs\cmml\libCMMLTags;C:\DXSDK\Include;..\..\helper"
+ AdditionalIncludeDirectories="..\..\codecs\cmml\dsfCMMLDecoder;..\..\codecs\cmml;C:\DXSDK\Include;..\..\helper"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL"
RuntimeLibrary="2"
TreatWChar_tAsBuiltInType="TRUE"
Modified: trunk/oggdsf/src/tests/testCMMLParser/testCMMLParser.cpp
===================================================================
--- trunk/oggdsf/src/tests/testCMMLParser/testCMMLParser.cpp 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/tests/testCMMLParser/testCMMLParser.cpp 2004-12-29 01:40:23 UTC (rev 8544)
@@ -5,8 +5,8 @@
#include "libCMMLTags.h"
-#include "libWinCMMLParse.h"
-#include "CMMLParser.h"
+#include <libWinCMMLParse/libWinCMMLParse.h>
+#include <libWinCMMLParse/CMMLParser.h>
bool testHeadParse(wstring inHeadString) {
Modified: trunk/oggdsf/src/tests/testCMMLParser/testCMMLParser.vcproj
===================================================================
--- trunk/oggdsf/src/tests/testCMMLParser/testCMMLParser.vcproj 2004-12-29 01:05:58 UTC (rev 8543)
+++ trunk/oggdsf/src/tests/testCMMLParser/testCMMLParser.vcproj 2004-12-29 01:40:23 UTC (rev 8544)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\lib\codecs\cmml\libCMMLTags;..\..\lib\codecs\cmml\libWinCMMLParse"
+ AdditionalIncludeDirectories="..\..\lib\codecs\cmml;..\..\lib\codecs\cmml"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -68,7 +68,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\lib\codecs\cmml\libCMMLTags;..\..\lib\codecs\cmml\libWinCMMLParse"
+ AdditionalIncludeDirectories="..\..\lib\codecs\cmml;..\..\lib\codecs\cmml"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
More information about the commits
mailing list