Merge branch 'develop' into 8.1.0-Dev

This commit is contained in:
Josh Tynjala
2023-06-05 10:29:26 -07:00
114 changed files with 2571 additions and 244 deletions

View File

@@ -331,14 +331,14 @@
</files>
<include name="lib/cairo/files.xml" />
<include name="lib/curl/files.xml" />
<include name="lib/curl-files.xml" />
<include name="lib/efsw/files.xml" />
<include name="lib/faudio/files.xml" if="LIME_FAUDIO" />
<include name="lib/freetype/files.xml" />
<include name="lib/harfbuzz/files.xml" />
<include name="lib/jpeg/files.xml" />
<include name="lib/lzma/files.xml" />
<include name="lib/mbedtls/files.xml" />
<include name="lib/mbedtls-files.xml" />
<include name="lib/mojoal/files.xml" />
<include name="lib/neko/files.xml" />
<include name="lib/ogg/files.xml" />
@@ -456,6 +456,7 @@
<vflag name="-framework" value="Carbon" />
<vflag name="-framework" value="AppKit" />
<vflag name="-framework" value="OpenAL" />
<vflag name="-framework" value="SystemConfiguration" />
<lib name="/opt/local/lib/libgc.a" if="LIME_NEKO" />
<lib name="-lm" if="LIME_NEKO" />