From 23535e8f8c5d870da7f8f8f36ddff6b3b86e409b Mon Sep 17 00:00:00 2001
From: Matthias Ringwald <matthias@ringwald.ch>
Date: Sun, 1 Nov 2015 20:35:42 +0100
Subject: [PATCH] fix include paths for iOS

---
 platforms/ios/CocoaTouch/include/BTstack/BTstackManager.h     | 2 +-
 platforms/ios/CocoaTouch/src/BTstackManager.m                 | 2 +-
 platforms/ios/PrefsBundle/BluetoothController.h               | 2 +-
 platforms/ios/PrefsBundle/Makefile                            | 2 +-
 platforms/ios/example/Makefile                                | 2 +-
 .../WiiMoteOpenGLDemo/Classes/WiiMoteOpenGLDemoAppDelegate.m  | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/platforms/ios/CocoaTouch/include/BTstack/BTstackManager.h b/platforms/ios/CocoaTouch/include/BTstack/BTstackManager.h
index 15042085c..04b8f0586 100644
--- a/platforms/ios/CocoaTouch/include/BTstack/BTstackManager.h
+++ b/platforms/ios/CocoaTouch/include/BTstack/BTstackManager.h
@@ -34,7 +34,7 @@
 
 #import <Foundation/Foundation.h>
 #import <stdint.h>
-#import <btstack/btstack.h>
+#import "btstack.h"
 
 #define PREFS_REMOTE_NAME  @"RemoteName"
 #define PREFS_LINK_KEY     @"LinkKey"
diff --git a/platforms/ios/CocoaTouch/src/BTstackManager.m b/platforms/ios/CocoaTouch/src/BTstackManager.m
index aa4d2b4cb..c1c488e0c 100644
--- a/platforms/ios/CocoaTouch/src/BTstackManager.m
+++ b/platforms/ios/CocoaTouch/src/BTstackManager.m
@@ -31,7 +31,7 @@
 
 #import <BTstack/BTstackManager.h>
 
-#import <btstack/btstack.h>
+#import "btstack.h"
 #import <btstack/BTDevice.h>
 
 #define INQUIRY_INTERVAL 3
diff --git a/platforms/ios/PrefsBundle/BluetoothController.h b/platforms/ios/PrefsBundle/BluetoothController.h
index 18e455a22..46afb4eaf 100644
--- a/platforms/ios/PrefsBundle/BluetoothController.h
+++ b/platforms/ios/PrefsBundle/BluetoothController.h
@@ -29,7 +29,7 @@
  *
  */
 
-#import <btstack/btstack.h>
+#import "btstack.h"
 
 typedef enum transitionStates {
     kIdle = 1,
diff --git a/platforms/ios/PrefsBundle/Makefile b/platforms/ios/PrefsBundle/Makefile
index f34555337..555f367de 100644
--- a/platforms/ios/PrefsBundle/Makefile
+++ b/platforms/ios/PrefsBundle/Makefile
@@ -10,7 +10,7 @@ BUNDLE_NAME = BTstack
 BTstack_FILES = PrefsViewController.m BluetoothController.m BluetoothTableViewAdapter.m
 BTstack_INSTALL_PATH = /Library/PreferenceBundles
 BTstack_FRAMEWORKS = UIKit
-BTstack_CFLAGS = -I.. -I../../../include -g
+BTstack_CFLAGS = -I.. -I../../../src -g
 
 BTstack_LDFLAGS = -L../src/.theos/obj -lBTstack
 BTstack_PRIVATE_FRAMEWORKS = Preferences
diff --git a/platforms/ios/example/Makefile b/platforms/ios/example/Makefile
index 598255660..97d106f37 100644
--- a/platforms/ios/example/Makefile
+++ b/platforms/ios/example/Makefile
@@ -10,7 +10,7 @@ ARCHS = armv6 arm64
 BTSTACK_ROOT=../../..
 VPATH += $(BTSTACK_ROOT)/example/daemon
 
-ADDITIONAL_CFLAGS =  -I.. -I$(BTSTACK_ROOT)/include
+ADDITIONAL_CFLAGS =  -I.. -I$(BTSTACK_ROOT)/src -I$(BTSTACK_ROOT)/ble
 ADDITIONAL_LDFLAGS = -L../src/.theos/obj -lBTstack
 
 TOOL_NAME = inquiry l2cap-test rfcomm-echo rfcomm-cat rfcomm-test l2cap-server l2cap-throughput
diff --git a/platforms/ios/example/WiiMoteOpenGLDemo/Classes/WiiMoteOpenGLDemoAppDelegate.m b/platforms/ios/example/WiiMoteOpenGLDemo/Classes/WiiMoteOpenGLDemoAppDelegate.m
index e547b4aab..2e6d2fe7b 100644
--- a/platforms/ios/example/WiiMoteOpenGLDemo/Classes/WiiMoteOpenGLDemoAppDelegate.m
+++ b/platforms/ios/example/WiiMoteOpenGLDemo/Classes/WiiMoteOpenGLDemoAppDelegate.m
@@ -40,8 +40,8 @@
 #import "EAGLView.h"
 #import "EAGLViewController.h"
 
-#import <btstack/btstack.h>
-#import <btstack/run_loop.h>
+#import "btstack.h"
+#import "run_loop.h"
 #import <btstack/hci_cmds.h>
 
 @interface UIDevice (privateAPI)