[xiph-commits] r3835 - in liboggz/trunk: src/liboggz win32 win32/VS2003/liboggz win32/VS2005/liboggz
conrad at svn.annodex.net
conrad at svn.annodex.net
Sat Dec 20 03:41:50 PST 2008
Author: conrad
Date: 2008-12-20 03:41:49 -0800 (Sat, 20 Dec 2008)
New Revision: 3835
Modified:
liboggz/trunk/src/liboggz/dirac.c
liboggz/trunk/win32/VS2003/liboggz/liboggz.vcproj
liboggz/trunk/win32/VS2003/liboggz/oggzdump.vcproj
liboggz/trunk/win32/VS2003/liboggz/oggzinfo.vcproj
liboggz/trunk/win32/VS2003/liboggz/oggzmerge.vcproj
liboggz/trunk/win32/VS2003/liboggz/oggzrip.vcproj
liboggz/trunk/win32/VS2003/liboggz/oggzscan.vcproj
liboggz/trunk/win32/VS2003/liboggz/oggzvalidate.vcproj
liboggz/trunk/win32/VS2005/liboggz/liboggz.vcproj
liboggz/trunk/win32/VS2005/liboggz/oggzdump.vcproj
liboggz/trunk/win32/VS2005/liboggz/oggzinfo.vcproj
liboggz/trunk/win32/VS2005/liboggz/oggzmerge.vcproj
liboggz/trunk/win32/VS2005/liboggz/oggzrip.vcproj
liboggz/trunk/win32/VS2005/liboggz/oggzscan.vcproj
liboggz/trunk/win32/VS2005/liboggz/oggzvalidate.vcproj
liboggz/trunk/win32/config.h
liboggz/trunk/win32/liboggz.def
Log:
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
Modified: liboggz/trunk/src/liboggz/dirac.c
===================================================================
--- liboggz/trunk/src/liboggz/dirac.c 2008-12-20 10:38:18 UTC (rev 3834)
+++ liboggz/trunk/src/liboggz/dirac.c 2008-12-20 11:41:49 UTC (rev 3835)
@@ -1,10 +1,16 @@
/*
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 @@
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 @@
info->fps_denominator = dirac_uint( &bs );
}
}
-}
-
+}
\ No newline at end of file
Modified: liboggz/trunk/win32/VS2003/liboggz/liboggz.vcproj
===================================================================
--- liboggz/trunk/win32/VS2003/liboggz/liboggz.vcproj 2008-12-20 10:38:18 UTC (rev 3834)
+++ liboggz/trunk/win32/VS2003/liboggz/liboggz.vcproj 2008-12-20 11:41:49 UTC (rev 3835)
@@ -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
@@ -151,6 +152,9 @@
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>
<File
Modified: liboggz/trunk/win32/VS2003/liboggz/oggzdump.vcproj
===================================================================
--- liboggz/trunk/win32/VS2003/liboggz/oggzdump.vcproj 2008-12-20 10:38:18 UTC (rev 3834)
+++ liboggz/trunk/win32/VS2003/liboggz/oggzdump.vcproj 2008-12-20 11:41:49 UTC (rev 3835)
@@ -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,11 +146,14 @@
RelativePath="..\..\attgetopt.c">
</File>
<File
- RelativePath="..\..\..\src\tools\oggz_tools.c">
+ RelativePath="..\..\..\src\liboggz\dirac.c">
</File>
<File
- RelativePath="..\..\..\src\tools\oggzdump.c">
+ RelativePath="..\..\..\src\tools\oggz-dump.c">
</File>
+ <File
+ RelativePath="..\..\..\src\tools\oggz_tools.c">
+ </File>
</Filter>
<Filter
Name="Header Files"
Modified: liboggz/trunk/win32/VS2003/liboggz/oggzinfo.vcproj
===================================================================
--- liboggz/trunk/win32/VS2003/liboggz/oggzinfo.vcproj 2008-12-20 10:38:18 UTC (rev 3834)
+++ liboggz/trunk/win32/VS2003/liboggz/oggzinfo.vcproj 2008-12-20 11:41:49 UTC (rev 3835)
@@ -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,12 +146,15 @@
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">
</File>
<File
Modified: liboggz/trunk/win32/VS2003/liboggz/oggzmerge.vcproj
===================================================================
--- liboggz/trunk/win32/VS2003/liboggz/oggzmerge.vcproj 2008-12-20 10:38:18 UTC (rev 3834)
+++ liboggz/trunk/win32/VS2003/liboggz/oggzmerge.vcproj 2008-12-20 11:41:49 UTC (rev 3835)
@@ -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,11 +144,14 @@
RelativePath="..\..\attgetopt.c">
</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>
<Filter
Name="Header Files"
Modified: liboggz/trunk/win32/VS2003/liboggz/oggzrip.vcproj
===================================================================
--- liboggz/trunk/win32/VS2003/liboggz/oggzrip.vcproj 2008-12-20 10:38:18 UTC (rev 3834)
+++ liboggz/trunk/win32/VS2003/liboggz/oggzrip.vcproj 2008-12-20 11:41:49 UTC (rev 3835)
@@ -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,11 +122,14 @@
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
Name="Header Files"
Modified: liboggz/trunk/win32/VS2003/liboggz/oggzscan.vcproj
===================================================================
--- liboggz/trunk/win32/VS2003/liboggz/oggzscan.vcproj 2008-12-20 10:38:18 UTC (rev 3834)
+++ liboggz/trunk/win32/VS2003/liboggz/oggzscan.vcproj 2008-12-20 11:41:49 UTC (rev 3835)
@@ -122,6 +122,9 @@
RelativePath="..\..\attgetopt.c">
</File>
<File
+ RelativePath="..\..\..\src\liboggz\dirac.c">
+ </File>
+ <File
RelativePath="..\..\..\src\tools\oggz-scan.c">
</File>
<File
Modified: liboggz/trunk/win32/VS2003/liboggz/oggzvalidate.vcproj
===================================================================
--- liboggz/trunk/win32/VS2003/liboggz/oggzvalidate.vcproj 2008-12-20 10:38:18 UTC (rev 3834)
+++ liboggz/trunk/win32/VS2003/liboggz/oggzvalidate.vcproj 2008-12-20 11:41:49 UTC (rev 3835)
@@ -122,6 +122,9 @@
RelativePath="..\..\attgetopt.c">
</File>
<File
+ RelativePath="..\..\..\src\liboggz\dirac.c">
+ </File>
+ <File
RelativePath="..\..\..\src\tools\oggz-validate.c">
</File>
<File
Modified: liboggz/trunk/win32/VS2005/liboggz/liboggz.vcproj
===================================================================
--- liboggz/trunk/win32/VS2005/liboggz/liboggz.vcproj 2008-12-20 10:38:18 UTC (rev 3834)
+++ liboggz/trunk/win32/VS2005/liboggz/liboggz.vcproj 2008-12-20 11:41:49 UTC (rev 3835)
@@ -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
@@ -214,6 +215,10 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
+ RelativePath="..\..\..\src\liboggz\dirac.c"
+ >
+ </File>
+ <File
RelativePath="..\..\liboggz.def"
>
</File>
Modified: liboggz/trunk/win32/VS2005/liboggz/oggzdump.vcproj
===================================================================
--- liboggz/trunk/win32/VS2005/liboggz/oggzdump.vcproj 2008-12-20 10:38:18 UTC (rev 3834)
+++ liboggz/trunk/win32/VS2005/liboggz/oggzdump.vcproj 2008-12-20 11:41:49 UTC (rev 3835)
@@ -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,13 +210,17 @@
>
</File>
<File
- RelativePath="..\..\..\src\tools\oggz_tools.c"
+ RelativePath="..\..\..\src\liboggz\dirac.c"
>
</File>
<File
- RelativePath="..\..\..\src\tools\oggzdump.c"
+ RelativePath="..\..\..\src\tools\oggz-dump.c"
>
</File>
+ <File
+ RelativePath="..\..\..\src\tools\oggz_tools.c"
+ >
+ </File>
</Filter>
<Filter
Name="Header Files"
Modified: liboggz/trunk/win32/VS2005/liboggz/oggzinfo.vcproj
===================================================================
--- liboggz/trunk/win32/VS2005/liboggz/oggzinfo.vcproj 2008-12-20 10:38:18 UTC (rev 3834)
+++ liboggz/trunk/win32/VS2005/liboggz/oggzinfo.vcproj 2008-12-20 11:41:49 UTC (rev 3835)
@@ -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,14 +210,18 @@
>
</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"
>
</File>
Modified: liboggz/trunk/win32/VS2005/liboggz/oggzmerge.vcproj
===================================================================
--- liboggz/trunk/win32/VS2005/liboggz/oggzmerge.vcproj 2008-12-20 10:38:18 UTC (rev 3834)
+++ liboggz/trunk/win32/VS2005/liboggz/oggzmerge.vcproj 2008-12-20 11:41:49 UTC (rev 3835)
@@ -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,13 +208,17 @@
>
</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>
<Filter
Name="Header Files"
Modified: liboggz/trunk/win32/VS2005/liboggz/oggzrip.vcproj
===================================================================
--- liboggz/trunk/win32/VS2005/liboggz/oggzrip.vcproj 2008-12-20 10:38:18 UTC (rev 3834)
+++ liboggz/trunk/win32/VS2005/liboggz/oggzrip.vcproj 2008-12-20 11:41:49 UTC (rev 3835)
@@ -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,13 +188,17 @@
>
</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
Name="Header Files"
Modified: liboggz/trunk/win32/VS2005/liboggz/oggzscan.vcproj
===================================================================
--- liboggz/trunk/win32/VS2005/liboggz/oggzscan.vcproj 2008-12-20 10:38:18 UTC (rev 3834)
+++ liboggz/trunk/win32/VS2005/liboggz/oggzscan.vcproj 2008-12-20 11:41:49 UTC (rev 3835)
@@ -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,6 +188,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\liboggz\dirac.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\tools\oggz-scan.c"
>
</File>
Modified: liboggz/trunk/win32/VS2005/liboggz/oggzvalidate.vcproj
===================================================================
--- liboggz/trunk/win32/VS2005/liboggz/oggzvalidate.vcproj 2008-12-20 10:38:18 UTC (rev 3834)
+++ liboggz/trunk/win32/VS2005/liboggz/oggzvalidate.vcproj 2008-12-20 11:41:49 UTC (rev 3835)
@@ -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"
@@ -188,6 +188,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\liboggz\dirac.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\tools\oggz-validate.c"
>
</File>
Modified: liboggz/trunk/win32/config.h
===================================================================
--- liboggz/trunk/win32/config.h 2008-12-20 10:38:18 UTC (rev 3834)
+++ liboggz/trunk/win32/config.h 2008-12-20 11:41:49 UTC (rev 3835)
@@ -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
Modified: liboggz/trunk/win32/liboggz.def
===================================================================
--- liboggz/trunk/win32/liboggz.def 2008-12-20 10:38:18 UTC (rev 3834)
+++ liboggz/trunk/win32/liboggz.def 2008-12-20 11:41:49 UTC (rev 3835)
@@ -92,4 +92,6 @@
;
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
More information about the commits
mailing list