Use CydiaSubstrate/CydiaSubstrate.h, not substrate.h.

diff --git a/CyteKit/CyteWebView.mm b/CyteKit/CyteWebView.mm
index eb101c893f68ea4e164845c1196169abbe50cf98..3d2d36ff3027274ec331b7bda540d68fcd120e4c 100644 (file)
--- 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 1b7d9ecf8709a3312958df4b554257797dcd13ee..df86958785359d85a1c1a8dc0896f131566f3106 100644 (file)
--- 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 78c94a706a8326edf42694925e6370c3d5b09917..65a7351270ff8442e51d2b08c4d4d77e6c8bd7f4 100644 (file)
--- 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 0e396e93f7cde52e43a28069ea5c878e8765ecc5..9dbe50e943c960988ca256ee3e6637cc7e18ec3a 100644 (file)
--- 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 ee64dc9020879ecaf490ab4b00f8a8dfd207ab01..3a5f23501d3e2ddaaac8dcee454bbbe6d6a6a7b9 100644 (file)
--- 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