From 9de06eb989f5392b6717be95786fb6302493ff21 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 17 Dec 2023 14:31:23 +0100 Subject: [PATCH] Fix some include paths. --- core/SCsub | 2 +- drivers/gl_context/SCsub | 2 +- modules/freetype/SCsub | 6 +++--- modules/png/SCsub | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/SCsub b/core/SCsub index e909f0b..b5a4148 100644 --- a/core/SCsub +++ b/core/SCsub @@ -64,7 +64,7 @@ thirdparty_misc_sources = [thirdparty_misc_dir + file for file in thirdparty_mis env_thirdparty.add_source_files(thirdparty_obj, thirdparty_misc_sources) # Zlib library, can be unbundled -thirdparty_zlib_dir = "thirdparty/zlib/" +thirdparty_zlib_dir = "#core/thirdparty/zlib/" thirdparty_zlib_sources = [ "adler32.c", "compress.c", diff --git a/drivers/gl_context/SCsub b/drivers/gl_context/SCsub index 8e8fe42..dfe6e70 100644 --- a/drivers/gl_context/SCsub +++ b/drivers/gl_context/SCsub @@ -6,7 +6,7 @@ thirdparty_obj = [] if env["platform"] in ["haiku", "osx", "windows", "x11"]: # Thirdparty source files - thirdparty_dir = "glad/" + thirdparty_dir = "#drivers/gl_context/glad/" thirdparty_sources = [ "glad.c", ] diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub index c400eb1..8075c2a 100644 --- a/modules/freetype/SCsub +++ b/modules/freetype/SCsub @@ -11,7 +11,7 @@ env_freetype = env_modules.Clone() thirdparty_obj = [] -thirdparty_dir = "freetype/" +thirdparty_dir = "#modules/freetype/freetype/" thirdparty_sources = [ "src/autofit/autofit.c", "src/base/ftbase.c", @@ -59,7 +59,7 @@ thirdparty_sources = [ ] thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] -thirdparty_brotli_dir = "brotli/" +thirdparty_brotli_dir = "#modules/freetype/brotli/" thirdparty_brotli_sources = [ "common/constants.c", "common/context.c", @@ -91,7 +91,7 @@ if env["target"] == "debug": env_freetype.Append(CPPDEFINES=["ZLIB_DEBUG"]) # Also requires libpng headers -env_freetype.Prepend(CPPPATH=["#modules/png/libpng"]) +env_freetype.Prepend(CPPPATH=["#modules/png/libpng/"]) sfnt = thirdparty_dir + "src/sfnt/sfnt.c" # Must be done after all CPPDEFINES are being set so we can copy them. diff --git a/modules/png/SCsub b/modules/png/SCsub index 61033b8..936160f 100644 --- a/modules/png/SCsub +++ b/modules/png/SCsub @@ -9,7 +9,7 @@ env_png = env_modules.Clone() thirdparty_obj = [] -thirdparty_dir = "libpng/" +thirdparty_dir = "#modules/png/libpng/" thirdparty_sources = [ "png.c", "pngerror.c",