Fix ogg include path for android

haxenme · Jun 8, 2024 · 036f687 · 036f687
1 parent 25a61f6
commit 036f687
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/project/ToolkitBuild.xml b/project/ToolkitBuild.xml
@@ -351,14 +351,14 @@
           <file name="${SRC_DIR}/linux/RpiMMal.cpp"/>
       </section>
 
+      <compilerflag value="-I${this_dir}/toolkit" if="NME_LOCAL_TOOLKIT" />
       <compilerflag value="-I${NME_ZLIB}"/>
       <compilerflag value="-I${NME_PNG}"/>
       <compilerflag value="-I${NME_PNG}.." if="NME_LOCAL_TOOLKIT" />
       <compilerflag value="-I${NME_JPEG}"/>
       <compilerflag value="-I${NME_JPEG}.." if="NME_LOCAL_TOOLKIT" />
       <compilerflag value="-I${NME_VORBIS}include"/>
       <compilerflag value="-I${NME_OGG}include"/>
-      <compilerflag value="-I${NME_OGG}.." if="NME_LOCAL_TOOLKIT" />
 
       <compilerflag value="-I${NME_FREETYPE}"/>
       <compilerflag value="-I${NME_FREETYPE}include"/>

diff --git a/project/toolkit/ogg/config_types.h b/project/toolkit/ogg/config_types.h
@@ -21,6 +21,7 @@ typedef unsigned short ogg_uint16_t;
 typedef int32_t ogg_int32_t;
 typedef unsigned int ogg_uint32_t;
 typedef int64_t ogg_int64_t;
+typedef uint64_t ogg_uint64_t;
 
 #endif
 #endif
diff --git a/project/toolkit/ogg/files.xml b/project/toolkit/ogg/files.xml
@@ -12,6 +12,7 @@
 
         <compilerflag value="-I${NME_OGG}include/"/>
         <compilerflag value="-I${NME_OGG}"/>
+        <compilerflag value="-I${this_dir}/.."/>
         <cache value="1" />
 
         <tag value="${NATIVE_TOOLKIT_OPTIM_TAG}" if="NATIVE_TOOLKIT_OPTIM_TAG" />

diff --git a/project/toolkit/vorbis/files.xml b/project/toolkit/vorbis/files.xml
@@ -43,6 +43,7 @@
       <compilerflag value="-I${NME_VORBIS}include/"/>
       <compilerflag value="-I${NME_VORBIS}lib/"/>
       <compilerflag value="-I${NME_OGG}/include/"/>
+      <compilerflag value="-I${this_dir}/.."/>
 
       <file name="${NME_VORBIS}lib/mdct.c"/>
       <file name="${NME_VORBIS}lib/smallft.c"/>