From 3ff09fb43b1094bf1a2280ccd6ea1665f3359b5a Mon Sep 17 00:00:00 2001 From: Ben Gachowski Date: Tue, 28 Jul 2020 20:05:33 -0400 Subject: [PATCH 1/2] Add [defines] section to cbindgen.toml --- c/cbindgen.toml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/c/cbindgen.toml b/c/cbindgen.toml index 902ee9b5..8b2dfd74 100644 --- a/c/cbindgen.toml +++ b/c/cbindgen.toml @@ -5,6 +5,10 @@ header = """\ #ifndef PF_PATHFINDER_H #define PF_PATHFINDER_H +#if defined(__APPLE__) +#define PATHFINDER_MACOS +#endif + #if defined(__APPLE__) && defined(__OBJC__) #include #else @@ -58,3 +62,8 @@ include = [ "Scene" = "PFScenePrivate" "SceneProxy" = "PFSceneProxyPrivate" "SVGScene" = "PFSVGScenePrivate" + +[defines] +"target_os = macos" = "PATHFINDER_MACOS" +"feature = pf-text" = "PATHFINDER_TEXT" +"feature = pf-gl" = "PATHFINDER_GL" \ No newline at end of file From 56b432b4664cb06b2f3cb95ba28b4e34823ed32a Mon Sep 17 00:00:00 2001 From: Ben Gachowski Date: Tue, 28 Jul 2020 20:16:42 -0400 Subject: [PATCH 2/2] Replace PATHFINDER_MACOS with __APPLE__ --- c/cbindgen.toml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/c/cbindgen.toml b/c/cbindgen.toml index 8b2dfd74..2e1f419c 100644 --- a/c/cbindgen.toml +++ b/c/cbindgen.toml @@ -5,10 +5,6 @@ header = """\ #ifndef PF_PATHFINDER_H #define PF_PATHFINDER_H -#if defined(__APPLE__) -#define PATHFINDER_MACOS -#endif - #if defined(__APPLE__) && defined(__OBJC__) #include #else @@ -64,6 +60,6 @@ include = [ "SVGScene" = "PFSVGScenePrivate" [defines] -"target_os = macos" = "PATHFINDER_MACOS" +"target_os = macos" = "__APPLE__" "feature = pf-text" = "PATHFINDER_TEXT" "feature = pf-gl" = "PATHFINDER_GL" \ No newline at end of file