From 435cb85753e48dd77a02258dd6715e8cb153d429 Mon Sep 17 00:00:00 2001
From: "Jay Freeman (saurik)" <saurik@saurik.com>
Date: Mon, 28 Feb 2011 21:13:49 -0800
Subject: [PATCH] Use CydiaSubstrate/CydiaSubstrate.h, not substrate.h.

---
 CyteKit/CyteWebView.mm           | 3 ++-
 CyteKit/CyteWebViewController.h  | 2 +-
 CyteKit/CyteWebViewController.mm | 2 --
 MobileCydia.mm                   | 2 +-
 makefile                         | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CyteKit/CyteWebView.mm b/CyteKit/CyteWebView.mm
index eb101c89..3d2d36ff 100644
--- a/CyteKit/CyteWebView.mm
+++ b/CyteKit/CyteWebView.mm
@@ -1,7 +1,8 @@
 #include "CyteKit/CyteWebView.h"
 
+#include <CydiaSubstrate/CydiaSubstrate.h>
+
 #include "iPhonePrivate.h"
-#include "substrate.h"
 
 // CYWebPolicyDecision* {{{
 enum CYWebPolicyDecision {
diff --git a/CyteKit/CyteWebViewController.h b/CyteKit/CyteWebViewController.h
index 1b7d9ecf..df869587 100644
--- a/CyteKit/CyteWebViewController.h
+++ b/CyteKit/CyteWebViewController.h
@@ -45,7 +45,7 @@
 
 #include <UIKit/UIKit.h>
 
-#include "substrate.h"
+#include <CydiaSubstrate/CydiaSubstrate.h>
 
 @class IndirectDelegate;
 
diff --git a/CyteKit/CyteWebViewController.mm b/CyteKit/CyteWebViewController.mm
index 78c94a70..65a73512 100644
--- a/CyteKit/CyteWebViewController.mm
+++ b/CyteKit/CyteWebViewController.mm
@@ -21,8 +21,6 @@ extern NSString * const kCAFilterNearest;
 #include <WebKit/DOMHTMLBodyElement.h>
 #include <WebKit/DOMRGBColor.h>
 
-#include "substrate.h"
-
 #define ForSaurik 0
 #define DefaultTimeout_ 120.0
 
diff --git a/MobileCydia.mm b/MobileCydia.mm
index 0e396e93..9dbe50e9 100644
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -126,7 +126,7 @@ extern "C" {
 
 #include "SDURLCache/SDURLCache.h"
 
-#include "substrate.h"
+#include <CydiaSubstrate/CydiaSubstrate.h>
 /* }}} */
 
 /* Profiler {{{ */
diff --git a/makefile b/makefile
index ee64dc90..3a5f2350 100644
--- a/makefile
+++ b/makefile
@@ -55,7 +55,7 @@ version := $(shell ./version.sh)
 
 #cycc = cycc -r4.2 -i$(ios) -o$@
 gxx := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-$(gcc)
-cycc = $(gxx) -mthumb -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F/Library/Frameworks
+cycc = $(gxx) -mthumb -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F{sysroot,}/Library/Frameworks
 
 all: MobileCydia
 
-- 
2.45.2