kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the official Ogg repo as a submodule.

Browse Source 
Continuing to use version 1.3.2 for now.

`-DNATIVE_TOOLKIT_OGG` seems unused, and has been excluded.
This commit is contained in:
Joseph Cloutier
2022-05-08 23:20:50 -04:00
parent 455aef606d
commit d6ec1c123b
5 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@@ -12,7 +12,7 @@
url = https://github.com/curl/curl url = https://github.com/curl/curl
[submodule "project/lib/ogg"] [submodule "project/lib/ogg"]
path = project/lib/ogg path = project/lib/ogg
url = https://github.com/openfl/libogg url = https://github.com/xiph/ogg
[submodule "project/lib/zlib"] [submodule "project/lib/zlib"]
path = project/lib/zlib path = project/lib/zlib
url = https://github.com/openfl/libzlib url = https://github.com/openfl/libzlib

2
project/lib/ogg

Submodule project/lib/ogg updated: 9ebcb88b69...36606a06c6

2
project/lib/ogg-files.xml
View File

@@ -1,7 +1,7 @@
<xml> <xml>
<files id="native-toolkit-ogg-depends"> <files id="native-toolkit-ogg-depends">
<depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/config_types.h"/> <depend name="${NATIVE_TOOLKIT_PATH}/overrides/ogg/include/ogg/config_types.h"/>
<depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/ogg.h"/> <depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/ogg.h"/>
<depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/os_types.h"/> <depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/os_types.h"/>
</files> </files>

26
project/lib/overrides/ogg/include/ogg/config_types.h Normal file
View File

@@ -0,0 +1,26 @@
#ifndef __CONFIG_TYPES_H__
#define __CONFIG_TYPES_H__
#ifdef BLACKBERRY
/* QNX */
# include <inttypes.h>
typedef int16_t ogg_int16_t;
typedef uint16_t ogg_uint16_t;
typedef int32_t ogg_int32_t;
typedef uint32_t ogg_uint32_t;
typedef int64_t ogg_int64_t;
#else
# include <inttypes.h>
/* these are filled in by configure */
typedef int16_t ogg_int16_t;
typedef unsigned short ogg_uint16_t;
typedef int32_t ogg_int32_t;
typedef unsigned int ogg_uint32_t;
typedef int64_t ogg_int64_t;
#endif
#endif

2
project/lib/vorbis-files.xml
View File

@@ -13,7 +13,7 @@
<depend files="native-toolkit-vorbis-depends"/> <depend files="native-toolkit-vorbis-depends"/>
<depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/config_types.h"/> <depend name="${NATIVE_TOOLKIT_PATH}/overrides/ogg/include/ogg/config_types.h"/>
<depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/ogg.h"/> <depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/ogg.h"/>
<depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/os_types.h"/> <depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/os_types.h"/>