From c511cf9ca60a2cb89d097a73a4cd42dd726f199e Mon Sep 17 00:00:00 2001 From: gilzoide Date: Fri, 24 Nov 2023 18:43:26 -0300 Subject: [PATCH] Add Yoga as a submodule and a Makefile for building it for macOS --- .editorconfig | 4 ++++ .gitmodules | 3 +++ Plugins.meta | 8 ++++++++ Plugins/Makefile | 12 ++++++++++++ Plugins/Makefile.meta | 7 +++++++ Plugins/yoga~ | 1 + 6 files changed, 35 insertions(+) create mode 100644 .gitmodules create mode 100644 Plugins.meta create mode 100644 Plugins/Makefile create mode 100644 Plugins/Makefile.meta create mode 160000 Plugins/yoga~ diff --git a/.editorconfig b/.editorconfig index c363431..119ebf1 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,3 +10,7 @@ insert_final_newline = true [*.{asmdef,cs}] indent_size = 4 + +[Makefile] +indent_style = tab +indent_size = 8 diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..c01acf8 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "Plugins/yoga~"] + path = Plugins/yoga~ + url = https://github.com/facebook/yoga.git diff --git a/Plugins.meta b/Plugins.meta new file mode 100644 index 0000000..3aaefe4 --- /dev/null +++ b/Plugins.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c24ea55279e8a4d8f87446302985f39d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugins/Makefile b/Plugins/Makefile new file mode 100644 index 0000000..4844615 --- /dev/null +++ b/Plugins/Makefile @@ -0,0 +1,12 @@ +CMAKE_BIN ?= cmake + +# macOS +yoga~/build/macos: + $(CMAKE_BIN) yoga~/yoga -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -B $@ -G "Unix Makefiles" +yoga~/build/macos/libyogacore.a: | yoga~/build/macos + $(MAKE) -C $| + +flex-ui.dylib: CXXFLAGS += -arch x86_64 -arch arm64 +flex-ui.dylib: LINKFLAGS += -shared -Wl,-all_load +flex-ui.dylib: yoga~/build/macos/libyogacore.a + $(CXX) -o $@ $< $(CXXFLAGS) $(LINKFLAGS) diff --git a/Plugins/Makefile.meta b/Plugins/Makefile.meta new file mode 100644 index 0000000..684b5e6 --- /dev/null +++ b/Plugins/Makefile.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c5972c8c0ca964109bc6db5c4070ff7a +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugins/yoga~ b/Plugins/yoga~ new file mode 160000 index 0000000..a822f26 --- /dev/null +++ b/Plugins/yoga~ @@ -0,0 +1 @@ +Subproject commit a822f2635e1041b5d40081dc9d26b027550d6c74