From 1cf4ba09df1a6604124da4243bc180b100487f09 Mon Sep 17 00:00:00 2001
From: Joseph Cloutier <jkcloutier@gmail.com>
Date: Sun, 8 May 2022 22:12:42 -0400
Subject: [PATCH] Make overrides mirror submodule file structure.

---
 project/Build.xml                                          | 4 ++--
 project/lib/README.md                                      | 6 +++---
 project/lib/cairo-files.xml                                | 4 ++--
 project/lib/overrides/cairo/{ => src}/cairo-features.h     | 0
 project/lib/overrides/pixman/{ => pixman}/pixman-version.h | 0
 project/lib/pixman-files.xml                               | 1 +
 6 files changed, 8 insertions(+), 7 deletions(-)
 rename project/lib/overrides/cairo/{ => src}/cairo-features.h (100%)
 rename project/lib/overrides/pixman/{ => pixman}/pixman-version.h (100%)

diff --git a/project/Build.xml b/project/Build.xml
index d7bb026dc..8f5918311 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -62,12 +62,12 @@
 
 		<section if="LIME_CAIRO">
 
-			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/cairo/" />
+			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/cairo/src/" />
 			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/cairo/configs/default/" unless="windows || mac || linux" />
 			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/cairo/configs/linux/" if="linux" />
 			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/cairo/configs/windows/" if="windows" />
 			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/cairo/configs/mac/" if="mac" />
-			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/src" />
+			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/src/" />
 			<compilerflag value="-DLIME_CAIRO" />
 			<compilerflag value="-DHAVE_CONFIG_H" />
 			<compilerflag value="-DCAIRO_WIN32_STATIC_BUILD" if="windows" />
diff --git a/project/lib/README.md b/project/lib/README.md
index 765644e22..0ef12523e 100644
--- a/project/lib/README.md
+++ b/project/lib/README.md
@@ -51,19 +51,19 @@ All cases require updating the corresponding files.xml file.
 - To add or override a header, include the overrides folder first (if not already included).
 
    ```diff
-   +<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/sdl/" />
+   +<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/sdl/include/" />
    <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/" />
    ```
 
 - To add a source file, insert a `<file />` tag.
 
    ```diff
-   +<file name="${NATIVE_TOOLKIT_PATH}/overrides/sdl/SDL_extra.c" />
+   +<file name="${NATIVE_TOOLKIT_PATH}/overrides/sdl/src/SDL_extra.c" />
    ```
 
 - To override a source file, replace the `<file />` tag.
 
    ```diff
    -<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_log.c" />
-   +<file name="${NATIVE_TOOLKIT_PATH}/overrides/sdl/SDL_log.c" />
+   +<file name="${NATIVE_TOOLKIT_PATH}/overrides/sdl/src/SDL_log.c" />
    ```
diff --git a/project/lib/cairo-files.xml b/project/lib/cairo-files.xml
index b5055866f..7f3130b2c 100644
--- a/project/lib/cairo-files.xml
+++ b/project/lib/cairo-files.xml
@@ -2,7 +2,7 @@
 
 	<files id="native-toolkit-cairo" >
 
-		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/cairo/" />
+		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/cairo/src/" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/cairo/configs/default/" unless="windows || mac || linux" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/cairo/configs/linux/" if="linux" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/cairo/configs/windows/" if="windows" />
@@ -12,7 +12,7 @@
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/freetype/include/" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/freetype/include/" />
 
-		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/pixman/" />
+		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/pixman/pixman/" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/pixman/pixman/" />
 
 		<compilerflag value="-DNDEBUG" unless="debug" />
diff --git a/project/lib/overrides/cairo/cairo-features.h b/project/lib/overrides/cairo/src/cairo-features.h
similarity index 100%
rename from project/lib/overrides/cairo/cairo-features.h
rename to project/lib/overrides/cairo/src/cairo-features.h
diff --git a/project/lib/overrides/pixman/pixman-version.h b/project/lib/overrides/pixman/pixman/pixman-version.h
similarity index 100%
rename from project/lib/overrides/pixman/pixman-version.h
rename to project/lib/overrides/pixman/pixman/pixman-version.h
diff --git a/project/lib/pixman-files.xml b/project/lib/pixman-files.xml
index d5d7529d7..bad3e4339 100644
--- a/project/lib/pixman-files.xml
+++ b/project/lib/pixman-files.xml
@@ -8,6 +8,7 @@
 	<files id="native-toolkit-pixman" >
 
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/pixman" />
+		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/pixman/pixman" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/pixman/pixman" />
 		<compilerflag value="-DHAVE_CONFIG_H" />
 		<compilerflag value="-DPIXMAN_NO_TLS" if="windows" />