mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2024-11-28 14:42:03 +00:00
update ogg to 1.3.4
built at tag v1.3.4 with addition of xiph/ogg@c8fca6b4a0
This commit is contained in:
parent
a80ec676c4
commit
e2f2f3c0cf
4 changed files with 17 additions and 7 deletions
|
@ -1,7 +1,7 @@
|
||||||
#ifndef __CONFIG_TYPES_H__
|
#ifndef __CONFIG_TYPES_H__
|
||||||
#define __CONFIG_TYPES_H__
|
#define __CONFIG_TYPES_H__
|
||||||
|
|
||||||
/* these are filled in by configure */
|
/* these are filled in by configure or cmake*/
|
||||||
#define INCLUDE_INTTYPES_H 1
|
#define INCLUDE_INTTYPES_H 1
|
||||||
#define INCLUDE_STDINT_H 1
|
#define INCLUDE_STDINT_H 1
|
||||||
#define INCLUDE_SYS_TYPES_H 1
|
#define INCLUDE_SYS_TYPES_H 1
|
||||||
|
@ -21,5 +21,6 @@ typedef uint16_t ogg_uint16_t;
|
||||||
typedef int32_t ogg_int32_t;
|
typedef int32_t ogg_int32_t;
|
||||||
typedef uint32_t ogg_uint32_t;
|
typedef uint32_t ogg_uint32_t;
|
||||||
typedef int64_t ogg_int64_t;
|
typedef int64_t ogg_int64_t;
|
||||||
|
typedef uint64_t ogg_uint64_t;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
********************************************************************
|
********************************************************************
|
||||||
|
|
||||||
function: toplevel libogg include
|
function: toplevel libogg include
|
||||||
last mod: $Id$
|
|
||||||
|
|
||||||
********************************************************************/
|
********************************************************************/
|
||||||
#ifndef _OGG_H
|
#ifndef _OGG_H
|
||||||
|
|
|
@ -10,8 +10,7 @@
|
||||||
* *
|
* *
|
||||||
********************************************************************
|
********************************************************************
|
||||||
|
|
||||||
function: #ifdef jail to whip a few platforms into the UNIX ideal.
|
function: Define a consistent set of types on each platform.
|
||||||
last mod: $Id$
|
|
||||||
|
|
||||||
********************************************************************/
|
********************************************************************/
|
||||||
#ifndef _OS_TYPES_H
|
#ifndef _OS_TYPES_H
|
||||||
|
@ -44,6 +43,7 @@
|
||||||
typedef unsigned long long ogg_uint64_t;
|
typedef unsigned long long ogg_uint64_t;
|
||||||
# elif defined(__MWERKS__)
|
# elif defined(__MWERKS__)
|
||||||
typedef long long ogg_int64_t;
|
typedef long long ogg_int64_t;
|
||||||
|
typedef unsigned long long ogg_uint64_t;
|
||||||
typedef int ogg_int32_t;
|
typedef int ogg_int32_t;
|
||||||
typedef unsigned int ogg_uint32_t;
|
typedef unsigned int ogg_uint32_t;
|
||||||
typedef short ogg_int16_t;
|
typedef short ogg_int16_t;
|
||||||
|
@ -62,6 +62,7 @@
|
||||||
typedef __int64 ogg_int64_t;
|
typedef __int64 ogg_int64_t;
|
||||||
typedef __int32 ogg_int32_t;
|
typedef __int32 ogg_int32_t;
|
||||||
typedef unsigned __int32 ogg_uint32_t;
|
typedef unsigned __int32 ogg_uint32_t;
|
||||||
|
typedef unsigned __int64 ogg_uint64_t;
|
||||||
typedef __int16 ogg_int16_t;
|
typedef __int16 ogg_int16_t;
|
||||||
typedef unsigned __int16 ogg_uint16_t;
|
typedef unsigned __int16 ogg_uint16_t;
|
||||||
# endif
|
# endif
|
||||||
|
@ -69,12 +70,13 @@
|
||||||
|
|
||||||
#elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
|
#elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
|
||||||
|
|
||||||
# include <inttypes.h>
|
# include <sys/types.h>
|
||||||
typedef int16_t ogg_int16_t;
|
typedef int16_t ogg_int16_t;
|
||||||
typedef uint16_t ogg_uint16_t;
|
typedef u_int16_t ogg_uint16_t;
|
||||||
typedef int32_t ogg_int32_t;
|
typedef int32_t ogg_int32_t;
|
||||||
typedef uint32_t ogg_uint32_t;
|
typedef u_int32_t ogg_uint32_t;
|
||||||
typedef int64_t ogg_int64_t;
|
typedef int64_t ogg_int64_t;
|
||||||
|
typedef u_int64_t ogg_uint64_t;
|
||||||
|
|
||||||
#elif defined(__HAIKU__)
|
#elif defined(__HAIKU__)
|
||||||
|
|
||||||
|
@ -85,6 +87,7 @@
|
||||||
typedef int ogg_int32_t;
|
typedef int ogg_int32_t;
|
||||||
typedef unsigned int ogg_uint32_t;
|
typedef unsigned int ogg_uint32_t;
|
||||||
typedef long long ogg_int64_t;
|
typedef long long ogg_int64_t;
|
||||||
|
typedef unsigned long long ogg_uint64_t;
|
||||||
|
|
||||||
#elif defined(__BEOS__)
|
#elif defined(__BEOS__)
|
||||||
|
|
||||||
|
@ -95,6 +98,7 @@
|
||||||
typedef int32_t ogg_int32_t;
|
typedef int32_t ogg_int32_t;
|
||||||
typedef uint32_t ogg_uint32_t;
|
typedef uint32_t ogg_uint32_t;
|
||||||
typedef int64_t ogg_int64_t;
|
typedef int64_t ogg_int64_t;
|
||||||
|
typedef uint64_t ogg_uint64_t;
|
||||||
|
|
||||||
#elif defined (__EMX__)
|
#elif defined (__EMX__)
|
||||||
|
|
||||||
|
@ -104,6 +108,8 @@
|
||||||
typedef int ogg_int32_t;
|
typedef int ogg_int32_t;
|
||||||
typedef unsigned int ogg_uint32_t;
|
typedef unsigned int ogg_uint32_t;
|
||||||
typedef long long ogg_int64_t;
|
typedef long long ogg_int64_t;
|
||||||
|
typedef unsigned long long ogg_uint64_t;
|
||||||
|
|
||||||
|
|
||||||
#elif defined (DJGPP)
|
#elif defined (DJGPP)
|
||||||
|
|
||||||
|
@ -112,11 +118,13 @@
|
||||||
typedef int ogg_int32_t;
|
typedef int ogg_int32_t;
|
||||||
typedef unsigned int ogg_uint32_t;
|
typedef unsigned int ogg_uint32_t;
|
||||||
typedef long long ogg_int64_t;
|
typedef long long ogg_int64_t;
|
||||||
|
typedef unsigned long long ogg_uint64_t;
|
||||||
|
|
||||||
#elif defined(R5900)
|
#elif defined(R5900)
|
||||||
|
|
||||||
/* PS2 EE */
|
/* PS2 EE */
|
||||||
typedef long ogg_int64_t;
|
typedef long ogg_int64_t;
|
||||||
|
typedef unsigned long ogg_uint64_t;
|
||||||
typedef int ogg_int32_t;
|
typedef int ogg_int32_t;
|
||||||
typedef unsigned ogg_uint32_t;
|
typedef unsigned ogg_uint32_t;
|
||||||
typedef short ogg_int16_t;
|
typedef short ogg_int16_t;
|
||||||
|
@ -129,6 +137,7 @@
|
||||||
typedef signed int ogg_int32_t;
|
typedef signed int ogg_int32_t;
|
||||||
typedef unsigned int ogg_uint32_t;
|
typedef unsigned int ogg_uint32_t;
|
||||||
typedef long long int ogg_int64_t;
|
typedef long long int ogg_int64_t;
|
||||||
|
typedef unsigned long long int ogg_uint64_t;
|
||||||
|
|
||||||
#elif defined(__TMS320C6X__)
|
#elif defined(__TMS320C6X__)
|
||||||
|
|
||||||
|
@ -138,6 +147,7 @@
|
||||||
typedef signed int ogg_int32_t;
|
typedef signed int ogg_int32_t;
|
||||||
typedef unsigned int ogg_uint32_t;
|
typedef unsigned int ogg_uint32_t;
|
||||||
typedef long long int ogg_int64_t;
|
typedef long long int ogg_int64_t;
|
||||||
|
typedef unsigned long long int ogg_uint64_t;
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
|
|
BIN
ogg/lib/libogg.a
BIN
ogg/lib/libogg.a
Binary file not shown.
Loading…
Reference in a new issue