[xiph-commits] r8535 - in trunk/oggdsf:
src/lib/codecs/cmml/dsfCMMLDecoder
src/lib/codecs/cmml/dsfCMMLRawSource
src/lib/codecs/flac/filters/dsfFLACDecoder
src/lib/codecs/flac/filters/dsfFLACEncoder
src/lib/codecs/flac/filters/dsfNativeFLACSource
src/lib/codecs/flac/libs/libFLACHelper
src/lib/codecs/speex/filters/dsfSpeexDecoder
src/lib/codecs/speex/filters/dsfSpeexEncoder
src/lib/codecs/theora/filters/dsfTheoraDecoder
src/lib/codecs/theora/filters/dsfTheoraEncoder
src/lib/codecs/theora/libs/libOOTheora
src/lib/codecs/vorbis/filters/dsfVorbisDecoder
src/lib/codecs/vorbis/filters/dsfVorbisEncoder
src/lib/core/annodex/libOOAnnodex
src/lib/core/directshow/dsfAnxDemux
src/lib/core/directshow/dsfAnxMux
src/lib/core/directshow/dsfOggDemux
src/lib/core/directshow/dsfOggMux src/lib/core/ogg/libOOOgg
src/lib/core/ogg/libOOOggSeek src/lib/core/ogg/libVorbisComment
src/lib/core/ogg/libVorbisCommentDotNET
src/lib/helper/iDSHelper src/lib/helper/libilliCore
src/lib/plugin/axAnxOggPlayer src/tests/testCircleBuffer
src/tests/testLibOOOgg src/tests/testMuxDemux
src/tests/testlibOOOggSpeed1 src/tools/AnxCutter
src/tools/OOOggCommentDump src/tools/OOOggDump
src/tools/OOOggPacketise src/tools/OOOggPageInfo
src/tools/OOOggSeekFileMaker src/tools/OOOggSeekFileQuery
src/tools/OOOggSeekFileReader src/tools/OOOggStat
src/tools/OOOggValidate src/tools/oggChainSplitter unix
ozone at motherfish-iii.xiph.org
ozone at motherfish-iii.xiph.org
Sat Dec 25 09:26:39 PST 2004
Author: ozone
Date: 2004-12-25 09:26:38 -0800 (Sat, 25 Dec 2004)
New Revision: 8535
Modified:
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.vcproj
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.h
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/dsfCMMLRawSource.vcproj
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACDecodeInputPin.h
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/dsfFLACDecoder.vcproj
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.vcproj
trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourceFilter.h
trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/dsfNativeFLACSource.vcproj
trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACHeaderTweaker.h
trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACMetadataSplitter.h
trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACPushDecoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/libFLACHelper.vcproj
trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/dsfSpeexDecoder.vcproj
trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/dsfSpeexEncoder.vcproj
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/dsfTheoraDecoder.vcproj
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.vcproj
trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h
trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraEncoder.h
trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/libOOTheora.vcproj
trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/dsfVorbisDecoder.vcproj
trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/dsfVorbisEncoder.vcproj
trunk/oggdsf/src/lib/core/annodex/libOOAnnodex/libOOAnnodex.vcproj
trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxDemuxSourceFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxDemuxSourceFilter.h
trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.h
trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.h
trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/dsfAnxDemux.vcproj
trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.h
trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/dsfAnxMux.vcproj
trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/stdafx.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FLACStream.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggFLAC_1_0_Stream.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStreamFactory.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStreamMapper.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SpeexStream.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/StreamHeaders.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/FishSkeleton.h
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.h
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/dsfOggMux.vcproj
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/stdafx.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/CircularBuffer.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/CircularBuffer.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/IFIFOBuffer.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/IOggCallback.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/IOggPackSource.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/IStampedOggPacketSink.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacket.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacket.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacketiser.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacketiser.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPage.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPage.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggTypeDefs.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/StampedOggPacket.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/StampedOggPacket.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.vcproj
trunk/oggdsf/src/lib/core/ogg/libOOOgg/stdafx.h
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoAnxSeekTable.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoAnxSeekTable.h
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.h
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/IOggSeeker.h
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OGGSRecogniser.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekPoint.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekPoint.h
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.h
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/libOOOggSeek.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/libOOOggSeek.vcproj
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/stdafx.h
trunk/oggdsf/src/lib/core/ogg/libVorbisComment/FileComments.h
trunk/oggdsf/src/lib/core/ogg/libVorbisComment/VorbisComments.h
trunk/oggdsf/src/lib/core/ogg/libVorbisComment/libVorbisComment.vcproj
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNFileComments.h
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNStreamCommentInfo.h
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNVorbisComments.h
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/libVorbisCommentDotNET.vcproj
trunk/oggdsf/src/lib/helper/iDSHelper/DSStringer.cpp
trunk/oggdsf/src/lib/helper/iDSHelper/iDSHelper.vcproj
trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.cpp
trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.h
trunk/oggdsf/src/lib/helper/libilliCore/iBE_Math.cpp
trunk/oggdsf/src/lib/helper/libilliCore/iBE_Math.h
trunk/oggdsf/src/lib/helper/libilliCore/iLE_Math.cpp
trunk/oggdsf/src/lib/helper/libilliCore/iLE_Math.h
trunk/oggdsf/src/lib/helper/libilliCore/libilliCore.vcproj
trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayer.vcproj
trunk/oggdsf/src/tests/testCircleBuffer/testCircleBuffer.cpp
trunk/oggdsf/src/tests/testCircleBuffer/testCircleBuffer.vcproj
trunk/oggdsf/src/tests/testLibOOOgg/OggPageFileWriter.h
trunk/oggdsf/src/tests/testLibOOOgg/TestPatternOggPacketChecker.h
trunk/oggdsf/src/tests/testLibOOOgg/TestPatternOggPageChecker.h
trunk/oggdsf/src/tests/testLibOOOgg/stdafx.h
trunk/oggdsf/src/tests/testLibOOOgg/testLibOOOgg.vcproj
trunk/oggdsf/src/tests/testMuxDemux/OggPageFileWriter.h
trunk/oggdsf/src/tests/testMuxDemux/testMuxDemux.cpp
trunk/oggdsf/src/tests/testMuxDemux/testMuxDemux.vcproj
trunk/oggdsf/src/tests/testlibOOOggSpeed1/testlibOOOggSpeed1.vcproj
trunk/oggdsf/src/tools/AnxCutter/AnxCutter.cpp
trunk/oggdsf/src/tools/AnxCutter/AnxCutter.vcproj
trunk/oggdsf/src/tools/OOOggCommentDump/OOOggCommentDump.cpp
trunk/oggdsf/src/tools/OOOggCommentDump/OOOggCommentDump.vcproj
trunk/oggdsf/src/tools/OOOggDump/OOOggDump.cpp
trunk/oggdsf/src/tools/OOOggDump/OOOggDump.vcproj
trunk/oggdsf/src/tools/OOOggPacketise/OOOggPacketise.vcproj
trunk/oggdsf/src/tools/OOOggPageInfo/OOOggPageInfo.cpp
trunk/oggdsf/src/tools/OOOggPageInfo/OOOggPageInfo.vcproj
trunk/oggdsf/src/tools/OOOggSeekFileMaker/OOOggSeekFileMaker.cpp
trunk/oggdsf/src/tools/OOOggSeekFileMaker/OOOggSeekFileMaker.vcproj
trunk/oggdsf/src/tools/OOOggSeekFileQuery/OOOggSeekFileQuery.cpp
trunk/oggdsf/src/tools/OOOggSeekFileQuery/OOOggSeekFileQuery.vcproj
trunk/oggdsf/src/tools/OOOggSeekFileReader/OOOggSeekFileReader.cpp
trunk/oggdsf/src/tools/OOOggSeekFileReader/OOOggSeekFileReader.vcproj
trunk/oggdsf/src/tools/OOOggStat/OOOggStat.cpp
trunk/oggdsf/src/tools/OOOggStat/OOOggStat.vcproj
trunk/oggdsf/src/tools/OOOggValidate/OOOggValidate.cpp
trunk/oggdsf/src/tools/OOOggValidate/OOOggValidate.vcproj
trunk/oggdsf/src/tools/OOOggValidate/OggStreamValidationState.h
trunk/oggdsf/src/tools/OOOggValidate/OggValidationState.h
trunk/oggdsf/src/tools/oggChainSplitter/oggChainSplitter.vcproj
trunk/oggdsf/unix/Makefile.am
Log:
oggdsf:
* Change #include "..." to #include <libFoo/...> when including libilliCore, libOOOgg, and libOOOggSeek. This is so that on UNIX, header files get installed to $(prefix)/include/libFoo, rather than just $(prefix)/include).
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -36,7 +36,7 @@
#include "cmmldecoderdllstuff.h"
#include <string>
#include <fstream>
-#include "StringHelper.h"
+#include <libilliCore/StringHelper.h>
#include "libWinCMMLParse.h"
#include "CMMLParser.h"
#include "libCMMLTags.h"
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\libCMMLTags;..\libWinCMMLParse;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\libCMMLTags;..\libWinCMMLParse;..\..\..\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\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\libCMMLTags;..\libWinCMMLParse;..\..\..\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\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\libCMMLTags;..\libWinCMMLParse;..\..\..\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\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\libCMMLTags;..\libWinCMMLParse;..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFCMMLDECODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -34,7 +34,7 @@
#pragma once
#include "cmmlrawsourcedllstuff.h"
-#include "StringHelper.h"
+#include <libilliCore/StringHelper.h>
#include <fstream>
using namespace std;
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/dsfCMMLRawSource.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/dsfCMMLRawSource.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/dsfCMMLRawSource.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\helper\libilliCore;..\..\cmml\libWinCMMLParse;..\..\cmml\libCMMLTags"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\helper;..\..\cmml\libWinCMMLParse;..\..\cmml\libCMMLTags"
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\libilliCore;..\..\cmml\libWinCMMLParse;..\..\cmml\libCMMLTags"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\helper;..\..\cmml\libWinCMMLParse;..\..\cmml\libCMMLTags"
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\libilliCore;..\..\cmml\libWinCMMLParse;..\..\cmml\libCMMLTags"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\helper;..\..\cmml\libWinCMMLParse;..\..\cmml\libCMMLTags"
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\libilliCore;..\..\cmml\libWinCMMLParse;..\..\cmml\libCMMLTags"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\helper;..\..\cmml\libWinCMMLParse;..\..\cmml\libCMMLTags"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFCMMLRAWSOURCE_EXPORTS"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="1"
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACDecodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACDecodeInputPin.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACDecodeInputPin.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -36,8 +36,8 @@
//External Includes
#include "FLACPushDecoder.h"
-#include "OggPacket.h"
-#include "StampedOggPacket.h"
+#include <libOOOgg/OggPacket.h>
+#include <libOOOgg/StampedOggPacket.h>
//STL Includes
//debug only
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/dsfFLACDecoder.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/dsfFLACDecoder.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/dsfFLACDecoder.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libflac\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper\libilliCore;..\..\libs\libFLACHelper"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libflac\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper;..\..\libs\libFLACHelper"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFFLACDECODER_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -81,7 +81,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libflac\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper\libilliCore;..\..\libs\libFLACHelper"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libflac\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper;..\..\libs\libFLACHelper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFFLACDECODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -144,7 +144,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libflac\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper\libilliCore;..\..\libs\libFLACHelper"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libflac\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper;..\..\libs\libFLACHelper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFFLACDECODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -208,7 +208,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libflac\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper\libilliCore;..\..\libs\libFLACHelper"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libflac\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper;..\..\libs\libFLACHelper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFFLACDECODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\libs\libflac\include;..\..\..\..\helper\libilliCore;..\..\libs\libFLACHelper"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\libs\libflac\include;..\..\..\..\helper;..\..\libs\libFLACHelper"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFFLACENCODER_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -79,7 +79,7 @@
EnableIntrinsicFunctions="TRUE"
FavorSizeOrSpeed="1"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\libs\libflac\include;..\..\..\..\helper\libilliCore;..\..\libs\libFLACHelper"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\libs\libflac\include;..\..\..\..\helper;..\..\libs\libFLACHelper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFFLACENCODER_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
@@ -138,7 +138,7 @@
EnableIntrinsicFunctions="TRUE"
FavorSizeOrSpeed="1"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\libs\libflac\include;..\..\..\..\helper\libilliCore;..\..\libs\libFLACHelper"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\libs\libflac\include;..\..\..\..\helper;..\..\libs\libFLACHelper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFFLACENCODER_EXPORTS"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="2"
@@ -198,7 +198,7 @@
EnableIntrinsicFunctions="TRUE"
FavorSizeOrSpeed="1"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\libs\libflac\include;..\..\..\..\helper\libilliCore;..\..\libs\libFLACHelper"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\libs\libflac\include;..\..\..\..\helper;..\..\libs\libFLACHelper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFFLACENCODER_EXPORTS"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="1"
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourceFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourceFilter.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourceFilter.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -35,8 +35,8 @@
//Library Includes
#include "FLAC++/decoder.h"
-#include "StringHelper.h"
-#include "iBE_Math.h"
+#include <libilliCore/StringHelper.h>
+#include <libilliCore/iBE_Math.h>
using namespace FLAC::Decoder;
//STL Includes
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/dsfNativeFLACSource.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/dsfNativeFLACSource.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/dsfNativeFLACSource.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\libs\libflac\include;..\..\..\..\helper\libilliCore;..\..\..\..\core\directshow\libDirectshowAbstracts"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\libs\libflac\include;..\..\..\..\helper;..\..\..\..\core\directshow\libDirectshowAbstracts"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFNATIVEFLACSOURCE_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -72,7 +72,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\libs\libflac\include;..\..\..\..\helper\libilliCore;..\..\..\..\core\directshow\libDirectshowAbstracts"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\libs\libflac\include;..\..\..\..\helper;..\..\..\..\core\directshow\libDirectshowAbstracts"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFNATIVEFLACSOURCE_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACHeaderTweaker.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACHeaderTweaker.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACHeaderTweaker.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,8 +30,8 @@
//===========================================================================
#pragma once
-#include "dllstuff.h"
-#include "OggPacket.h"
+#include <libOOOgg/dllstuff.h>
+#include <libOOOgg/OggPacket.h>
#include <vector>
#include <fstream>
using namespace std;
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACMetadataSplitter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACMetadataSplitter.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACMetadataSplitter.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -29,9 +29,9 @@
//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//===========================================================================
#pragma once
-#include "dllstuff.h"
-#include "OggPacket.h"
-#include "StampedOggPacket.h"
+#include <libOOOgg/dllstuff.h>
+#include <libOOOgg/OggPacket.h>
+#include <libOOOgg/StampedOggPacket.h>
#include "FLACHeaderTweaker.h"
#include <fstream>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACPushDecoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACPushDecoder.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACPushDecoder.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -1,7 +1,7 @@
#pragma once
-#include "dllstuff.h"
-#include "StampedOggPacket.h"
-#include "OggPacket.h"
+#include <libOOOgg/dllstuff.h>
+#include <libOOOgg/StampedOggPacket.h>
+#include <libOOOgg/OggPacket.h>
#include "FLAC++/decoder.h"
using namespace FLAC::Decoder;
class FLACPushDecoder
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/libFLACHelper.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/libFLACHelper.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/libFLACHelper.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\ogg\libOOOgg;..\..\..\..\helper\libilliCore;..\libflac\include"
+ AdditionalIncludeDirectories="..\..\..\..\core\ogg;..\..\..\..\helper;..\libflac\include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -69,7 +69,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\..\core\ogg\libOOOgg;..\..\..\..\helper\libilliCore;..\libflac\include"
+ AdditionalIncludeDirectories="..\..\..\..\core\ogg;..\..\..\..\helper;..\libflac\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -118,7 +118,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\..\core\ogg\libOOOgg;..\..\..\..\helper\libilliCore;..\libflac\include"
+ AdditionalIncludeDirectories="..\..\..\..\core\ogg;..\..\..\..\helper;..\libflac\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -168,7 +168,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\..\core\ogg\libOOOgg;..\..\..\..\helper\libilliCore;..\libflac\include"
+ AdditionalIncludeDirectories="..\..\..\..\core\ogg;..\..\..\..\helper;..\libflac\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/dsfSpeexDecoder.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/dsfSpeexDecoder.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/dsfSpeexDecoder.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFSPEEXDECODER_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -81,7 +81,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFSPEEXDECODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -144,7 +144,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFSPEEXDECODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -208,7 +208,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFSPEEXDECODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/dsfSpeexEncoder.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/dsfSpeexEncoder.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/dsfSpeexEncoder.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFSPEEXENCODER_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -80,7 +80,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFSPEEXENCODER_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;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFSPEEXENCODER_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;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFSPEEXENCODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/dsfTheoraDecoder.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/dsfTheoraDecoder.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/dsfTheoraDecoder.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\helper\libilliCore;..\..\..\..\helper\iDSHelper"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\helper;..\..\..\..\helper\iDSHelper"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFTHEORADECODER_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -80,7 +80,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\helper\libilliCore;..\..\..\..\helper\iDSHelper"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\helper;..\..\..\..\helper\iDSHelper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFTHEORADECODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -143,7 +143,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\helper\libilliCore;..\..\..\..\helper\iDSHelper"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\helper;..\..\..\..\helper\iDSHelper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFTHEORADECODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -207,7 +207,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\helper\libilliCore;..\..\..\..\helper\iDSHelper"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\helper;..\..\..\..\helper\iDSHelper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFTHEORADECODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\libDirectshowAbstracts;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\libs\libOOTheora;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\libs\libtheora\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\libDirectshowAbstracts;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\libs\libOOTheora;..\..\..\..\core\ogg;..\..\..\..\core\ogg\libogg\include;..\..\libs\libtheora\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFTHEORAENCODER_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -80,7 +80,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\libDirectshowAbstracts;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\libs\libOOTheora;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\libs\libtheora\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\libDirectshowAbstracts;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\libs\libOOTheora;..\..\..\..\core\ogg;..\..\..\..\core\ogg\libogg\include;..\..\libs\libtheora\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFTHEORAENCODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -143,7 +143,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\libDirectshowAbstracts;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\libs\libOOTheora;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\libs\libtheora\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\libDirectshowAbstracts;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\libs\libOOTheora;..\..\..\..\core\ogg;..\..\..\..\core\ogg\libogg\include;..\..\libs\libtheora\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFTHEORAENCODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -207,7 +207,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\libDirectshowAbstracts;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\libs\libOOTheora;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\libs\libtheora\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\libDirectshowAbstracts;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\libs\libOOTheora;..\..\..\..\core\ogg;..\..\..\..\core\ogg\libogg\include;..\..\libs\libtheora\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFTHEORAENCODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -31,8 +31,8 @@
#pragma once
#include "libootheora.h"
-#include "dllstuff.h"
-#include "StampedOggPacket.h"
+#include <libOOOgg/dllstuff.h>
+#include <libOOOgg/StampedOggPacket.h>
extern "C" {
#include "theora_cdecl.h"
}
Modified: trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraEncoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraEncoder.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraEncoder.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -31,8 +31,8 @@
#pragma once
#include "libootheora.h"
-#include "dllstuff.h"
-#include "StampedOggPacket.h"
+#include <libOOOgg/dllstuff.h>
+#include <libOOOgg/StampedOggPacket.h>
extern "C" {
#include "theora_cdecl.h"
}
Modified: trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/libOOTheora.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/libOOTheora.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/libOOTheora.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\ogg\libOOOgg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;..\..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\..\..\core\ogg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;..\..\..\..\helper"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBOOTHEORA_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -78,7 +78,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\..\core\ogg\libOOOgg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;..\..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\..\..\core\ogg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;..\..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBOOTHEORA_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -139,7 +139,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\..\core\ogg\libOOOgg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;..\..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\..\..\core\ogg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;..\..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBOOTHEORA_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -201,7 +201,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\..\core\ogg\libOOOgg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;..\..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\..\..\core\ogg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;..\..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBOOTHEORA_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/dsfVorbisDecoder.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/dsfVorbisDecoder.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/dsfVorbisDecoder.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFVORBISDECODER_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -80,7 +80,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFVORBISDECODER_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;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFVORBISDECODER_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;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFVORBISDECODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/dsfVorbisEncoder.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/dsfVorbisEncoder.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/dsfVorbisEncoder.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32;..\..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32;..\..\..\..\helper"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFVORBISENCODER_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -80,7 +80,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32;..\..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32;..\..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFVORBISENCODER_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;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32;..\..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32;..\..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFVORBISENCODER_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;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32;..\..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32;..\..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFVORBISENCODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/lib/core/annodex/libOOAnnodex/libOOAnnodex.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/annodex/libOOAnnodex/libOOAnnodex.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/annodex/libOOAnnodex/libOOAnnodex.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\ogg\libOOOgg;..\..\..\helper\libilliCore;..\..\..\core\directshow\dsfOggDemux"
+ AdditionalIncludeDirectories="..\..\ogg;..\..\..\helper;..\..\..\core\directshow\dsfOggDemux"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBOOANNODEX_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -68,7 +68,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\ogg\libOOOgg;..\..\..\helper\libilliCore;..\..\..\core\directshow\dsfOggDemux"
+ AdditionalIncludeDirectories="..\..\ogg;..\..\..\helper;..\..\..\core\directshow\dsfOggDemux"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBOOANNODEX_EXPORTS"
RuntimeLibrary="0"
UsePrecompiledHeader="3"
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxDemuxSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxDemuxSourceFilter.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxDemuxSourceFilter.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -35,7 +35,7 @@
#include "stdafx.h"
#include "AnxDemuxSourceFilter.h"
-#include "AutoAnxSeekTable.h"
+#include <libOOOggSeek/AutoAnxSeekTable.h>
//-------------------
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxDemuxSourceFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxDemuxSourceFilter.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxDemuxSourceFilter.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -35,7 +35,7 @@
#pragma once
#include "anxdllstuff.h"
#include "OggDemuxSourceFilter.h"
-#include "AutoAnxSeekTable.h"
+#include <libOOOggSeek/AutoAnxSeekTable.h>
#include "AnxStreamMapper.h"
#include "CMMLStream.h"
#include <fstream>
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -36,7 +36,7 @@
#include "OggStreamMapper.h"
#include "CMMLStream.h"
-#include "iLE_Math.h"
+#include <libilliCore/iLE_Math.h>
#include <fstream>
using namespace std;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -35,7 +35,7 @@
#pragma once
#include "anxdllstuff.h"
-#include "OggPacket.h"
+#include <libOOOgg/OggPacket.h>
#include "OggStream.h"
#include "CMMLSourcePin.h"
class CMMLStream
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/dsfAnxDemux.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/dsfAnxDemux.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/dsfAnxDemux.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\ogg\libOOOgg;..\..\ogg\libOOOggSeek;..\libDirectshowAbstracts;..\dsfOggDemux;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\ogg;..\..\ogg;..\libDirectshowAbstracts;..\dsfOggDemux;..\..\..\helper"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFANXDEMUX_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -80,7 +80,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\ogg\libOOOgg;..\..\ogg\libOOOggSeek;..\libDirectshowAbstracts;..\dsfOggDemux;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\ogg;..\..\ogg;..\libDirectshowAbstracts;..\dsfOggDemux;..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFANXDEMUX_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;..\..\ogg\libOOOgg;..\..\ogg\libOOOggSeek;..\libDirectshowAbstracts;..\dsfOggDemux;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\ogg;..\..\ogg;..\libDirectshowAbstracts;..\dsfOggDemux;..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFANXDEMUX_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;..\..\ogg\libOOOgg;..\..\ogg\libOOOggSeek;..\libDirectshowAbstracts;..\dsfOggDemux;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\ogg;..\..\ogg;..\libDirectshowAbstracts;..\dsfOggDemux;..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFANXDEMUX_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -33,7 +33,7 @@
//===========================================================================
#pragma once
-#include "OggPageInterleaver.h"
+#include <libOOOgg/OggPageInterleaver.h>
#include "AnxPacketMaker.h"
class AnxPageInterleaver
: public OggPageInterleaver
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/dsfAnxMux.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/dsfAnxMux.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/dsfAnxMux.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\ogg\libOOOgg;..\..\directshow\dsfOggMux;..\..\..\helper\libilliCore;..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\codecs\flac\libs\libFLACHelper;..\..\..\core\directshow\dsfOggDemux"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\ogg;..\..\directshow\dsfOggMux;..\..\..\helper;..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\codecs\flac\libs\libFLACHelper;..\..\..\core\directshow\dsfOggDemux"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFANXMUX_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -72,7 +72,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\ogg\libOOOgg;..\..\directshow\dsfOggMux;..\..\..\helper\libilliCore;..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\codecs\flac\libs\libFLACHelper;..\..\..\core\directshow\dsfOggDemux"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\ogg;..\..\directshow\dsfOggMux;..\..\..\helper;..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\codecs\flac\libs\libFLACHelper;..\..\..\core\directshow\dsfOggDemux"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFANXMUX_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/stdafx.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/stdafx.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -47,5 +47,5 @@
#include <initguid.h>
// TODO: reference additional headers your program requires here
-#include "libOOOgg.h"
+#include <libOOOgg/libOOOgg.h>
#include "anxmuxdllstuff.h"
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FLACStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FLACStream.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FLACStream.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -31,8 +31,8 @@
#pragma once
#include "oggdllstuff.h"
-#include "OggPage.h"
-#include "OggPacket.h"
+#include <libOOOgg/OggPage.h>
+#include <libOOOgg/OggPacket.h>
class OggStream;
class FLACStream
: public OggStream
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -36,8 +36,8 @@
#include "oggdllstuff.h"
#include "OggDemuxSourcePin.h"
#include "OggStreamMapper.h"
-#include "AutoOggSeekTable.h"
-#include <OggDataBuffer.h>
+#include <libOOOggSeek/AutoOggSeekTable.h>
+#include <libOOOgg/OggDataBuffer.h>
#include "IFilterDataSource.h"
#include "DataSourceFactory.h"
#include "PropsAbout.h"
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -31,8 +31,8 @@
#pragma once
#include "oggdllstuff.h"
#include "StreamHeaders.h"
-#include <OggPage.h>
-#include <IOggCallback.h>
+#include <libOOOgg/OggPage.h>
+#include <libOOOgg/IOggCallback.h>
#include "BasicSeekPassThrough.h"
#include <fstream>
#include "OggDemuxSourceFilter.h"
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggFLAC_1_0_Stream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggFLAC_1_0_Stream.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggFLAC_1_0_Stream.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -31,8 +31,8 @@
#pragma once
#include "oggdllstuff.h"
-#include "OggPage.h"
-#include "OggPacket.h"
+#include <libOOOgg/OggPage.h>
+#include <libOOOgg/OggPacket.h>
class OggStream;
class OggFLAC_1_0_Stream
: public OggStream
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -32,11 +32,11 @@
#include "oggdllstuff.h"
#include "StreamHeaders.h"
-#include "IOggCallback.h"
-#include "IStampedOggPacketSink.h"
-#include "OggPacketiser.h"
+#include <libOOOgg/IOggCallback.h>
+#include <libOOOgg/IStampedOggPacketSink.h>
+#include <libOOOgg/OggPacketiser.h>
-#include "OggPage.h"
+#include <libOOOgg/OggPage.h>
#include <fstream>
using namespace std;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStreamFactory.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStreamFactory.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStreamFactory.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -38,8 +38,8 @@
#include "OggFLAC_1_0_Stream.h"
-#include "OggPage.h"
-#include "OggPacket.h"
+#include <libOOOgg/OggPage.h>
+#include <libOOOgg/OggPacket.h>
class OggDemuxSourceFilter;
class StreamHeaders;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStreamMapper.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStreamMapper.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStreamMapper.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,7 +30,7 @@
//===========================================================================
#pragma once
#include "oggdllstuff.h"
-#include "IOggCallback.h"
+#include <libOOOgg/IOggCallback.h>
#include "OggStream.h"
#include "OggStreamFactory.h"
#include "OggDemuxSourceFilter.h"
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SpeexStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SpeexStream.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SpeexStream.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -31,8 +31,8 @@
#pragma once
#include "oggdllstuff.h"
-#include "OggPage.h"
-#include "OggPacket.h"
+#include <libOOOgg/OggPage.h>
+#include <libOOOgg/OggPacket.h>
class OggStream;
class SpeexStream
: public OggStream
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/StreamHeaders.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/StreamHeaders.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/StreamHeaders.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -32,8 +32,8 @@
#include "oggdllstuff.h"
-#include <IOggPackSource.h>
-#include <StampedOggPacket.h>
+#include <libOOOgg/IOggPackSource.h>
+#include <libOOOgg/StampedOggPacket.h>
//This holds the preliminary headers for a logical stream... then the output pins of the demux can give them to the codec at their leisure.
//The demux will never present these headers again... seeking to the start of the file will seek to the start
//of the data. ie the first page after the headers.
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -32,8 +32,8 @@
#include "oggdllstuff.h"
//#include "FLACMath.h"
-#include "OggPage.h"
-#include "OggPacket.h"
+#include <libOOOgg/OggPage.h>
+#include <libOOOgg/OggPacket.h>
class OggStream;
class TheoraStream
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -32,8 +32,8 @@
#include "oggdllstuff.h"
#include "ds_guids.h"
-#include "OggPacket.h"
-#include "OggPage.h"
+#include <libOOOgg/OggPacket.h>
+#include <libOOOgg/OggPage.h>
#include "OggStream.h"
class OggStream;
class OggDemuxSourceFilter;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\ogg\libOOOgg;..\..\ogg\libOOOggSeek;..\libDirectshowAbstracts;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\ogg;..\..\ogg;..\libDirectshowAbstracts;..\..\..\helper"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX_EXPORTS"
GeneratePreprocessedFile="0"
MinimalRebuild="TRUE"
@@ -85,7 +85,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\ogg\libOOOgg;..\..\ogg\libOOOggSeek;..\libDirectshowAbstracts;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\ogg;..\..\ogg;..\libDirectshowAbstracts;..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX_EXPORTS"
StringPooling="TRUE"
MinimalRebuild="FALSE"
@@ -151,7 +151,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\ogg\libOOOgg;..\..\ogg\libOOOggSeek;..\libDirectshowAbstracts;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\ogg;..\..\ogg;..\libDirectshowAbstracts;..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX_EXPORTS"
StringPooling="TRUE"
MinimalRebuild="FALSE"
@@ -218,7 +218,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\ogg\libOOOgg;..\..\ogg\libOOOggSeek;..\libDirectshowAbstracts;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\ogg;..\..\ogg;..\libDirectshowAbstracts;..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX_EXPORTS"
StringPooling="TRUE"
MinimalRebuild="FALSE"
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/FishSkeleton.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/FishSkeleton.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/FishSkeleton.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -33,7 +33,7 @@
//===========================================================================
#pragma once
#include "oggmuxdllstuff.h"
-#include "OggPage.h"
+#include <libOOOgg/OggPage.h>
class FishSkeleton
{
public:
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -33,15 +33,15 @@
#include "oggmuxdllstuff.h"
#include "OggMuxInputPin.h"
#include "BasicSeekPassThrough.h"
-#include "OggPageInterleaver.h"
-#include "INotifyComplete.h"
+#include <libOOOgg/OggPageInterleaver.h>
+#include <libOOOgg/INotifyComplete.h>
#include <string>
#include <fstream>
-#include "IOggCallback.h"
+#include <libOOOgg/IOggCallback.h>
using namespace std;
-#include "StringHelper.h"
+#include <libilliCore/StringHelper.h>
class OggMuxInputPin;
class OGG_MUX_API OggMuxFilter
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -31,8 +31,8 @@
#pragma once
#include "oggmuxdllstuff.h"
#include "OggMuxFilter.h"
-#include "OggPaginator.h"
-#include "OggMuxStream.h"
+#include <libOOOgg/OggPaginator.h>
+#include <libOOOgg/OggMuxStream.h>
#include "BasicSeekPassThrough.h"
#include "FLACMetadataSplitter.h"
#include <time.h>
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/dsfOggMux.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/dsfOggMux.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/dsfOggMux.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="C:\DXSDK\Include;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\ogg\libOOOgg;..\libDirectshowAbstracts;..\..\..\helper\libilliCore;..\..\..\codecs\flac\libs\libFLACHelper"
+ AdditionalIncludeDirectories="C:\DXSDK\Include;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\ogg;..\libDirectshowAbstracts;..\..\..\helper;..\..\..\codecs\flac\libs\libFLACHelper"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFOGGMUX_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -80,7 +80,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="C:\DXSDK\Include;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\ogg\libOOOgg;..\libDirectshowAbstracts;..\..\..\helper\libilliCore;..\..\..\codecs\flac\libs\libFLACHelper"
+ AdditionalIncludeDirectories="C:\DXSDK\Include;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\ogg;..\libDirectshowAbstracts;..\..\..\helper;..\..\..\codecs\flac\libs\libFLACHelper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFOGGMUX_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -143,7 +143,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="C:\DXSDK\Include;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\ogg\libOOOgg;..\libDirectshowAbstracts;..\..\..\helper\libilliCore;..\..\..\codecs\flac\libs\libFLACHelper"
+ AdditionalIncludeDirectories="C:\DXSDK\Include;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\ogg;..\libDirectshowAbstracts;..\..\..\helper;..\..\..\codecs\flac\libs\libFLACHelper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFOGGMUX_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -207,7 +207,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="C:\DXSDK\Include;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\ogg\libOOOgg;..\libDirectshowAbstracts;..\..\..\helper\libilliCore;..\..\..\codecs\flac\libs\libFLACHelper"
+ AdditionalIncludeDirectories="C:\DXSDK\Include;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\..\ogg;..\libDirectshowAbstracts;..\..\..\helper;..\..\..\codecs\flac\libs\libFLACHelper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFOGGMUX_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/stdafx.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/stdafx.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -42,4 +42,4 @@
// TODO: reference additional headers your program requires here
#include "oggmuxdllstuff.h"
-#include "StringHelper.h"
+#include <libilliCore/StringHelper.h>
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/CircularBuffer.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/CircularBuffer.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/CircularBuffer.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,7 +30,7 @@
//===========================================================================
#include "stdafx.h"
-#include "CircularBuffer.h"
+#include <libOOOgg/CircularBuffer.h>
//Leak checked : 20041017 - OK
CircularBuffer::CircularBuffer(unsigned long inBufferSize)
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/CircularBuffer.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/CircularBuffer.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/CircularBuffer.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -29,8 +29,8 @@
//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//===========================================================================
#pragma once
-#include "dllstuff.h"
-#include "IFIFOBuffer.h"
+#include <libOOOgg/dllstuff.h>
+#include <libOOOgg/IFIFOBuffer.h>
//Empty Buffer
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/IFIFOBuffer.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/IFIFOBuffer.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/IFIFOBuffer.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -29,7 +29,7 @@
//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//===========================================================================
#pragma once
-#include "dllstuff.h"
+#include <libOOOgg/dllstuff.h>
class LIBOOOGG_API IFIFOBuffer {
public:
//Empty Constructor and destructor to ensure proper deletion
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/IOggCallback.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/IOggCallback.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/IOggCallback.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,7 +30,7 @@
//===========================================================================
#pragma once
-#include "OggPage.h"
+#include <libOOOgg/OggPage.h>
//TODO::: Consider changing the return type to allow better feedback.
class LIBOOOGG_API IOggCallback
{
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/IOggPackSource.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/IOggPackSource.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/IOggPackSource.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,7 +30,7 @@
//===========================================================================
#pragma once
-#include "OggPacket.h"
+#include <libOOOgg/OggPacket.h>
class LIBOOOGG_API IOggPackSource
{
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/IStampedOggPacketSink.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/IStampedOggPacketSink.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/IStampedOggPacketSink.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -31,7 +31,7 @@
#pragma once
-#include "StampedOggPacket.h"
+#include <libOOOgg/StampedOggPacket.h>
class LIBOOOGG_API IStampedOggPacketSink
{
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,7 +30,7 @@
//===========================================================================
#include "stdafx.h"
-#include "OggDataBuffer.h"
+#include <libOOOgg/OggDataBuffer.h>
//LEAK CHECKED - 2004/10/17 - OK.
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggDataBuffer.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -31,11 +31,11 @@
#pragma once
//#include <sstream>
-#include "CircularBuffer.h"
-#include "OggPage.h"
-#include "OggTypeDefs.h"
-#include "IOggCallback.h"
-#include "IFIFOBuffer.h"
+#include <libOOOgg/CircularBuffer.h>
+#include <libOOOgg/OggPage.h>
+#include <libOOOgg/OggTypeDefs.h>
+#include <libOOOgg/IOggCallback.h>
+#include <libOOOgg/IFIFOBuffer.h>
//Only needed for debugging
//#include <fstream>
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -29,7 +29,7 @@
//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//===========================================================================
#include "stdafx.h"
-#include "OggMuxStream.h"
+#include <libOOOgg/OggMuxStream.h>
OggMuxStream::OggMuxStream(INotifyArrival* inNotifier)
: mIsEOS(false)
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,9 +30,9 @@
//===========================================================================
#pragma once
-#include "OggPage.h"
-#include "IOggCallback.h"
-#include "INotifyArrival.h"
+#include <libOOOgg/OggPage.h>
+#include <libOOOgg/IOggCallback.h>
+#include <libOOOgg/INotifyArrival.h>
#include <math.h>
#include <deque>
#include <fstream>
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacket.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacket.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacket.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,7 +30,7 @@
//===========================================================================
#include "stdafx.h"
-#include "OggPacket.h"
+#include <libOOOgg/OggPacket.h>
//LEAK CHECK::: 20041018 - OK.
OggPacket::OggPacket(void)
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacket.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacket.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacket.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -33,7 +33,7 @@
#include <string>
using namespace std;
-#include "StringHelper.h"
+#include <libilliCore/StringHelper.h>
class LIBOOOGG_API OggPacket
{
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacketiser.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacketiser.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacketiser.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -29,7 +29,7 @@
//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//===========================================================================
#include "stdafx.h"
-#include "OggPacketiser.h"
+#include <libOOOgg/OggPacketiser.h>
OggPacketiser::OggPacketiser(void)
: mPacketSink(NULL)
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacketiser.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacketiser.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacketiser.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -29,9 +29,9 @@
//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//===========================================================================
#pragma once
-#include "IOggCallback.h"
-#include "IStampedOggPacketSink.h"
-#include "OggPage.h"
+#include <libOOOgg/IOggCallback.h>
+#include <libOOOgg/IStampedOggPacketSink.h>
+#include <libOOOgg/OggPage.h>
//Debug only
#include <fstream>
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPage.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPage.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPage.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,7 +30,7 @@
//===========================================================================
#include "stdafx.h"
-#include "OggPage.h"
+#include <libOOOgg/OggPage.h>
//LEACK CHECKED::: 20041018 - OK.
OggPage::OggPage(void)
{
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPage.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPage.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPage.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -36,9 +36,9 @@
using namespace std;
//Class Includes
-#include "StampedOggPacket.h"
-#include "OggPageHeader.h"
-#include "IOggPackSource.h"
+#include <libOOOgg/StampedOggPacket.h>
+#include <libOOOgg/OggPageHeader.h>
+#include <libOOOgg/IOggPackSource.h>
//OggPage represents an Ogg Encapsulation Format page
class LIBOOOGG_API OggPage
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,7 +30,7 @@
//===========================================================================
#include "stdafx.h"
-#include "OggPageHeader.h"
+#include <libOOOgg/OggPageHeader.h>
OggPageHeader::OggPageHeader(void)
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,8 +30,8 @@
//===========================================================================
#pragma once
-#include "iLE_Math.h"
-#include "StringHelper.h"
+#include <libilliCore/iLE_Math.h>
+#include <libilliCore/StringHelper.h>
//#include "OggSegmentTable.h"
//#include "OggInt64.h"
//#include "OggMath.h"
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -29,7 +29,7 @@
//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//===========================================================================
#include "stdafx.h"
-#include "OggPageInterleaver.h"
+#include <libOOOgg/OggPageInterleaver.h>
OggPageInterleaver::OggPageInterleaver(IOggCallback* inFileWriter, INotifyComplete* inNotifier)
: mFileWriter(inFileWriter)
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -29,9 +29,9 @@
//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//===========================================================================
#pragma once
-#include "IOggCallback.h"
-#include "INotifyComplete.h"
-#include "OggMuxStream.h"
+#include <libOOOgg/IOggCallback.h>
+#include <libOOOgg/INotifyComplete.h>
+#include <libOOOgg/OggMuxStream.h>
#include <vector>
//DEBUG ONLY
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,7 +30,7 @@
//===========================================================================
#include "stdafx.h"
-#include "OggPaginator.h"
+#include <libOOOgg/OggPaginator.h>
//LEAK CHECK::: Potential for leak based on mPendingPage. if setSettings is called. and also the last page won't get deleted. 20041018
//Checksum tables from libogg
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -34,10 +34,10 @@
#undef MIN
#define MIN(a,b) (((a)<(b))?(a):(b))
-#include "IStampedOggPacketSink.h"
-#include "OggPaginatorSettings.h"
-#include "IOggCallback.h"
-#include "StampedOggPacket.h"
+#include <libOOOgg/IStampedOggPacketSink.h>
+#include <libOOOgg/OggPaginatorSettings.h>
+#include <libOOOgg/IOggCallback.h>
+#include <libOOOgg/StampedOggPacket.h>
#include <fstream>
using namespace std;
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,7 +30,7 @@
//===========================================================================
#include "stdafx.h"
-#include "OggPaginatorSettings.h"
+#include <libOOOgg/OggPaginatorSettings.h>
OggPaginatorSettings::OggPaginatorSettings(void)
: mSerialNo(0)
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,7 +30,7 @@
//===========================================================================
#pragma once
-#include "StringHelper.h"
+#include <libilliCore/StringHelper.h>
class LIBOOOGG_API OggPaginatorSettings
{
public:
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggTypeDefs.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggTypeDefs.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggTypeDefs.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -31,5 +31,5 @@
//Callback function for oggpages.
#pragma once
-#include "OggPage.h"
+#include <libOOOgg/OggPage.h>
typedef bool (*fPageCallback) (OggPage* inOggPage);
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/StampedOggPacket.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/StampedOggPacket.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/StampedOggPacket.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,7 +30,7 @@
//===========================================================================
#include "stdafx.h"
-#include "StampedOggPacket.h"
+#include <libOOOgg/StampedOggPacket.h>
StampedOggPacket::StampedOggPacket(void)
//: OggPacket()
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/StampedOggPacket.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/StampedOggPacket.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/StampedOggPacket.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -31,7 +31,7 @@
#pragma once
#include "stdafx.h"
-#include "OggPacket.h"
+#include <libOOOgg/OggPacket.h>
class LIBOOOGG_API StampedOggPacket
: public OggPacket
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -33,7 +33,7 @@
//
#include "stdafx.h"
-#include "libOOOgg.h"
+#include <libOOOgg/libOOOgg.h>
BOOL APIENTRY DllMain( HANDLE hModule,
DWORD ul_reason_for_call,
LPVOID lpReserved
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,25 +30,25 @@
//===========================================================================
#pragma once
-#include "dllstuff.h"
+#include <libOOOgg/dllstuff.h>
-#include "OggTypeDefs.h"
-#include "IOggCallback.h"
-#include "IStampedOggPacketSink.h"
+#include <libOOOgg/OggTypeDefs.h>
+#include <libOOOgg/IOggCallback.h>
+#include <libOOOgg/IStampedOggPacketSink.h>
-#include "OggPageHeader.h"
-#include "OggPage.h"
-#include "OggPacket.h"
-#include "StampedOggPacket.h"
+#include <libOOOgg/OggPageHeader.h>
+#include <libOOOgg/OggPage.h>
+#include <libOOOgg/OggPacket.h>
+#include <libOOOgg/StampedOggPacket.h>
-#include "OggPacketiser.h"
-#include "OggPaginatorSettings.h"
-#include "OggPaginator.h"
-#include "OggPageInterleaver.h"
+#include <libOOOgg/OggPacketiser.h>
+#include <libOOOgg/OggPaginatorSettings.h>
+#include <libOOOgg/OggPaginator.h>
+#include <libOOOgg/OggPageInterleaver.h>
-#include "OggDataBuffer.h"
+#include <libOOOgg/OggDataBuffer.h>
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..;..\..\..\helper"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBOOOGG_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -77,7 +77,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..;..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBOOOGG_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -139,7 +139,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..;..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBOOOGG_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -201,7 +201,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..;..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBOOOGG_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/stdafx.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/stdafx.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -40,7 +40,7 @@
// any program that uses these libraries must already have the headers for the stl classes. They
// are not exposed by the dll itself.
#pragma warning (disable:4251)
-#include "dllstuff.h"
+#include <libOOOgg/dllstuff.h>
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoAnxSeekTable.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoAnxSeekTable.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoAnxSeekTable.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -1,5 +1,5 @@
#include "stdafx.h"
-#include "AutoAnxSeekTable.h"
+#include <libOOOggSeek/AutoAnxSeekTable.h>
AutoAnxSeekTable::AutoAnxSeekTable(string inFileName)
: AutoOggSeekTable(inFileName)
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoAnxSeekTable.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoAnxSeekTable.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoAnxSeekTable.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -1,8 +1,8 @@
#pragma once
-#include "libOOOggSeek.h"
+#include <libOOOggSeek/libOOOggSeek.h>
-#include "AutoOggSeekTable.h"
+#include <libOOOggSeek/AutoOggSeekTable.h>
#include <string>
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,7 +30,7 @@
//===========================================================================
#include "stdafx.h"
-#include "AutoOggSeekTable.h"
+#include <libOOOggSeek/AutoOggSeekTable.h>
AutoOggSeekTable::AutoOggSeekTable(string inFileName)
: mFilePos(0)
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -31,15 +31,15 @@
#pragma once
-#include "iBE_Math.h"
-#include "iLE_Math.h"
+#include <libilliCore/iBE_Math.h>
+#include <libilliCore/iLE_Math.h>
-#include "libOOOgg.h"
-#include "libOOOggSeek.h"
+#include <libOOOgg/libOOOgg.h>
+#include <libOOOggSeek/libOOOggSeek.h>
-#include "IOggCallback.h"
-#include "OggDataBuffer.h"
-#include "OggSeekTable.h"
+#include <libOOOgg/IOggCallback.h>
+#include <libOOOgg/OggDataBuffer.h>
+#include <libOOOggSeek/OggSeekTable.h>
//#include "FLACMath.h"
#include "math.h"
#include <fstream>
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/IOggSeeker.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/IOggSeeker.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/IOggSeeker.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -1,6 +1,6 @@
#pragma once
-#include "libOOOggSeek.h"
+#include <libOOOggSeek/libOOOggSeek.h>
class IOggSeeker {
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OGGSRecogniser.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OGGSRecogniser.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OGGSRecogniser.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -1,5 +1,5 @@
#include "stdafx.h"
-#include "OGGSRecogniser.h"
+#include <libOOOggSeek/OGGSRecogniser.h>
OGGSRecogniser::OGGSRecogniser(void)
: mState(OGGSRecogniser::STATE_START)
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekPoint.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekPoint.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekPoint.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,7 +30,7 @@
//===========================================================================
#include "stdafx.h"
-#include "OggSeekPoint.h"
+#include <libOOOggSeek/OggSeekPoint.h>
OggSeekPoint::OggSeekPoint(void)
: mTime(0)
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekPoint.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekPoint.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekPoint.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -31,8 +31,8 @@
#pragma once
-#include "libilliCore.h"
-#include "libOOOggSeek.h"
+#include <libilliCore/libilliCore.h>
+#include <libOOOggSeek/libOOOggSeek.h>
class OggSeekPoint
{
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,7 +30,7 @@
//===========================================================================
#include "stdafx.h"
-#include "OggSeekTable.h"
+#include <libOOOggSeek/OggSeekTable.h>
OggSeekTable::OggSeekTable(void)
: mEnabled(true)
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -31,8 +31,8 @@
#pragma once
-#include "libilliCore.h"
-#include "libOOOggSeek.h"
+#include <libilliCore/libilliCore.h>
+#include <libOOOggSeek/libOOOggSeek.h>
#include <fstream>
#include <map>
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/libOOOggSeek.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/libOOOggSeek.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/libOOOggSeek.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -33,7 +33,7 @@
//
#include "stdafx.h"
-#include "libOOOggSeek.h"
+#include <libOOOggSeek/libOOOggSeek.h>
BOOL APIENTRY DllMain( HANDLE hModule,
DWORD ul_reason_for_call,
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/libOOOggSeek.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/libOOOggSeek.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/libOOOggSeek.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\libOOOgg;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..;..\..\..\helper"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBOOOGGSEEK_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -77,7 +77,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\libOOOgg;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..;..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBOOOGGSEEK_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -137,7 +137,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\libOOOgg;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..;..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBOOOGGSEEK_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -198,7 +198,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\libOOOgg;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..;..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBOOOGGSEEK_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/stdafx.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/stdafx.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -42,4 +42,4 @@
# include <windows.h>
#endif
-#include "libOOOggSeek.h"
+#include <libOOOggSeek/libOOOggSeek.h>
Modified: trunk/oggdsf/src/lib/core/ogg/libVorbisComment/FileComments.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisComment/FileComments.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisComment/FileComments.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,10 +30,10 @@
//===========================================================================
#pragma once
-#include "IOggCallback.h"
+#include <libOOOgg/IOggCallback.h>
#include "StreamCommentInfo.h"
-#include "OggPage.h"
-#include "OggDataBuffer.h"
+#include <libOOOgg/OggPage.h>
+#include <libOOOgg/OggDataBuffer.h>
#include <string>
#include <vector>
#include <fstream>
Modified: trunk/oggdsf/src/lib/core/ogg/libVorbisComment/VorbisComments.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisComment/VorbisComments.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisComment/VorbisComments.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -36,8 +36,8 @@
using namespace std;
#include "SingleVorbisComment.h"
-#include "OggPacket.h"
-#include "iLE_Math.h"
+#include <libOOOgg/OggPacket.h>
+#include <libilliCore/iLE_Math.h>
class LIBVORBISCOMMENT_API VorbisComments
{
Modified: trunk/oggdsf/src/lib/core/ogg/libVorbisComment/libVorbisComment.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisComment/libVorbisComment.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisComment/libVorbisComment.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\libOOOgg;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..;..\..\..\helper"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBVORBISCOMMENT_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -78,7 +78,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\libOOOgg;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..;..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBISCOMMENT_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -140,7 +140,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\libOOOgg;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..;..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBISCOMMENT_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -203,7 +203,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\libOOOgg;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..;..\..\..\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBISCOMMENT_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNFileComments.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNFileComments.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNFileComments.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -1,6 +1,6 @@
#pragma once
#pragma unmanaged
-#include "dllstuff.h"
+#include <libOOOgg/dllstuff.h>
#include "libVorbisComment/FileComments.h"
#pragma managed
Modified: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNStreamCommentInfo.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNStreamCommentInfo.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNStreamCommentInfo.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -1,7 +1,7 @@
#pragma once
#pragma unmanaged
-#include "dllstuff.h"
+#include <libOOOgg/dllstuff.h>
#include "libVorbisComment/VorbisComments.h"
#include "libVorbisComment/StreamCommentInfo.h"
Modified: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNVorbisComments.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNVorbisComments.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNVorbisComments.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -1,6 +1,6 @@
#pragma once
#pragma unmanaged
-#include "dllstuff.h"
+#include <libOOOgg/dllstuff.h>
#include "libVorbisComment/VorbisComments.h"
#pragma managed
Modified: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/libVorbisCommentDotNET.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/libVorbisCommentDotNET.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/libVorbisCommentDotNET.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/Zl"
Optimization="0"
- AdditionalIncludeDirectories="..;..\libOOOgg;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..;..;..\..\..\helper"
AdditionalUsingDirectories="..\..\..\helper\libiWrapper\Debug"
PreprocessorDefinitions="WIN32;_DEBUG"
MinimalRebuild="FALSE"
@@ -81,7 +81,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..;..\libOOOgg;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..;..;..\..\..\helper"
AdditionalUsingDirectories="..\..\..\helper\libiWrapper\Release"
PreprocessorDefinitions="WIN32;NDEBUG"
MinimalRebuild="FALSE"
@@ -141,7 +141,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..;..\libOOOgg;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..;..;..\..\..\helper"
AdditionalUsingDirectories="..\..\..\helper\libiWrapper\Release"
PreprocessorDefinitions="WIN32;NDEBUG"
MinimalRebuild="FALSE"
@@ -202,7 +202,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..;..\libOOOgg;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..;..;..\..\..\helper"
AdditionalUsingDirectories="..\..\..\helper\libiWrapper\Release"
PreprocessorDefinitions="WIN32;NDEBUG"
MinimalRebuild="FALSE"
Modified: trunk/oggdsf/src/lib/helper/iDSHelper/DSStringer.cpp
===================================================================
--- trunk/oggdsf/src/lib/helper/iDSHelper/DSStringer.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/helper/iDSHelper/DSStringer.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -1,6 +1,6 @@
#include "stdafx.h"
#include ".\dsstringer.h"
-#include "StringHelper.h"
+#include <libilliCore/StringHelper.h>
string DSStringer::GUID2String(const GUID* inGUID) {
string retStr = "{" + StringHelper::numToString(inGUID->Data1) +
"-" + StringHelper::numToString(inGUID->Data2) +
Modified: trunk/oggdsf/src/lib/helper/iDSHelper/iDSHelper.vcproj
===================================================================
--- trunk/oggdsf/src/lib/helper/iDSHelper/iDSHelper.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/helper/iDSHelper/iDSHelper.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\libilliCore"
+ AdditionalIncludeDirectories=".."
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IDSHELPER_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -69,7 +69,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\libilliCore"
+ AdditionalIncludeDirectories=".."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IDSHELPER_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
Modified: trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.cpp
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,7 +30,7 @@
//===========================================================================
#include "stdafx.h"
-#include "StringHelper.h"
+#include <libilliCore/StringHelper.h>
StringHelper::StringHelper(void)
{
Modified: trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.h
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -31,7 +31,7 @@
#pragma once
-#include "illicoreconfig.h"
+#include <libilliCore/illicoreconfig.h>
#include <string>
Modified: trunk/oggdsf/src/lib/helper/libilliCore/iBE_Math.cpp
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/iBE_Math.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/helper/libilliCore/iBE_Math.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,7 +30,7 @@
//===========================================================================
#include "stdafx.h"
-#include "iBE_Math.h"
+#include <libilliCore/iBE_Math.h>
iBE_Math::iBE_Math(void)
{
Modified: trunk/oggdsf/src/lib/helper/libilliCore/iBE_Math.h
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/iBE_Math.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/helper/libilliCore/iBE_Math.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,7 +30,7 @@
//===========================================================================
#pragma once
-#include "illicoreconfig.h"
+#include <libilliCore/illicoreconfig.h>
class iBE_Math
{
public:
Modified: trunk/oggdsf/src/lib/helper/libilliCore/iLE_Math.cpp
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/iLE_Math.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/helper/libilliCore/iLE_Math.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,7 +30,7 @@
//===========================================================================
#include "stdafx.h"
-#include "iLE_Math.h"
+#include <libilliCore/iLE_Math.h>
iLE_Math::iLE_Math(void)
{
Modified: trunk/oggdsf/src/lib/helper/libilliCore/iLE_Math.h
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/iLE_Math.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/helper/libilliCore/iLE_Math.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -30,7 +30,7 @@
//===========================================================================
#pragma once
-#include "illicoreconfig.h"
+#include <libilliCore/illicoreconfig.h>
class iLE_Math
{
Modified: trunk/oggdsf/src/lib/helper/libilliCore/libilliCore.vcproj
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/libilliCore.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/helper/libilliCore/libilliCore.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,6 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
+ AdditionalIncludeDirectories=".."
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBILLICORE_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
Modified: trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayer.vcproj
===================================================================
--- trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayer.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayer.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -20,7 +20,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\codecs\cmml\dsfCMMLDecoder;..\..\codecs\cmml\libCMMLTags;C:\DXSDK\Include;..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\codecs\cmml\dsfCMMLDecoder;..\..\codecs\cmml\libCMMLTags;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\libilliCore"
+ AdditionalIncludeDirectories="..\..\codecs\cmml\dsfCMMLDecoder;..\..\codecs\cmml\libCMMLTags;C:\DXSDK\Include;..\..\helper"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL"
RuntimeLibrary="2"
TreatWChar_tAsBuiltInType="TRUE"
Modified: trunk/oggdsf/src/tests/testCircleBuffer/testCircleBuffer.cpp
===================================================================
--- trunk/oggdsf/src/tests/testCircleBuffer/testCircleBuffer.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tests/testCircleBuffer/testCircleBuffer.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -2,7 +2,7 @@
//
#include "stdafx.h"
-#include "CircularBuffer.h"
+#include <libOOOgg/CircularBuffer.h>
#include <iostream>
using namespace std;
Modified: trunk/oggdsf/src/tests/testCircleBuffer/testCircleBuffer.vcproj
===================================================================
--- trunk/oggdsf/src/tests/testCircleBuffer/testCircleBuffer.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tests/testCircleBuffer/testCircleBuffer.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -77,7 +77,7 @@
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
OptimizeForWindowsApplication="TRUE"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
@@ -135,7 +135,7 @@
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
OptimizeForWindowsApplication="TRUE"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="2"
@@ -194,7 +194,7 @@
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
OptimizeForWindowsApplication="TRUE"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="1"
Modified: trunk/oggdsf/src/tests/testLibOOOgg/OggPageFileWriter.h
===================================================================
--- trunk/oggdsf/src/tests/testLibOOOgg/OggPageFileWriter.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tests/testLibOOOgg/OggPageFileWriter.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -1,10 +1,10 @@
#pragma once
-//#include "dllstuff.h"
-#include "libOOOgg.h"
+//#include <libOOOgg/dllstuff.h>
+#include <libOOOgg/libOOOgg.h>
#include <fstream>
using namespace std;
-//#include "IOggCallback.h"
+//#include <libOOOgg/IOggCallback.h>
class OggPageFileWriter
: public IOggCallback
{
Modified: trunk/oggdsf/src/tests/testLibOOOgg/TestPatternOggPacketChecker.h
===================================================================
--- trunk/oggdsf/src/tests/testLibOOOgg/TestPatternOggPacketChecker.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tests/testLibOOOgg/TestPatternOggPacketChecker.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -1,6 +1,6 @@
#pragma once
-#include "IStampedOggPacketSink.h"
+#include <libOOOgg/IStampedOggPacketSink.h>
class TestPatternOggPacketChecker
: public IStampedOggPacketSink
{
Modified: trunk/oggdsf/src/tests/testLibOOOgg/TestPatternOggPageChecker.h
===================================================================
--- trunk/oggdsf/src/tests/testLibOOOgg/TestPatternOggPageChecker.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tests/testLibOOOgg/TestPatternOggPageChecker.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -1,6 +1,6 @@
#pragma once
-#include "IOggCallback.h"
+#include <libOOOgg/IOggCallback.h>
#include "TestPatternOggPacketChecker.h"
class TestPatternOggPageChecker
: public IOggCallback
Modified: trunk/oggdsf/src/tests/testLibOOOgg/stdafx.h
===================================================================
--- trunk/oggdsf/src/tests/testLibOOOgg/stdafx.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tests/testLibOOOgg/stdafx.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -8,6 +8,6 @@
#include <iostream>
#include <tchar.h>
-#include "dllstuff.h"
-#include "libOOOgg.h"
+#include <libOOOgg/dllstuff.h>
+#include <libOOOgg/libOOOgg.h>
// TODO: reference additional headers your program requires here
Modified: trunk/oggdsf/src/tests/testLibOOOgg/testLibOOOgg.vcproj
===================================================================
--- trunk/oggdsf/src/tests/testLibOOOgg/testLibOOOgg.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tests/testLibOOOgg/testLibOOOgg.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;..\..\lib\helper"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -68,7 +68,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;..\..\lib\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
Modified: trunk/oggdsf/src/tests/testMuxDemux/OggPageFileWriter.h
===================================================================
--- trunk/oggdsf/src/tests/testMuxDemux/OggPageFileWriter.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tests/testMuxDemux/OggPageFileWriter.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -1,10 +1,10 @@
#pragma once
-//#include "dllstuff.h"
-#include "libOOOgg.h"
+//#include <libOOOgg/dllstuff.h>
+#include <libOOOgg/libOOOgg.h>
#include <fstream>
using namespace std;
-//#include "IOggCallback.h"
+//#include <libOOOgg/IOggCallback.h>
class OggPageFileWriter
: public IOggCallback
{
Modified: trunk/oggdsf/src/tests/testMuxDemux/testMuxDemux.cpp
===================================================================
--- trunk/oggdsf/src/tests/testMuxDemux/testMuxDemux.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tests/testMuxDemux/testMuxDemux.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -33,8 +33,8 @@
//
#include "stdafx.h"
-#include "libOOOgg.h"
-#include "dllstuff.h"
+#include <libOOOgg/libOOOgg.h>
+#include <libOOOgg/dllstuff.h>
#include "OggPageFileWriter.h"
#include <iostream>
Modified: trunk/oggdsf/src/tests/testMuxDemux/testMuxDemux.vcproj
===================================================================
--- trunk/oggdsf/src/tests/testMuxDemux/testMuxDemux.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tests/testMuxDemux/testMuxDemux.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;..\..\lib\helper"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -68,7 +68,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;..\..\lib\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
Modified: trunk/oggdsf/src/tests/testlibOOOggSpeed1/testlibOOOggSpeed1.vcproj
===================================================================
--- trunk/oggdsf/src/tests/testlibOOOggSpeed1/testlibOOOggSpeed1.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tests/testlibOOOggSpeed1/testlibOOOggSpeed1.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;.;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;.;..\..\lib\helper"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -67,7 +67,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;.;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;.;..\..\lib\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
Modified: trunk/oggdsf/src/tools/AnxCutter/AnxCutter.cpp
===================================================================
--- trunk/oggdsf/src/tools/AnxCutter/AnxCutter.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/AnxCutter/AnxCutter.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -36,9 +36,9 @@
//
#include "stdafx.h"
-#include "libOOOgg.h"
-#include "dllstuff.h"
-#include "AutoAnxSeekTable.h"
+#include <libOOOgg/libOOOgg.h>
+#include <libOOOgg/dllstuff.h>
+#include <libOOOggSeek/AutoAnxSeekTable.h>
#include <iostream>
#include <fstream>
Modified: trunk/oggdsf/src/tools/AnxCutter/AnxCutter.vcproj
===================================================================
--- trunk/oggdsf/src/tools/AnxCutter/AnxCutter.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/AnxCutter/AnxCutter.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;.;..\..\lib\helper\libilliCore;..\..\lib\core\ogg\libOOOggSeek"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;.;..\..\lib\helper;..\..\lib\core\ogg"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -68,7 +68,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;.;..\..\lib\helper\libilliCore;..\..\lib\core\ogg\libOOOggSeek"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;.;..\..\lib\helper;..\..\lib\core\ogg"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
Modified: trunk/oggdsf/src/tools/OOOggCommentDump/OOOggCommentDump.cpp
===================================================================
--- trunk/oggdsf/src/tools/OOOggCommentDump/OOOggCommentDump.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/OOOggCommentDump/OOOggCommentDump.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -34,8 +34,8 @@
//
#include "stdafx.h"
-#include <libOOOgg.h>
-#include <dllstuff.h>
+#include <libOOOgg/libOOOgg.h>
+#include <libOOOgg/dllstuff.h>
#include <VorbisComments.h>
#include "FileComments.h"
#include "StreamCommentInfo.h"
Modified: trunk/oggdsf/src/tools/OOOggCommentDump/OOOggCommentDump.vcproj
===================================================================
--- trunk/oggdsf/src/tools/OOOggCommentDump/OOOggCommentDump.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/OOOggCommentDump/OOOggCommentDump.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;..\..\lib\core\ogg\libVorbisComment;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;..\..\lib\core\ogg\libVorbisComment;..\..\lib\helper"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -79,7 +79,7 @@
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
OptimizeForWindowsApplication="TRUE"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;..\..\lib\core\ogg\libVorbisComment;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;..\..\lib\core\ogg\libVorbisComment;..\..\lib\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -141,7 +141,7 @@
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
OptimizeForWindowsApplication="TRUE"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;..\..\lib\core\ogg\libVorbisComment;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;..\..\lib\core\ogg\libVorbisComment;..\..\lib\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -204,7 +204,7 @@
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
OptimizeForWindowsApplication="TRUE"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;..\..\lib\core\ogg\libVorbisComment;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;..\..\lib\core\ogg\libVorbisComment;..\..\lib\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/tools/OOOggDump/OOOggDump.cpp
===================================================================
--- trunk/oggdsf/src/tools/OOOggDump/OOOggDump.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/OOOggDump/OOOggDump.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -33,8 +33,8 @@
//
#include "stdafx.h"
-#include <libOOOgg.h>
-#include <dllstuff.h>
+#include <libOOOgg/libOOOgg.h>
+#include <libOOOgg/dllstuff.h>
#include <iostream>
#include <fstream>
Modified: trunk/oggdsf/src/tools/OOOggDump/OOOggDump.vcproj
===================================================================
--- trunk/oggdsf/src/tools/OOOggDump/OOOggDump.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/OOOggDump/OOOggDump.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;.;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;.;..\..\lib\helper"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -78,7 +78,7 @@
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
OptimizeForWindowsApplication="TRUE"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;.;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;.;..\..\lib\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -139,7 +139,7 @@
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
OptimizeForWindowsApplication="TRUE"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;.;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;.;..\..\lib\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -200,7 +200,7 @@
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
OptimizeForWindowsApplication="TRUE"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;.;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;.;..\..\lib\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/tools/OOOggPacketise/OOOggPacketise.vcproj
===================================================================
--- trunk/oggdsf/src/tools/OOOggPacketise/OOOggPacketise.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/OOOggPacketise/OOOggPacketise.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;..\..\lib\helper"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -74,7 +74,7 @@
EnableIntrinsicFunctions="TRUE"
FavorSizeOrSpeed="1"
OptimizeForProcessor="2"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;..\..\lib\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
Modified: trunk/oggdsf/src/tools/OOOggPageInfo/OOOggPageInfo.cpp
===================================================================
--- trunk/oggdsf/src/tools/OOOggPageInfo/OOOggPageInfo.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/OOOggPageInfo/OOOggPageInfo.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -33,8 +33,8 @@
//
#include "stdafx.h"
-#include <libOOOgg.h>
-#include <dllstuff.h>
+#include <libOOOgg/libOOOgg.h>
+#include <libOOOgg/dllstuff.h>
#include <iostream>
#include <fstream>
Modified: trunk/oggdsf/src/tools/OOOggPageInfo/OOOggPageInfo.vcproj
===================================================================
--- trunk/oggdsf/src/tools/OOOggPageInfo/OOOggPageInfo.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/OOOggPageInfo/OOOggPageInfo.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;.;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;.;..\..\lib\helper"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -68,7 +68,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;.;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;.;..\..\lib\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
Modified: trunk/oggdsf/src/tools/OOOggSeekFileMaker/OOOggSeekFileMaker.cpp
===================================================================
--- trunk/oggdsf/src/tools/OOOggSeekFileMaker/OOOggSeekFileMaker.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/OOOggSeekFileMaker/OOOggSeekFileMaker.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -33,8 +33,8 @@
//
#include "stdafx.h"
-#include "AutoOggSeekTable.h"
-#include "AutoAnxSeekTable.h"
+#include <libOOOggSeek/AutoOggSeekTable.h>
+#include <libOOOggSeek/AutoAnxSeekTable.h>
#include <iostream>
Modified: trunk/oggdsf/src/tools/OOOggSeekFileMaker/OOOggSeekFileMaker.vcproj
===================================================================
--- trunk/oggdsf/src/tools/OOOggSeekFileMaker/OOOggSeekFileMaker.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/OOOggSeekFileMaker/OOOggSeekFileMaker.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;.;..\..\lib\helper\libilliCore;..\..\lib\core\ogg\libOOOggSeek"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;.;..\..\lib\helper;..\..\lib\core\ogg"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -68,7 +68,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;.;..\..\lib\helper\libilliCore;..\..\lib\core\ogg\libOOOggSeek"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;.;..\..\lib\helper;..\..\lib\core\ogg"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
Modified: trunk/oggdsf/src/tools/OOOggSeekFileQuery/OOOggSeekFileQuery.cpp
===================================================================
--- trunk/oggdsf/src/tools/OOOggSeekFileQuery/OOOggSeekFileQuery.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/OOOggSeekFileQuery/OOOggSeekFileQuery.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -5,10 +5,10 @@
#include "stdafx.h"
-#include "illicoreconfig.h"
-#include "iLE_Math.h"
-#include "StringHelper.h"
-#include "OggSeekTable.h"
+#include <libilliCore/illicoreconfig.h>
+#include <libilliCore/iLE_Math.h>
+#include <libilliCore/StringHelper.h>
+#include <libOOOggSeek/OggSeekTable.h>
#include <iostream>
#include <fstream>
using namespace std;
Modified: trunk/oggdsf/src/tools/OOOggSeekFileQuery/OOOggSeekFileQuery.vcproj
===================================================================
--- trunk/oggdsf/src/tools/OOOggSeekFileQuery/OOOggSeekFileQuery.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/OOOggSeekFileQuery/OOOggSeekFileQuery.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;.;..\..\lib\helper\libilliCore;..\..\lib\core\ogg\libOOOggSeek"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;.;..\..\lib\helper;..\..\lib\core\ogg"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -68,7 +68,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;.;..\..\lib\helper\libilliCore;..\..\lib\core\ogg\libOOOggSeek"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;.;..\..\lib\helper;..\..\lib\core\ogg"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
Modified: trunk/oggdsf/src/tools/OOOggSeekFileReader/OOOggSeekFileReader.cpp
===================================================================
--- trunk/oggdsf/src/tools/OOOggSeekFileReader/OOOggSeekFileReader.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/OOOggSeekFileReader/OOOggSeekFileReader.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -3,8 +3,8 @@
#include "stdafx.h"
-#include "illicoreconfig.h"
-#include "iLE_Math.h"
+#include <libilliCore/illicoreconfig.h>
+#include <libilliCore/iLE_Math.h>
#include <iostream>
#include <fstream>
using namespace std;
Modified: trunk/oggdsf/src/tools/OOOggSeekFileReader/OOOggSeekFileReader.vcproj
===================================================================
--- trunk/oggdsf/src/tools/OOOggSeekFileReader/OOOggSeekFileReader.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/OOOggSeekFileReader/OOOggSeekFileReader.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\helper"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -68,7 +68,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
Modified: trunk/oggdsf/src/tools/OOOggStat/OOOggStat.cpp
===================================================================
--- trunk/oggdsf/src/tools/OOOggStat/OOOggStat.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/OOOggStat/OOOggStat.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -33,8 +33,8 @@
//
#include "stdafx.h"
-#include <libOOOgg.h>
-#include <dllstuff.h>
+#include <libOOOgg/libOOOgg.h>
+#include <libOOOgg/dllstuff.h>
#include <iostream>
Modified: trunk/oggdsf/src/tools/OOOggStat/OOOggStat.vcproj
===================================================================
--- trunk/oggdsf/src/tools/OOOggStat/OOOggStat.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/OOOggStat/OOOggStat.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;..\..\lib\helper"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -77,7 +77,7 @@
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
OptimizeForWindowsApplication="TRUE"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;..\..\lib\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -137,7 +137,7 @@
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
OptimizeForWindowsApplication="TRUE"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;..\..\lib\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -198,7 +198,7 @@
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
OptimizeForWindowsApplication="TRUE"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;..\..\lib\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/tools/OOOggValidate/OOOggValidate.cpp
===================================================================
--- trunk/oggdsf/src/tools/OOOggValidate/OOOggValidate.cpp 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/OOOggValidate/OOOggValidate.cpp 2004-12-25 17:26:38 UTC (rev 8535)
@@ -3,7 +3,7 @@
#include "stdafx.h"
#include "OggValidationState.h"
-#include "libOOOgg.h"
+#include <libOOOgg/libOOOgg.h>
#include <fstream>
using namespace std;
Modified: trunk/oggdsf/src/tools/OOOggValidate/OOOggValidate.vcproj
===================================================================
--- trunk/oggdsf/src/tools/OOOggValidate/OOOggValidate.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/OOOggValidate/OOOggValidate.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;..\..\lib\helper"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -77,7 +77,7 @@
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
OptimizeForWindowsApplication="TRUE"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;..\..\lib\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
@@ -135,7 +135,7 @@
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
OptimizeForWindowsApplication="TRUE"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;..\..\lib\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="2"
@@ -194,7 +194,7 @@
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
OptimizeForWindowsApplication="TRUE"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;..\..\lib\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;..\..\lib\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="1"
Modified: trunk/oggdsf/src/tools/OOOggValidate/OggStreamValidationState.h
===================================================================
--- trunk/oggdsf/src/tools/OOOggValidate/OggStreamValidationState.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/OOOggValidate/OggStreamValidationState.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -1,6 +1,6 @@
#pragma once
-#include <libilliCore.h>
+#include <libilliCore/libilliCore.h>
class OggStreamValidationState
{
Modified: trunk/oggdsf/src/tools/OOOggValidate/OggValidationState.h
===================================================================
--- trunk/oggdsf/src/tools/OOOggValidate/OggValidationState.h 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/OOOggValidate/OggValidationState.h 2004-12-25 17:26:38 UTC (rev 8535)
@@ -2,7 +2,7 @@
#include <vector>
using namespace std;
-#include "libOOOgg.h"
+#include <libOOOgg/libOOOgg.h>
#include "OggStreamValidationState.h"
class OggValidationState
: public IOggCallback
Modified: trunk/oggdsf/src/tools/oggChainSplitter/oggChainSplitter.vcproj
===================================================================
--- trunk/oggdsf/src/tools/oggChainSplitter/oggChainSplitter.vcproj 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/src/tools/oggChainSplitter/oggChainSplitter.vcproj 2004-12-25 17:26:38 UTC (rev 8535)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;..\..\lib\helper\libilliCore;..\..\lib\core\ogg\libVorbisComment"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;..\..\lib\helper;..\..\lib\core\ogg\libVorbisComment"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -68,7 +68,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;..\..\lib\helper\libilliCore;..\..\lib\core\ogg\libVorbisComment"
+ AdditionalIncludeDirectories="..\..\lib\core\ogg;..\..\lib\helper;..\..\lib\core\ogg\libVorbisComment"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
Modified: trunk/oggdsf/unix/Makefile.am
===================================================================
--- trunk/oggdsf/unix/Makefile.am 2004-12-25 16:31:13 UTC (rev 8534)
+++ trunk/oggdsf/unix/Makefile.am 2004-12-25 17:26:38 UTC (rev 8535)
@@ -44,7 +44,7 @@
../src/lib/core/ogg/libOOOggSeek/OGGSRecogniser.cpp \
$(NULL)
-libOOOggSeekdir = $(includedir)
+libOOOggSeekdir = $(includedir)/libOOOggSeek
libOOOggSeek_HEADERS = \
../src/lib/core/ogg/libOOOggSeek/AutoAnxSeekTable.h \
../src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.h \
@@ -70,7 +70,7 @@
../src/lib/helper/libilliCore/iBE_Math.cpp \
../src/lib/helper/libilliCore/iLE_Math.cpp \
$(NULL)
-libilliCoredir = $(includedir)
+libilliCoredir = $(includedir)/libilliCore
libilliCore_HEADERS = \
../src/lib/helper/libilliCore/config.h \
../src/lib/helper/libilliCore/iBE_Math.h \
@@ -94,7 +94,7 @@
../src/lib/core/ogg/libOOOgg/OggPaginatorSettings.cpp \
../src/lib/core/ogg/libOOOgg/StampedOggPacket.cpp \
$(NULL)
-libOOOggdir = $(includedir)
+libOOOggdir = $(includedir)/libOOOgg
libOOOgg_HEADERS = \
../src/lib/core/ogg/libOOOgg/CircularBuffer.h \
../src/lib/core/ogg/libOOOgg/dllstuff.h \
More information about the commits
mailing list