From 036f687420b6a2091ed89d2619b6d032feb72ee4 Mon Sep 17 00:00:00 2001
From: Hugh Sanderson <gamehaxe@gmail.com>
Date: Sat, 8 Jun 2024 16:33:20 +0800
Subject: [PATCH] Fix ogg include path for android

---
 project/ToolkitBuild.xml           | 2 +-
 project/toolkit/ogg/config_types.h | 1 +
 project/toolkit/ogg/files.xml      | 1 +
 project/toolkit/vorbis/files.xml   | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/project/ToolkitBuild.xml b/project/ToolkitBuild.xml
index 157b58f21..988976c43 100644
--- a/project/ToolkitBuild.xml
+++ b/project/ToolkitBuild.xml
@@ -351,6 +351,7 @@
           <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" />
@@ -358,7 +359,6 @@
       <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
index 73ef56246..3a28a06a7 100644
--- 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
index ab5b12770..a2189d16e 100644
--- 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
index 06243ae4e..77b31e696 100644
--- 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"/>