From 8a578abf0809b89ff1a4d664dbdd3c5fba767705 Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremy@rand-family.com>
Date: Thu, 4 Jul 2019 22:31:11 -0400
Subject: [PATCH] Ensure that the include path for the old and new version of
 the cc65 package is correct so auto-complete in C works in both cases.

---
 .../Apple II Basic Project.xctemplate/TemplateInfo.plist        | 2 +-
 .../Apple II Merlin Project.xctemplate/TemplateInfo.plist       | 2 +-
 .../Apple II ca65 Project.xctemplate/TemplateInfo.plist         | 2 +-
 .../Apple II cc65 Project.xctemplate/TemplateInfo.plist         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/Templates/Apple II/Apple II Basic Project.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple II/Apple II Basic Project.xctemplate/TemplateInfo.plist
index a160fc1..5bcac7a 100644
--- a/pkg/Templates/Apple II/Apple II Basic Project.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple II/Apple II Basic Project.xctemplate/TemplateInfo.plist	
@@ -179,7 +179,7 @@
                                 <key>GCC_PREPROCESSOR_DEFINITIONS</key>
                                 <string>__fastcall__=""</string>
                                 <key>HEADER_SEARCH_PATHS</key>
-                                <string>/usr/local/lib/cc65/include</string>
+                                <string>/usr/local/lib/cc65/include /usr/local/share/cc65/include</string>
                         </dict>
                         <key>BuildPhases</key>
                         <array>
diff --git a/pkg/Templates/Apple II/Apple II Merlin Project.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple II/Apple II Merlin Project.xctemplate/TemplateInfo.plist
index f1772d1..09b664a 100644
--- a/pkg/Templates/Apple II/Apple II Merlin Project.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple II/Apple II Merlin Project.xctemplate/TemplateInfo.plist	
@@ -185,7 +185,7 @@
                                 <key>GCC_PREPROCESSOR_DEFINITIONS</key>
                                 <string>__fastcall__=""</string>
                                 <key>HEADER_SEARCH_PATHS</key>
-                                <string>/usr/local/lib/cc65/include</string>
+                                <string>/usr/local/lib/cc65/include /usr/local/share/cc65/include</string>
                         </dict>
                         <key>BuildPhases</key>
                         <array>
diff --git a/pkg/Templates/Apple II/Apple II ca65 Project.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple II/Apple II ca65 Project.xctemplate/TemplateInfo.plist
index 86cc3d3..8b7cb12 100644
--- a/pkg/Templates/Apple II/Apple II ca65 Project.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple II/Apple II ca65 Project.xctemplate/TemplateInfo.plist	
@@ -179,7 +179,7 @@
                                 <key>GCC_PREPROCESSOR_DEFINITIONS</key>
                                 <string>__fastcall__=""</string>
                                 <key>HEADER_SEARCH_PATHS</key>
-                                <string>/usr/local/lib/cc65/include</string>
+                                <string>/usr/local/lib/cc65/include /usr/local/share/cc65/include</string>
                         </dict>
                         <key>BuildPhases</key>
                         <array>
diff --git a/pkg/Templates/Apple II/Apple II cc65 Project.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple II/Apple II cc65 Project.xctemplate/TemplateInfo.plist
index 51d616d..ef0379c 100644
--- a/pkg/Templates/Apple II/Apple II cc65 Project.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple II/Apple II cc65 Project.xctemplate/TemplateInfo.plist	
@@ -179,7 +179,7 @@
                                 <key>GCC_PREPROCESSOR_DEFINITIONS</key>
                                 <string>__fastcall__=""</string>
                                 <key>HEADER_SEARCH_PATHS</key>
-                                <string>/usr/local/lib/cc65/include</string>
+				<string>/usr/local/lib/cc65/include /usr/local/share/cc65/include</string>
                         </dict>
                         <key>BuildPhases</key>
                         <array>