Skip to content

Commit 497c068

Browse files
arik-soarik-so
committed
Copy header files in build-libldk.sh step.
1 parent a206ad8 commit 497c068

File tree

2 files changed

+66
-71
lines changed

2 files changed

+66
-71
lines changed

‎xcode/LDK/LDKFramework.xcodeproj/project.pbxproj

Lines changed: 54 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -697,16 +697,16 @@
697697
07D3F2B62870C9FA0095CCD8 /* InvoicePayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3F00B2870C9F80095CCD8 /* InvoicePayer.swift */; };
698698
07D3F2B72870C9FA0095CCD8 /* DelayedPaymentOutputDescriptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3F00C2870C9F80095CCD8 /* DelayedPaymentOutputDescriptor.swift */; };
699699
07D3F2B82870C9FA0095CCD8 /* DelayedPaymentOutputDescriptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3F00C2870C9F80095CCD8 /* DelayedPaymentOutputDescriptor.swift */; };
700-
07D3F2BC2870DE990095CCD8 /* ldk_rust_types.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D3F2B92870DE990095CCD8 /* ldk_rust_types.h */; settings = {ATTRIBUTES = (Public, ); }; };
701-
07D3F2BD2870DE990095CCD8 /* ldk_rust_types.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D3F2B92870DE990095CCD8 /* ldk_rust_types.h */; settings = {ATTRIBUTES = (Public, ); }; };
702-
07D3F2BE2870DE990095CCD8 /* ldk_ver.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D3F2BA2870DE990095CCD8 /* ldk_ver.h */; settings = {ATTRIBUTES = (Public, ); }; };
703-
07D3F2BF2870DE990095CCD8 /* ldk_ver.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D3F2BA2870DE990095CCD8 /* ldk_ver.h */; settings = {ATTRIBUTES = (Public, ); }; };
704-
07D3F2C02870DE990095CCD8 /* lightning.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D3F2BB2870DE990095CCD8 /* lightning.h */; settings = {ATTRIBUTES = (Public, ); }; };
705-
07D3F2C12870DE990095CCD8 /* lightning.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D3F2BB2870DE990095CCD8 /* lightning.h */; settings = {ATTRIBUTES = (Public, ); }; };
706-
07D3F2C42870DEA70095CCD8 /* ldk_net.c in Sources */ = {isa = PBXBuildFile; fileRef = 07D3F2C22870DEA70095CCD8 /* ldk_net.c */; };
707-
07D3F2C52870DEA70095CCD8 /* ldk_net.c in Sources */ = {isa = PBXBuildFile; fileRef = 07D3F2C22870DEA70095CCD8 /* ldk_net.c */; };
708-
07D3F2C62870DEA70095CCD8 /* ldk_net.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D3F2C32870DEA70095CCD8 /* ldk_net.h */; settings = {ATTRIBUTES = (Public, ); }; };
709-
07D3F2C72870DEA70095CCD8 /* ldk_net.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D3F2C32870DEA70095CCD8 /* ldk_net.h */; settings = {ATTRIBUTES = (Public, ); }; };
700+
07D3F2E6287107AB0095CCD8 /* ldk_rust_types.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D3F2E1287107AB0095CCD8 /* ldk_rust_types.h */; settings = {ATTRIBUTES = (Public, ); }; };
701+
07D3F2E7287107AB0095CCD8 /* ldk_rust_types.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D3F2E1287107AB0095CCD8 /* ldk_rust_types.h */; settings = {ATTRIBUTES = (Public, ); }; };
702+
07D3F2E8287107AB0095CCD8 /* lightning.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D3F2E2287107AB0095CCD8 /* lightning.h */; settings = {ATTRIBUTES = (Public, ); }; };
703+
07D3F2E9287107AB0095CCD8 /* lightning.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D3F2E2287107AB0095CCD8 /* lightning.h */; settings = {ATTRIBUTES = (Public, ); }; };
704+
07D3F2EA287107AB0095CCD8 /* ldk_net.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D3F2E3287107AB0095CCD8 /* ldk_net.h */; settings = {ATTRIBUTES = (Public, ); }; };
705+
07D3F2EB287107AB0095CCD8 /* ldk_net.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D3F2E3287107AB0095CCD8 /* ldk_net.h */; settings = {ATTRIBUTES = (Public, ); }; };
706+
07D3F2EC287107AB0095CCD8 /* ldk_net.c in Sources */ = {isa = PBXBuildFile; fileRef = 07D3F2E4287107AB0095CCD8 /* ldk_net.c */; };
707+
07D3F2ED287107AB0095CCD8 /* ldk_net.c in Sources */ = {isa = PBXBuildFile; fileRef = 07D3F2E4287107AB0095CCD8 /* ldk_net.c */; };
708+
07D3F2EE287107AB0095CCD8 /* ldk_ver.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D3F2E5287107AB0095CCD8 /* ldk_ver.h */; settings = {ATTRIBUTES = (Public, ); }; };
709+
07D3F2EF287107AB0095CCD8 /* ldk_ver.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D3F2E5287107AB0095CCD8 /* ldk_ver.h */; settings = {ATTRIBUTES = (Public, ); }; };
710710
754BCE1128308D700050F361 /* libldk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 754BCE1028308D6D0050F361 /* libldk.a */; };
711711
754BD0E1283158F70050F361 /* LDKFramework_Mac.h in Headers */ = {isa = PBXBuildFile; fileRef = 754BD0E0283158F70050F361 /* LDKFramework_Mac.h */; settings = {ATTRIBUTES = (Public, ); }; };
712712
754BD65128315A460050F361 /* LDKFramework.h in Headers */ = {isa = PBXBuildFile; fileRef = 754BD65028315A460050F361 /* LDKFramework.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1076,11 +1076,11 @@
10761076
07D3F00A2870C9F80095CCD8 /* OutPoint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OutPoint.swift; sourceTree = "<group>"; };
10771077
07D3F00B2870C9F80095CCD8 /* InvoicePayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InvoicePayer.swift; sourceTree = "<group>"; };
10781078
07D3F00C2870C9F80095CCD8 /* DelayedPaymentOutputDescriptor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DelayedPaymentOutputDescriptor.swift; sourceTree = "<group>"; };
1079-
07D3F2B92870DE990095CCD8 /* ldk_rust_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ldk_rust_types.h; path = "../../../../ldk-c-bindings/lightning-c-bindings/include/ldk_rust_types.h"; sourceTree = "<group>"; };
1080-
07D3F2BA2870DE990095CCD8 /* ldk_ver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ldk_ver.h; path = "../../../../ldk-c-bindings/lightning-c-bindings/include/ldk_ver.h"; sourceTree = "<group>"; };
1081-
07D3F2BB2870DE990095CCD8 /* lightning.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lightning.h; path = "../../../../ldk-c-bindings/lightning-c-bindings/include/lightning.h"; sourceTree = "<group>"; };
1082-
07D3F2C22870DEA70095CCD8 /* ldk_net.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldk_net.c; path = "../../../../ldk-c-bindings/ldk-net/ldk_net.c"; sourceTree = "<group>"; };
1083-
07D3F2C32870DEA70095CCD8 /* ldk_net.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ldk_net.h; path = "../../../../ldk-c-bindings/ldk-net/ldk_net.h"; sourceTree = "<group>"; };
1079+
07D3F2E1287107AB0095CCD8 /* ldk_rust_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ldk_rust_types.h; sourceTree = "<group>"; };
1080+
07D3F2E2287107AB0095CCD8 /* lightning.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lightning.h; sourceTree = "<group>"; };
1081+
07D3F2E3287107AB0095CCD8 /* ldk_net.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ldk_net.h; sourceTree = "<group>"; };
1082+
07D3F2E4287107AB0095CCD8 /* ldk_net.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ldk_net.c; sourceTree = "<group>"; };
1083+
07D3F2E5287107AB0095CCD8 /* ldk_ver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ldk_ver.h; sourceTree = "<group>"; };
10841084
754BCB5228308BDD0050F361 /* LDKFramework.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = LDKFramework.modulemap; sourceTree = "<group>"; };
10851085
754BCE1028308D6D0050F361 /* libldk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libldk.a; sourceTree = "<group>"; };
10861086
754BD0DE283158F70050F361 /* LDKFramework_Mac.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LDKFramework_Mac.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1514,11 +1514,11 @@
15141514
754BCB5328308BEF0050F361 /* headers */ = {
15151515
isa = PBXGroup;
15161516
children = (
1517-
07D3F2B92870DE990095CCD8 /* ldk_rust_types.h */,
1518-
07D3F2BA2870DE990095CCD8 /* ldk_ver.h */,
1519-
07D3F2BB2870DE990095CCD8 /* lightning.h */,
1520-
07D3F2C22870DEA70095CCD8 /* ldk_net.c */,
1521-
07D3F2C32870DEA70095CCD8 /* ldk_net.h */,
1517+
07D3F2E4287107AB0095CCD8 /* ldk_net.c */,
1518+
07D3F2E3287107AB0095CCD8 /* ldk_net.h */,
1519+
07D3F2E1287107AB0095CCD8 /* ldk_rust_types.h */,
1520+
07D3F2E5287107AB0095CCD8 /* ldk_ver.h */,
1521+
07D3F2E2287107AB0095CCD8 /* lightning.h */,
15221522
);
15231523
path = headers;
15241524
sourceTree = "<group>";
@@ -1586,10 +1586,10 @@
15861586
isa = PBXHeadersBuildPhase;
15871587
buildActionMask = 2147483647;
15881588
files = (
1589-
07D3F2BD2870DE990095CCD8 /* ldk_rust_types.h in Headers */,
1590-
07D3F2C12870DE990095CCD8 /* lightning.h in Headers */,
1591-
07D3F2BF2870DE990095CCD8 /* ldk_ver.h in Headers */,
1592-
07D3F2C72870DEA70095CCD8 /* ldk_net.h in Headers */,
1589+
07D3F2EB287107AB0095CCD8 /* ldk_net.h in Headers */,
1590+
07D3F2E9287107AB0095CCD8 /* lightning.h in Headers */,
1591+
07D3F2E7287107AB0095CCD8 /* ldk_rust_types.h in Headers */,
1592+
07D3F2EF287107AB0095CCD8 /* ldk_ver.h in Headers */,
15931593
754BD0E1283158F70050F361 /* LDKFramework_Mac.h in Headers */,
15941594
);
15951595
runOnlyForDeploymentPostprocessing = 0;
@@ -1598,10 +1598,10 @@
15981598
isa = PBXHeadersBuildPhase;
15991599
buildActionMask = 2147483647;
16001600
files = (
1601-
07D3F2BC2870DE990095CCD8 /* ldk_rust_types.h in Headers */,
1602-
07D3F2C02870DE990095CCD8 /* lightning.h in Headers */,
1603-
07D3F2BE2870DE990095CCD8 /* ldk_ver.h in Headers */,
1604-
07D3F2C62870DEA70095CCD8 /* ldk_net.h in Headers */,
1601+
07D3F2EA287107AB0095CCD8 /* ldk_net.h in Headers */,
1602+
07D3F2E8287107AB0095CCD8 /* lightning.h in Headers */,
1603+
07D3F2E6287107AB0095CCD8 /* ldk_rust_types.h in Headers */,
1604+
07D3F2EE287107AB0095CCD8 /* ldk_ver.h in Headers */,
16051605
754BD65128315A460050F361 /* LDKFramework.h in Headers */,
16061606
);
16071607
runOnlyForDeploymentPostprocessing = 0;
@@ -1819,7 +1819,7 @@
18191819
07D3F2122870C9F90095CCD8 /* ShutdownScript.swift in Sources */,
18201820
07D3F03A2870C9F80095CCD8 /* Option_u16Z.swift in Sources */,
18211821
07D3F1CA2870C9F90095CCD8 /* Ping.swift in Sources */,
1822-
07D3F2C52870DEA70095CCD8 /* ldk_net.c in Sources */,
1822+
07D3F2ED287107AB0095CCD8 /* ldk_net.c in Sources */,
18231823
07D3F0CC2870C9F80095CCD8 /* Result_StaticPaymentOutputDescriptorDecodeErrorZ.swift in Sources */,
18241824
07D3F0482870C9F80095CCD8 /* ClosureReason.swift in Sources */,
18251825
07D3F19E2870C9F90095CCD8 /* Result_InvoiceParseOrSemanticErrorZ.swift in Sources */,
@@ -2171,7 +2171,7 @@
21712171
07D3F2112870C9F90095CCD8 /* ShutdownScript.swift in Sources */,
21722172
07D3F0392870C9F80095CCD8 /* Option_u16Z.swift in Sources */,
21732173
07D3F1C92870C9F90095CCD8 /* Ping.swift in Sources */,
2174-
07D3F2C42870DEA70095CCD8 /* ldk_net.c in Sources */,
2174+
07D3F2EC287107AB0095CCD8 /* ldk_net.c in Sources */,
21752175
07D3F0CB2870C9F80095CCD8 /* Result_StaticPaymentOutputDescriptorDecodeErrorZ.swift in Sources */,
21762176
07D3F0472870C9F80095CCD8 /* ClosureReason.swift in Sources */,
21772177
07D3F19D2870C9F90095CCD8 /* Result_InvoiceParseOrSemanticErrorZ.swift in Sources */,
@@ -2474,18 +2474,13 @@
24742474
DYLIB_CURRENT_VERSION = 1;
24752475
DYLIB_INSTALL_NAME_BASE = "@rpath";
24762476
GENERATE_INFOPLIST_FILE = YES;
2477-
HEADER_SEARCH_PATHS = (
2478-
"${LDK_C_BINDINGS_BASE}/lightning-c-bindings/include",
2479-
"${LDK_C_BINDINGS_BASE}/ldk-net",
2480-
);
24812477
INFOPLIST_KEY_NSHumanReadableCopyright = "";
24822478
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
24832479
LD_RUNPATH_SEARCH_PATHS = (
24842480
"$(inherited)",
24852481
"@executable_path/../Frameworks",
24862482
"@loader_path/Frameworks",
24872483
);
2488-
LIBRARY_SEARCH_PATHS = "${LDK_C_BINDINGS_BINARY_DIRECTORY}";
24892484
MACOSX_DEPLOYMENT_TARGET = 12.3;
24902485
MARKETING_VERSION = 1.0;
24912486
MODULEMAP_FILE = LDKFramework_Mac/LDKFramework_Mac.modulemap;
@@ -2512,18 +2507,13 @@
25122507
DYLIB_CURRENT_VERSION = 1;
25132508
DYLIB_INSTALL_NAME_BASE = "@rpath";
25142509
GENERATE_INFOPLIST_FILE = YES;
2515-
HEADER_SEARCH_PATHS = (
2516-
"${LDK_C_BINDINGS_BASE}/lightning-c-bindings/include",
2517-
"${LDK_C_BINDINGS_BASE}/ldk-net",
2518-
);
25192510
INFOPLIST_KEY_NSHumanReadableCopyright = "";
25202511
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
25212512
LD_RUNPATH_SEARCH_PATHS = (
25222513
"$(inherited)",
25232514
"@executable_path/../Frameworks",
25242515
"@loader_path/Frameworks",
25252516
);
2526-
LIBRARY_SEARCH_PATHS = "${LDK_C_BINDINGS_BINARY_DIRECTORY}";
25272517
MACOSX_DEPLOYMENT_TARGET = 12.3;
25282518
MARKETING_VERSION = 1.0;
25292519
MODULEMAP_FILE = LDKFramework_Mac/LDKFramework_Mac.modulemap;
@@ -2539,8 +2529,6 @@
25392529
754BD6582831607A0050F361 /* Debug */ = {
25402530
isa = XCBuildConfiguration;
25412531
buildSettings = {
2542-
LDK_C_BINDINGS_BASE = "${LDK_C_BINDINGS_BASE}";
2543-
LDK_C_BINDINGS_BINARY_DIRECTORY = "${LDK_C_BINDINGS_BINARY_DIRECTORY}";
25442532
PATH = "";
25452533
PRODUCT_NAME = "$(TARGET_NAME)";
25462534
SDKROOT = macosx;
@@ -2550,8 +2538,6 @@
25502538
754BD6592831607A0050F361 /* Release */ = {
25512539
isa = XCBuildConfiguration;
25522540
buildSettings = {
2553-
LDK_C_BINDINGS_BASE = "${LDK_C_BINDINGS_BASE}";
2554-
LDK_C_BINDINGS_BINARY_DIRECTORY = "${LDK_C_BINDINGS_BINARY_DIRECTORY}";
25552541
PATH = "";
25562542
PRODUCT_NAME = "$(TARGET_NAME)";
25572543
SDKROOT = macosx;
@@ -2561,7 +2547,7 @@
25612547
75D7576B28306A430005405B /* Debug */ = {
25622548
isa = XCBuildConfiguration;
25632549
buildSettings = {
2564-
ALWAYS_SEARCH_USER_PATHS = NO;
2550+
ALWAYS_SEARCH_USER_PATHS = YES;
25652551
CLANG_ANALYZER_NONNULL = YES;
25662552
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
25672553
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
@@ -2609,13 +2595,24 @@
26092595
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
26102596
GCC_WARN_UNUSED_FUNCTION = YES;
26112597
GCC_WARN_UNUSED_VARIABLE = YES;
2598+
HEADER_SEARCH_PATHS = (
2599+
"${LDK_C_BINDINGS_BASE}/lightning-c-bindings/include",
2600+
"${LDK_C_BINDINGS_BASE}/ldk-net",
2601+
);
26122602
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
2603+
LDK_C_BINDINGS_BASE = "${LDK_C_BINDINGS_BASE}";
2604+
LDK_C_BINDINGS_BINARY_DIRECTORY = "${LDK_C_BINDINGS_BINARY_DIRECTORY}";
2605+
LIBRARY_SEARCH_PATHS = "${LDK_C_BINDINGS_BINARY_DIRECTORY}";
26132606
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
26142607
MTL_FAST_MATH = YES;
26152608
ONLY_ACTIVE_ARCH = YES;
26162609
SDKROOT = iphoneos;
26172610
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
26182611
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
2612+
USER_HEADER_SEARCH_PATHS = (
2613+
"${LDK_C_BINDINGS_BASE}/lightning-c-bindings/include",
2614+
"${LDK_C_BINDINGS_BASE}/ldk-net",
2615+
);
26192616
VERSIONING_SYSTEM = "apple-generic";
26202617
VERSION_INFO_PREFIX = "";
26212618
};
@@ -2624,7 +2621,7 @@
26242621
75D7576C28306A430005405B /* Release */ = {
26252622
isa = XCBuildConfiguration;
26262623
buildSettings = {
2627-
ALWAYS_SEARCH_USER_PATHS = NO;
2624+
ALWAYS_SEARCH_USER_PATHS = YES;
26282625
CLANG_ANALYZER_NONNULL = YES;
26292626
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
26302627
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
@@ -2666,12 +2663,23 @@
26662663
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
26672664
GCC_WARN_UNUSED_FUNCTION = YES;
26682665
GCC_WARN_UNUSED_VARIABLE = YES;
2666+
HEADER_SEARCH_PATHS = (
2667+
"${LDK_C_BINDINGS_BASE}/lightning-c-bindings/include",
2668+
"${LDK_C_BINDINGS_BASE}/ldk-net",
2669+
);
26692670
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
2671+
LDK_C_BINDINGS_BASE = "${LDK_C_BINDINGS_BASE}";
2672+
LDK_C_BINDINGS_BINARY_DIRECTORY = "${LDK_C_BINDINGS_BINARY_DIRECTORY}";
2673+
LIBRARY_SEARCH_PATHS = "${LDK_C_BINDINGS_BINARY_DIRECTORY}";
26702674
MTL_ENABLE_DEBUG_INFO = NO;
26712675
MTL_FAST_MATH = YES;
26722676
SDKROOT = iphoneos;
26732677
SWIFT_COMPILATION_MODE = wholemodule;
26742678
SWIFT_OPTIMIZATION_LEVEL = "-O";
2679+
USER_HEADER_SEARCH_PATHS = (
2680+
"${LDK_C_BINDINGS_BASE}/lightning-c-bindings/include",
2681+
"${LDK_C_BINDINGS_BASE}/ldk-net",
2682+
);
26752683
VALIDATE_PRODUCT = YES;
26762684
VERSIONING_SYSTEM = "apple-generic";
26772685
VERSION_INFO_PREFIX = "";
@@ -2690,10 +2698,6 @@
26902698
DYLIB_CURRENT_VERSION = 1;
26912699
DYLIB_INSTALL_NAME_BASE = "@rpath";
26922700
GENERATE_INFOPLIST_FILE = YES;
2693-
HEADER_SEARCH_PATHS = (
2694-
"${LDK_C_BINDINGS_BASE}/lightning-c-bindings/include",
2695-
"${LDK_C_BINDINGS_BASE}/ldk-net",
2696-
);
26972701
INFOPLIST_KEY_NSHumanReadableCopyright = "";
26982702
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
26992703
"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.2;
@@ -2702,7 +2706,6 @@
27022706
"@executable_path/Frameworks",
27032707
"@loader_path/Frameworks",
27042708
);
2705-
LIBRARY_SEARCH_PATHS = "${LDK_C_BINDINGS_BINARY_DIRECTORY}";
27062709
MARKETING_VERSION = 1.0;
27072710
MODULEMAP_FILE = LDKFramework/LDKFramework.modulemap;
27082711
PRODUCT_BUNDLE_IDENTIFIER = co.undertide.LDK;
@@ -2728,10 +2731,6 @@
27282731
DYLIB_CURRENT_VERSION = 1;
27292732
DYLIB_INSTALL_NAME_BASE = "@rpath";
27302733
GENERATE_INFOPLIST_FILE = YES;
2731-
HEADER_SEARCH_PATHS = (
2732-
"${LDK_C_BINDINGS_BASE}/lightning-c-bindings/include",
2733-
"${LDK_C_BINDINGS_BASE}/ldk-net",
2734-
);
27352734
INFOPLIST_KEY_NSHumanReadableCopyright = "";
27362735
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
27372736
"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.2;
@@ -2740,7 +2739,6 @@
27402739
"@executable_path/Frameworks",
27412740
"@loader_path/Frameworks",
27422741
);
2743-
LIBRARY_SEARCH_PATHS = "${LDK_C_BINDINGS_BINARY_DIRECTORY}";
27442742
MARKETING_VERSION = 1.0;
27452743
MODULEMAP_FILE = LDKFramework/LDKFramework.modulemap;
27462744
PRODUCT_BUNDLE_IDENTIFIER = co.undertide.LDK;
@@ -2756,8 +2754,6 @@
27562754
75D7577328306AD40005405B /* Debug */ = {
27572755
isa = XCBuildConfiguration;
27582756
buildSettings = {
2759-
LDK_C_BINDINGS_BASE = "${LDK_C_BINDINGS_BASE}";
2760-
LDK_C_BINDINGS_BINARY_DIRECTORY = "${LDK_C_BINDINGS_BINARY_DIRECTORY}";
27612757
PATH = "";
27622758
PRODUCT_NAME = "$(TARGET_NAME)";
27632759
};
@@ -2766,8 +2762,6 @@
27662762
75D7577428306AD40005405B /* Release */ = {
27672763
isa = XCBuildConfiguration;
27682764
buildSettings = {
2769-
LDK_C_BINDINGS_BASE = "${LDK_C_BINDINGS_BASE}";
2770-
LDK_C_BINDINGS_BINARY_DIRECTORY = "${LDK_C_BINDINGS_BINARY_DIRECTORY}";
27712765
PATH = "";
27722766
PRODUCT_NAME = "$(TARGET_NAME)";
27732767
};

‎xcode/LDK/build-libldk.sh

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,11 @@ BUILD_LOG_PATH="${BASEDIR}/build_libldk.log"
2323

2424
echo "BASEDIR: ${BASEDIR}"
2525

26-
echo ""
27-
echo ""
28-
echo "ENVIRONMENT START"
29-
env
30-
echo "ENVIRONMENT END"
31-
echo ""
32-
echo ""
33-
34-
3526
cd "${LDK_C_BINDINGS_BASE}"
3627
echo "WORKING DIRECTORY: `pwd`"
3728

38-
# echo -n "" > $BUILD_LOG_PATH
39-
touch $BUILD_LOG_PATH
29+
echo -n "" > $BUILD_LOG_PATH
30+
# touch $BUILD_LOG_PATH
4031

4132
# create two newlines at the beginning
4233
echo "" >> $BUILD_LOG_PATH
@@ -45,6 +36,16 @@ echo "Platform name: ${PLATFORM_NAME}" >> $BUILD_LOG_PATH
4536
echo "Configuration: ${CONFIGURATION}" >> $BUILD_LOG_PATH
4637
echo "LLVM Target Triple Suffix: ${LLVM_TARGET_TRIPLE_SUFFIX}" >> $BUILD_LOG_PATH
4738

39+
# copy headers
40+
HEADER_OUTPUT_DIRECTORY="${BASEDIR}/headers"
41+
echo "Copying headers to ${HEADER_OUTPUT_DIRECTORY}" >> $BUILD_LOG_PATH
42+
mkdir -p "${HEADER_OUTPUT_DIRECTORY}"
43+
cp "${LDK_C_BINDINGS_BASE}/lightning-c-bindings/include/ldk_rust_types.h" "${HEADER_OUTPUT_DIRECTORY}"
44+
cp "${LDK_C_BINDINGS_BASE}/lightning-c-bindings/include/ldk_ver.h" "${HEADER_OUTPUT_DIRECTORY}"
45+
cp "${LDK_C_BINDINGS_BASE}/lightning-c-bindings/include/lightning.h" "${HEADER_OUTPUT_DIRECTORY}"
46+
cp "${LDK_C_BINDINGS_BASE}/ldk-net/ldk_net.c" "${HEADER_OUTPUT_DIRECTORY}"
47+
cp "${LDK_C_BINDINGS_BASE}/ldk-net/ldk_net.h" "${HEADER_OUTPUT_DIRECTORY}"
48+
4849
if [[ ${ACTION:-build} = "build" || $ACTION = "install" ]]; then
4950
TARGET_NAME="libldk"
5051

0 commit comments

Comments
 (0)