diff --git a/POCpp.xcodeproj/project.pbxproj b/POCpp.xcodeproj/project.pbxproj index bf58171..a30d013 100644 --- a/POCpp.xcodeproj/project.pbxproj +++ b/POCpp.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + C55FC1511F1580F700141DB1 /* libmraa.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C55FC1501F1580F700141DB1 /* libmraa.a */; }; C568AED71F13E97F00524D66 /* libbson-1.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = C568AED11F13E97F00524D66 /* libbson-1.0.0.dylib */; }; C568AED81F13E97F00524D66 /* libbsoncxx.3.1.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = C568AED21F13E97F00524D66 /* libbsoncxx.3.1.1.dylib */; }; C568AED91F13E97F00524D66 /* libbsoncxx.3.1.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = C568AED31F13E97F00524D66 /* libbsoncxx.3.1.1.dylib */; }; @@ -40,6 +41,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + C55FC1501F1580F700141DB1 /* libmraa.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmraa.a; path = include/mraa/libmraa.a; sourceTree = ""; }; C568AEC01F13D1F800524D66 /* POCpp */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = POCpp; sourceTree = BUILT_PRODUCTS_DIR; }; C568AECA1F13D25200524D66 /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; path = src; sourceTree = ""; }; C568AECB1F13D28500524D66 /* bin */ = {isa = PBXFileReference; lastKnownFileType = folder; path = bin; sourceTree = ""; }; @@ -83,6 +85,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + C55FC1511F1580F700141DB1 /* libmraa.a in Frameworks */, C568AED71F13E97F00524D66 /* libbson-1.0.0.dylib in Frameworks */, C568AED81F13E97F00524D66 /* libbsoncxx.3.1.1.dylib in Frameworks */, C568AED91F13E97F00524D66 /* libbsoncxx.3.1.1.dylib in Frameworks */, @@ -119,6 +122,7 @@ C568AED01F13E97F00524D66 /* Frameworks */ = { isa = PBXGroup; children = ( + C55FC1501F1580F700141DB1 /* libmraa.a */, C568AED11F13E97F00524D66 /* libbson-1.0.0.dylib */, C568AED21F13E97F00524D66 /* libbsoncxx.3.1.1.dylib */, C568AED31F13E97F00524D66 /* libbsoncxx.3.1.1.dylib */, @@ -330,9 +334,13 @@ isa = XCBuildConfiguration; buildSettings = { DEVELOPMENT_TEAM = JNP6SX52H9; - LIBRARY_SEARCH_PATHS = "/usr/local/lib/**"; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = ( + "/usr/local/lib/**", + "$(PROJECT_DIR)/include/mraa", + ); PRODUCT_NAME = "$(TARGET_NAME)"; - USER_HEADER_SEARCH_PATHS = "include/** /usr/local/include/libmongoc-1.0/** /usr/local/include/mongocxx/v_noabi/** /usr/local/include/bsoncxx/v_noabi/** /usr/local/include/libbson-1.0/** include/wiringPi ./include/** ./include/mraa/**"; + USER_HEADER_SEARCH_PATHS = "/usr/local/include/libmongoc-1.0/** /usr/local/include/mongocxx/v_noabi/** /usr/local/include/bsoncxx/v_noabi/** /usr/local/include/libbson-1.0/** ./include ./include/mraa"; }; name = Debug; }; @@ -340,9 +348,13 @@ isa = XCBuildConfiguration; buildSettings = { DEVELOPMENT_TEAM = JNP6SX52H9; - LIBRARY_SEARCH_PATHS = "/usr/local/lib/**"; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = ( + "/usr/local/lib/**", + "$(PROJECT_DIR)/include/mraa", + ); PRODUCT_NAME = "$(TARGET_NAME)"; - USER_HEADER_SEARCH_PATHS = "include/** /usr/local/include/libmongoc-1.0/** /usr/local/include/mongocxx/v_noabi/** /usr/local/include/bsoncxx/v_noabi/** /usr/local/include/libbson-1.0/** include/wiringPi ./include/** ./include/mraa/**"; + USER_HEADER_SEARCH_PATHS = "/usr/local/include/libmongoc-1.0/** /usr/local/include/mongocxx/v_noabi/** /usr/local/include/bsoncxx/v_noabi/** /usr/local/include/libbson-1.0/** ./include ./include/mraa"; }; name = Release; }; diff --git a/POCpp.xcodeproj/project.xcworkspace/xcuserdata/patrickjmcd.xcuserdatad/UserInterfaceState.xcuserstate b/POCpp.xcodeproj/project.xcworkspace/xcuserdata/patrickjmcd.xcuserdatad/UserInterfaceState.xcuserstate index 2d39558..56a90d3 100644 Binary files a/POCpp.xcodeproj/project.xcworkspace/xcuserdata/patrickjmcd.xcuserdatad/UserInterfaceState.xcuserstate and b/POCpp.xcodeproj/project.xcworkspace/xcuserdata/patrickjmcd.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/src/AnalogIn.cpp b/src/AnalogIn.cpp index 7fbee89..215ea0e 100644 --- a/src/AnalogIn.cpp +++ b/src/AnalogIn.cpp @@ -89,7 +89,7 @@ AnalogIn::~AnalogIn() { // TODO Auto-generated destructor stub } -int main(){ +int test(){ MuxSetup mux; double a1val, a2val; diff --git a/src/DigitalIn.cpp b/src/DigitalIn.cpp index 1198083..dffff6b 100644 --- a/src/DigitalIn.cpp +++ b/src/DigitalIn.cpp @@ -25,7 +25,7 @@ DigitalIn::~DigitalIn() { // TODO Auto-generated destructor stub } -int main(){ +int test(){ MuxSetup mux; DigitalIn dI1(1); diff --git a/src/DigitalOut.cpp b/src/DigitalOut.cpp index 6f9a6dc..737b6a6 100644 --- a/src/DigitalOut.cpp +++ b/src/DigitalOut.cpp @@ -53,7 +53,7 @@ DigitalOut::~DigitalOut() { pin->write(0); } -int main(){ +int test(){ DigitalOut dO1(1); DigitalOut dO2(2); DigitalOut dO3(3);