[xiph-commits] r8489 - in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac: include/FLAC
src/libFLAC
ozone at motherfish-iii.xiph.org
ozone at motherfish-iii.xiph.org
Sun Dec 19 02:45:10 PST 2004
Author: ozone
Date: 2004-12-19 02:45:10 -0800 (Sun, 19 Dec 2004)
New Revision: 8489
Added:
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/ordinals.h.vc2003
Removed:
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/ordinals.h.bak
Modified:
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/libFLAC_dynamic.vcproj
Log:
* Automatically generate FLAC's ordinals.h from ordinals.h.vc2003 (previously named the rather-dubious ordinals.h.bak)
Deleted: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/ordinals.h.bak
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/ordinals.h.bak 2004-12-19 10:32:58 UTC (rev 8488)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/ordinals.h.bak 2004-12-19 10:45:10 UTC (rev 8489)
@@ -1,74 +0,0 @@
-/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * - Neither the name of the Xiph.org Foundation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef FLAC__ORDINALS_H
-#define FLAC__ORDINALS_H
-
-#ifndef _MSC_VER
-#include <inttypes.h>
-#endif
-
-typedef signed char FLAC__int8;
-typedef unsigned char FLAC__uint8;
-
-#if defined _MSC_VER
-typedef __int16 FLAC__int16;
-typedef __int32 FLAC__int32;
-typedef __int64 FLAC__int64;
-typedef unsigned __int16 FLAC__uint16;
-typedef unsigned __int32 FLAC__uint32;
-typedef unsigned __int64 FLAC__uint64;
-#else
-typedef int16_t FLAC__int16;
-typedef int32_t FLAC__int32;
-typedef int64_t FLAC__int64;
-typedef uint16_t FLAC__uint16;
-typedef uint32_t FLAC__uint32;
-typedef uint64_t FLAC__uint64;
-#endif
-
-typedef int FLAC__bool;
-
-typedef FLAC__uint8 FLAC__byte;
-typedef float FLAC__real;
-
-#ifdef true
-#undef true
-#endif
-#ifdef false
-#undef false
-#endif
-#ifndef __cplusplus
-#define true 1
-#define false 0
-#endif
-
-#endif
Added: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/ordinals.h.vc2003
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/ordinals.h.vc2003 2004-12-19 10:32:58 UTC (rev 8488)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/ordinals.h.vc2003 2004-12-19 10:45:10 UTC (rev 8489)
@@ -0,0 +1,74 @@
+/* libFLAC - Free Lossless Audio Codec library
+ * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Xiph.org Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef FLAC__ORDINALS_H
+#define FLAC__ORDINALS_H
+
+#ifndef _MSC_VER
+#include <inttypes.h>
+#endif
+
+typedef signed char FLAC__int8;
+typedef unsigned char FLAC__uint8;
+
+#if defined _MSC_VER
+typedef __int16 FLAC__int16;
+typedef __int32 FLAC__int32;
+typedef __int64 FLAC__int64;
+typedef unsigned __int16 FLAC__uint16;
+typedef unsigned __int32 FLAC__uint32;
+typedef unsigned __int64 FLAC__uint64;
+#else
+typedef int16_t FLAC__int16;
+typedef int32_t FLAC__int32;
+typedef int64_t FLAC__int64;
+typedef uint16_t FLAC__uint16;
+typedef uint32_t FLAC__uint32;
+typedef uint64_t FLAC__uint64;
+#endif
+
+typedef int FLAC__bool;
+
+typedef FLAC__uint8 FLAC__byte;
+typedef float FLAC__real;
+
+#ifdef true
+#undef true
+#endif
+#ifdef false
+#undef false
+#endif
+#ifndef __cplusplus
+#define true 1
+#define false 0
+#endif
+
+#endif
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/libFLAC_dynamic.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/libFLAC_dynamic.vcproj 2004-12-19 10:32:58 UTC (rev 8488)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/libFLAC_dynamic.vcproj 2004-12-19 10:45:10 UTC (rev 8489)
@@ -577,42 +577,35 @@
RelativePath="..\..\include\FLAC\metadata.h">
</File>
<File
- RelativePath="..\..\include\FLAC\ordinals.h.in">
+ RelativePath="..\..\include\Flac\ordinals.h">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCustomBuildTool"
- CommandLine="echo on
-"
- AdditionalDependencies="..\..\include\FLAC\ordinals.h.in;"
- Outputs="$(InputDir)ordinals.h"/>
+ AdditionalDependencies="ordinals.vc2003.h.in"
+ Outputs="$(OutputFile)"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
- CommandLine="echo on
-"
- AdditionalDependencies="..\..\include\FLAC\ordinals.h.in;"
- Outputs="$(InputDir)ordinals.h"/>
+ CommandLine="copy $(InputPath).vc2003 $(InputPath)"
+ AdditionalDependencies="..\..\include\Flac\ordinals.h.vc2003"
+ Outputs="$(InputPath)"/>
</FileConfiguration>
<FileConfiguration
Name="Release_SSE2|Win32">
<Tool
Name="VCCustomBuildTool"
- CommandLine="echo on
-"
- AdditionalDependencies="..\..\include\FLAC\ordinals.h.in;"
- Outputs="$(InputDir)ordinals.h"/>
+ AdditionalDependencies="ordinals.vc2003.h.in"
+ Outputs="$(OutputFile)"/>
</FileConfiguration>
<FileConfiguration
Name="Release_SSE|Win32">
<Tool
Name="VCCustomBuildTool"
- CommandLine="echo on
-"
- AdditionalDependencies="..\..\include\FLAC\ordinals.h.in;"
- Outputs="$(InputDir)ordinals.h"/>
+ AdditionalDependencies="ordinals.vc2003.h.in"
+ Outputs="$(OutputFile)"/>
</FileConfiguration>
</File>
<File
More information about the commits
mailing list