From c2ec05099b28bff6b94a21e09720f43d0c15523c Mon Sep 17 00:00:00 2001
From: Luigi Rosso <luigi.rosso@gmail.com>
Date: Wed, 21 Sep 2022 16:42:47 -0700
Subject: [PATCH] Fixing mac compile

---
 macos/renderfont/renderfont.cpp | 4 +---
 macos/rive.podspec              | 6 +++---
 wasm/premake5_wasm.lua          | 4 ++--
 wasm/renderfont_bindings.cpp    | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/macos/renderfont/renderfont.cpp b/macos/renderfont/renderfont.cpp
index 1a9d0d6..7bf3def 100644
--- a/macos/renderfont/renderfont.cpp
+++ b/macos/renderfont/renderfont.cpp
@@ -1,9 +1,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "hb-ot.h"
-#include "hb.h"
-#include "renderfont_hb.hpp"
+#include "rive/text/renderfont_hb.hpp"
 
 #define EXPORT extern "C" __attribute__((visibility("default"))) __attribute__((used))
 
diff --git a/macos/rive.podspec b/macos/rive.podspec
index 01ea4a3..5af3e4e 100644
--- a/macos/rive.podspec
+++ b/macos/rive.podspec
@@ -17,7 +17,7 @@ Rive 2 Flutter Runtime. This package provides runtime functionality for playing
     "rive-cpp/src/math/mat2d.cpp",
     "rive-cpp/src/rive_counter.cpp",
     "rive-cpp/src/renderer.cpp",
-    "rive-cpp/skia/renderer/src/renderfont_hb.cpp",
+    "rive-cpp/src/text/renderfont_hb.cpp",
     "harfbuzz/src/hb-aat-layout.cc",
     "harfbuzz/src/hb-aat-map.cc",
     "harfbuzz/src/hb-blob.cc",
@@ -78,8 +78,8 @@ Rive 2 Flutter Runtime. This package provides runtime functionality for playing
   s.platform = :osx, "10.11"
   s.pod_target_xcconfig = {
     "DEFINES_MODULE" => "YES",
-    "OTHER_CFLAGS" => "-DRIVE_TEXT -DHAVE_OT -DHB_NO_FALLBACK_SHAPE -DHB_NO_WIN1256 -Wno-documentation -Wno-comma -Wno-unreachable-code  -Wno-shorten-64-to-32",
-    "OTHER_CPLUSPLUSFLAGS" => "-DRIVE_TEXT -DHAVE_OT -DHB_NO_FALLBACK_SHAPE -DHB_NO_WIN1256 -Wno-documentation -Wno-comma -Wno-unreachable-code -Wno-shorten-64-to-32 -std=c++17",
+    "OTHER_CFLAGS" => "-DWITH_RIVE_TEXT -DHAVE_OT -DHB_NO_FALLBACK_SHAPE -DHB_NO_WIN1256 -Wno-documentation -Wno-comma -Wno-unreachable-code  -Wno-shorten-64-to-32",
+    "OTHER_CPLUSPLUSFLAGS" => "-DWITH_RIVE_TEXT -DHAVE_OT -DHB_NO_FALLBACK_SHAPE -DHB_NO_WIN1256 -Wno-documentation -Wno-comma -Wno-unreachable-code -Wno-shorten-64-to-32 -std=c++17",
     "USER_HEADER_SEARCH_PATHS" => '"$(PODS_TARGET_SRCROOT)/harfbuzz/src" "$(PODS_TARGET_SRCROOT)/rive-cpp/include" "$(PODS_TARGET_SRCROOT)/rive-cpp/skia/renderer/include"',
     "OTHER_CPLUSPLUSFLAGS[config=Release]" => "-DNDEBUG",
   }
diff --git a/wasm/premake5_wasm.lua b/wasm/premake5_wasm.lua
index c42f6b9..42c080e 100644
--- a/wasm/premake5_wasm.lua
+++ b/wasm/premake5_wasm.lua
@@ -12,7 +12,7 @@ targetdir('build/bin/%{cfg.buildcfg}')
 objdir('build/obj/%{cfg.buildcfg}')
 
 defines {
-    'RIVE_TEXT',
+    'WITH_RIVE_TEXT',
     'HAVE_OT',
     'HB_NO_FALLBACK_SHAPE',
     'HB_NO_WIN1256'
@@ -28,7 +28,7 @@ files {
     'renderfont_bindings.cpp',
     source .. 'rive-cpp/src/renderer.cpp',
     source .. 'rive-cpp/src/math/raw_path.cpp',
-    source .. 'rive-cpp/skia/renderer/src/renderfont_hb.cpp',
+    source .. 'rive-cpp/src/text/renderfont_hb.cpp',
     source .. 'harfbuzz/src/hb-aat-layout.cc',
     source .. 'harfbuzz/src/hb-aat-map.cc',
     source .. 'harfbuzz/src/hb-blob.cc',
diff --git a/wasm/renderfont_bindings.cpp b/wasm/renderfont_bindings.cpp
index 22c02c2..9f56836 100644
--- a/wasm/renderfont_bindings.cpp
+++ b/wasm/renderfont_bindings.cpp
@@ -1,6 +1,6 @@
 #include "hb-ot.h"
 #include "hb.h"
-#include "renderfont_hb.hpp"
+#include "rive/text/renderfont_hb.hpp"
 
 #include <emscripten.h>
 #include <emscripten/bind.h>