From 32db4ecef0570506c103b5d18456b88e8be552f8 Mon Sep 17 00:00:00 2001 From: "matthias.ringwald@gmail.com" Date: Thu, 4 Sep 2014 14:34:03 +0000 Subject: [PATCH] moved remote_device_db_iphone and run_loop_cocoa to new platforms/cocoa --- .../cocoa/remote_device_db_cocoa.m | 0 {src => platforms/cocoa}/run_loop_cocoa.m | 0 platforms/ios/src/Makefile.iphone | 9 +++++++-- 3 files changed, 7 insertions(+), 2 deletions(-) rename src/remote_device_db_iphone.m => platforms/cocoa/remote_device_db_cocoa.m (100%) rename {src => platforms/cocoa}/run_loop_cocoa.m (100%) diff --git a/src/remote_device_db_iphone.m b/platforms/cocoa/remote_device_db_cocoa.m similarity index 100% rename from src/remote_device_db_iphone.m rename to platforms/cocoa/remote_device_db_cocoa.m diff --git a/src/run_loop_cocoa.m b/platforms/cocoa/run_loop_cocoa.m similarity index 100% rename from src/run_loop_cocoa.m rename to platforms/cocoa/run_loop_cocoa.m diff --git a/platforms/ios/src/Makefile.iphone b/platforms/ios/src/Makefile.iphone index a72c3aaa6..29a4c1bd8 100644 --- a/platforms/ios/src/Makefile.iphone +++ b/platforms/ios/src/Makefile.iphone @@ -8,7 +8,12 @@ ARCHS = armv6 arm64 LIBRARY_NAME = libBTstack libBTstack_FILES = btstack.c hci_cmds.c linked_list.c -libBTstack_FILES += run_loop.c run_loop_cocoa.m run_loop_posix.c sdp_util.c socket_connection.c utils.c +libBTstack_FILES += run_loop.c \ + ../platforms/cocoa/run_loop_cocoa.m \ + run_loop_posix.c \ + sdp_util.c \ + socket_connection.c \ + utils.c libBTstack_CFLAGS = -I../include -I../ble -I../src -I.. TOOL_NAME = BTdaemon @@ -17,6 +22,7 @@ BTdaemon_FILES = $(libBTstack_FILES) \ ../platforms/ios/src/hci_transport_h4_iphone.c \ ../platforms/ios/src/platform_iphone.m \ ../platforms/ios/SpringBoardAccess/SpringBoardAccess.c \ + ../platforms/cocoa/remote_device_db_cocoa.m \ btstack_memory.c \ daemon.c \ hci.c \ @@ -25,7 +31,6 @@ BTdaemon_FILES = $(libBTstack_FILES) \ l2cap.c \ l2cap_signaling.c \ memory_pool.c \ - remote_device_db_iphone.m \ rfcomm.c \ sdp.c \ sdp_client.c \