Commit 51620137 authored by conrad's avatar conrad

Allow compilation of the library on win32 using Visual Studio 2003 and 2005.

The project files have been updated to fix previous errors with compiling
using both of these IDEs.
Patch by Barry Duncan, and regenerated by ogg.k.ogg.k

git-svn-id: http://svn.annodex.net/liboggz/trunk@3835 8158c8cd-e7e1-0310-9fa4-c5954c97daef
parent a273b007
/*
dirac.c
*/
#include "config.h"
#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
#include "dirac.h"
typedef struct
dirac_bs_s
{
......@@ -106,7 +112,6 @@ dirac_bool ( dirac_bs_t *p_bs )
void
dirac_parse_info (dirac_info *info, unsigned char * data, long len)
{
char * buf;
dirac_bs_t bs;
ogg_uint32_t video_format;
......@@ -182,5 +187,4 @@ dirac_parse_info (dirac_info *info, unsigned char * data, long len)
info->fps_denominator = dirac_uint( &bs );
}
}
}
}
\ No newline at end of file
......@@ -40,7 +40,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libogg.lib"
OutputFile="$(OutDir)/liboggz.dll"
OutputFile="$(OutDir)/$(ProjectName).dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="$(OutDir)"
......@@ -59,7 +59,8 @@
<Tool
Name="VCPostBuildEventTool"
Description="Copy libogg to output directory"
CommandLine="copy ..\..\..\libogg\win32\Dynamic_Release\ogg.dll .\Release"/>
CommandLine="copy ..\..\..\libogg\win32\Dynamic_Release\ogg.dll .\Release"
ExcludedFromBuild="TRUE"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
......@@ -150,6 +151,9 @@
<Filter
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
<File
RelativePath="..\..\..\src\liboggz\dirac.c">
</File>
<File
RelativePath="..\..\liboggz.def">
</File>
......
......@@ -22,7 +22,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\libogg\include\;..\..\..\include;..\..\"
AdditionalIncludeDirectories="..\..\..\..\libogg\include\;..\..\..\include;..\..\;..\..\..\src\liboggz"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
......@@ -85,7 +85,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\libogg\include\;..\..\..\include;..\..\"
AdditionalIncludeDirectories="..\..\..\..\libogg\include\;..\..\..\include;..\..\;..\..\..\src\liboggz"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="TRUE"
RuntimeLibrary="0"
......@@ -146,10 +146,13 @@
RelativePath="..\..\attgetopt.c">
</File>
<File
RelativePath="..\..\..\src\tools\oggz_tools.c">
RelativePath="..\..\..\src\liboggz\dirac.c">
</File>
<File
RelativePath="..\..\..\src\tools\oggz-dump.c">
</File>
<File
RelativePath="..\..\..\src\tools\oggzdump.c">
RelativePath="..\..\..\src\tools\oggz_tools.c">
</File>
</Filter>
<Filter
......
......@@ -84,7 +84,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\libogg\include,..\..\..\include,..\.."
AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..;..\..\..\src\liboggz"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
......@@ -146,10 +146,13 @@
RelativePath="..\..\attgetopt.c">
</File>
<File
RelativePath="..\..\..\src\tools\oggz_tools.c">
RelativePath="..\..\..\src\liboggz\dirac.c">
</File>
<File
RelativePath="..\..\..\src\tools\oggzinfo.c">
RelativePath="..\..\..\src\tools\oggz-info.c">
</File>
<File
RelativePath="..\..\..\src\tools\oggz_tools.c">
</File>
<File
RelativePath="..\..\..\src\tools\skeleton.c">
......
......@@ -23,7 +23,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\libogg\include,..\..\..\include,..\..\"
AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\;..\..\..\src\liboggz"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="TRUE"
RuntimeLibrary="0"
......@@ -83,7 +83,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\libogg\include,..\..\..\include,..\..\"
AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\;..\..\..\src\liboggz"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
......@@ -144,10 +144,13 @@
RelativePath="..\..\attgetopt.c">
</File>
<File
RelativePath="..\..\..\src\tools\oggz_tools.c">
RelativePath="..\..\..\src\liboggz\dirac.c">
</File>
<File
RelativePath="..\..\..\src\tools\oggz-merge.c">
</File>
<File
RelativePath="..\..\..\src\tools\oggzmerge.c">
RelativePath="..\..\..\src\tools\oggz_tools.c">
</File>
</Filter>
<Filter
......
......@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\libogg\include\;..\..\..\include\;..\.."
AdditionalIncludeDirectories="..\..\..\..\libogg\include\;..\..\..\include\;..\..;..\..\..\src\liboggz"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
......@@ -122,10 +122,13 @@
RelativePath="..\..\attgetopt.c">
</File>
<File
RelativePath="..\..\..\src\tools\oggz_tools.c">
RelativePath="..\..\..\src\liboggz\dirac.c">
</File>
<File
RelativePath="..\..\..\src\tools\oggzrip.c">
RelativePath="..\..\..\src\tools\oggz-rip.c">
</File>
<File
RelativePath="..\..\..\src\tools\oggz_tools.c">
</File>
</Filter>
<Filter
......
......@@ -121,6 +121,9 @@
<File
RelativePath="..\..\attgetopt.c">
</File>
<File
RelativePath="..\..\..\src\liboggz\dirac.c">
</File>
<File
RelativePath="..\..\..\src\tools\oggz-scan.c">
</File>
......
......@@ -121,6 +121,9 @@
<File
RelativePath="..\..\attgetopt.c">
</File>
<File
RelativePath="..\..\..\src\liboggz\dirac.c">
</File>
<File
RelativePath="..\..\..\src\tools\oggz-validate.c">
</File>
......
......@@ -75,7 +75,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libogg.lib"
OutputFile="$(OutDir)/liboggz.dll"
OutputFile="$(OutDir)\$(ProjectName).dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
......@@ -109,6 +109,7 @@
Name="VCPostBuildEventTool"
Description="Copy libogg to output directory"
CommandLine="copy ..\..\..\libogg\win32\Dynamic_Release\ogg.dll .\Release"
ExcludedFromBuild="true"
/>
</Configuration>
<Configuration
......@@ -213,6 +214,10 @@
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
RelativePath="..\..\..\src\liboggz\dirac.c"
>
</File>
<File
RelativePath="..\..\liboggz.def"
>
......
......@@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\libogg\include\;..\..\..\include;..\..\"
AdditionalIncludeDirectories="..\..\..\..\libogg\include\;..\..\..\include;..\..\;..\..\..\src\liboggz"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
......@@ -210,11 +210,15 @@
>
</File>
<File
RelativePath="..\..\..\src\tools\oggz_tools.c"
RelativePath="..\..\..\src\liboggz\dirac.c"
>
</File>
<File
RelativePath="..\..\..\src\tools\oggz-dump.c"
>
</File>
<File
RelativePath="..\..\..\src\tools\oggzdump.c"
RelativePath="..\..\..\src\tools\oggz_tools.c"
>
</File>
</Filter>
......
......@@ -135,7 +135,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\libogg\include,..\..\..\include,..\.."
AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..;..\..\..\src\liboggz"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
......@@ -210,11 +210,15 @@
>
</File>
<File
RelativePath="..\..\..\src\tools\oggz_tools.c"
RelativePath="..\..\..\src\liboggz\dirac.c"
>
</File>
<File
RelativePath="..\..\..\src\tools\oggz-info.c"
>
</File>
<File
RelativePath="..\..\..\src\tools\oggzinfo.c"
RelativePath="..\..\..\src\tools\oggz_tools.c"
>
</File>
<File
......
......@@ -44,7 +44,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\libogg\include,..\..\..\include,..\..\"
AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\;..\..\..\src\liboggz"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
......@@ -134,7 +134,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\libogg\include,..\..\..\include,..\..\"
AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\;..\..\..\src\liboggz"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
......@@ -208,11 +208,15 @@
>
</File>
<File
RelativePath="..\..\..\src\tools\oggz_tools.c"
RelativePath="..\..\..\src\liboggz\dirac.c"
>
</File>
<File
RelativePath="..\..\..\src\tools\oggzmerge.c"
RelativePath="..\..\..\src\tools\oggz-merge.c"
>
</File>
<File
RelativePath="..\..\..\src\tools\oggz_tools.c"
>
</File>
</Filter>
......
......@@ -120,7 +120,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\libogg\include\;..\..\..\include\;..\.."
AdditionalIncludeDirectories="..\..\..\..\libogg\include\;..\..\..\include\;..\..;..\..\..\src\liboggz"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
......@@ -188,11 +188,15 @@
>
</File>
<File
RelativePath="..\..\..\src\tools\oggz_tools.c"
RelativePath="..\..\..\src\liboggz\dirac.c"
>
</File>
<File
RelativePath="..\..\..\src\tools\oggz-rip.c"
>
</File>
<File
RelativePath="..\..\..\src\tools\oggzrip.c"
RelativePath="..\..\..\src\tools\oggz_tools.c"
>
</File>
</Filter>
......
......@@ -120,7 +120,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\libogg\include\,..\..\..\include\,..\.."
AdditionalIncludeDirectories="..\..\..\..\libogg\include\;..\..\..\include\;..\..;..\..\..\src\liboggz"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
......@@ -187,6 +187,10 @@
RelativePath="..\..\attgetopt.c"
>
</File>
<File
RelativePath="..\..\..\src\liboggz\dirac.c"
>
</File>
<File
RelativePath="..\..\..\src\tools\oggz-scan.c"
>
......
......@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\libogg\include\;..\..\..\include\;..\.."
AdditionalIncludeDirectories="..\..\..\..\libogg\include\;..\..\..\include\;..\..;..\..\..\src\liboggz"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
......@@ -187,6 +187,10 @@
RelativePath="..\..\attgetopt.c"
>
</File>
<File
RelativePath="..\..\..\src\liboggz\dirac.c"
>
</File>
<File
RelativePath="..\..\..\src\tools\oggz-validate.c"
>
......
......@@ -30,7 +30,7 @@
#define HAVE_SSIZE_T 1
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
......@@ -131,3 +131,8 @@
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t
/* Define for MSVC as <stdint.h> is unavailable there */
typedef unsigned char uint8_t;
#define inline __inline // MSVC
\ No newline at end of file
......@@ -92,4 +92,6 @@ oggz_get_numtracks @50
;
oggz_stream_get_content @100
oggz_stream_get_content_type @101
oggz_tell_granulepos @102
\ No newline at end of file
oggz_tell_granulepos @102
oggz_stream_get_numheaders @103
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment