Skip to content

Commit abc5e93

Browse files
vovkasmlucasderraugh
authored andcommitted
Allow to use case sensitive filesystem for source code (#548)
* Allow to use case sensitive filesystem for source code Should fix #289 Why: Apple is unstable about its platform naming scheme, so use our own build variable GITUP_PLATFORM. GITUP_PLATFORM initialized in Base.xcconfig for easy management and set depending on sdk. * fix GITUP_PLATFORM definition for mobile systems * add short comment for better explanation of GITUP_PLATFORM config variable * Update comment reflecting case-sensitivity issue
1 parent 6aa8df8 commit abc5e93

File tree

4 files changed

+23
-16
lines changed

4 files changed

+23
-16
lines changed

GitUp/GitUp.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -490,8 +490,8 @@
490490
HEADER_SEARCH_PATHS = "../GitUpKit/Third-Party/libgit2/include";
491491
OTHER_LDFLAGS = (
492492
"$(BUILD_DIR)/$(CONFIGURATION)/libgit2.a",
493-
"../GitUpKit/Third-Party/libssl/$(PLATFORM_NAME)/lib/libcrypto.a",
494-
"../GitUpKit/Third-Party/libssh2/$(PLATFORM_NAME)/lib/libssh2.a",
493+
"../GitUpKit/Third-Party/libssl/$(GITUP_PLATFORM)/lib/libcrypto.a",
494+
"../GitUpKit/Third-Party/libssh2/$(GITUP_PLATFORM)/lib/libssh2.a",
495495
);
496496
PRODUCT_NAME = gitup;
497497
SKIP_INSTALL = YES;
@@ -505,8 +505,8 @@
505505
HEADER_SEARCH_PATHS = "../GitUpKit/Third-Party/libgit2/include";
506506
OTHER_LDFLAGS = (
507507
"$(BUILD_DIR)/$(CONFIGURATION)/libgit2.a",
508-
"../GitUpKit/Third-Party/libssl/$(PLATFORM_NAME)/lib/libcrypto.a",
509-
"../GitUpKit/Third-Party/libssh2/$(PLATFORM_NAME)/lib/libssh2.a",
508+
"../GitUpKit/Third-Party/libssl/$(GITUP_PLATFORM)/lib/libcrypto.a",
509+
"../GitUpKit/Third-Party/libssh2/$(GITUP_PLATFORM)/lib/libssh2.a",
510510
);
511511
PRODUCT_NAME = gitup;
512512
SKIP_INSTALL = YES;

GitUpKit/GitUpKit.xcodeproj/project.pbxproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1841,13 +1841,13 @@
18411841
buildSettings = {
18421842
HEADER_SEARCH_PATHS = (
18431843
"Third-Party/libgit2/include",
1844-
"Third-Party/libsqlite3/$(PLATFORM_NAME)/include",
1845-
"Third-Party/libssh2/$(PLATFORM_NAME)/include",
1844+
"Third-Party/libsqlite3/$(GITUP_PLATFORM)/include",
1845+
"Third-Party/libssh2/$(GITUP_PLATFORM)/include",
18461846
);
18471847
OTHER_LDFLAGS = (
1848-
"Third-Party/libsqlite3/$(PLATFORM_NAME)/lib/libsqlite3.a",
1849-
"Third-Party/libssl/$(PLATFORM_NAME)/lib/libcrypto.a",
1850-
"Third-Party/libssh2/$(PLATFORM_NAME)/lib/libssh2.a",
1848+
"Third-Party/libsqlite3/$(GITUP_PLATFORM)/lib/libsqlite3.a",
1849+
"Third-Party/libssl/$(GITUP_PLATFORM)/lib/libcrypto.a",
1850+
"Third-Party/libssh2/$(GITUP_PLATFORM)/lib/libssh2.a",
18511851
);
18521852
};
18531853
name = Debug;
@@ -1858,13 +1858,13 @@
18581858
buildSettings = {
18591859
HEADER_SEARCH_PATHS = (
18601860
"Third-Party/libgit2/include",
1861-
"Third-Party/libsqlite3/$(PLATFORM_NAME)/include",
1862-
"Third-Party/libssh2/$(PLATFORM_NAME)/include",
1861+
"Third-Party/libsqlite3/$(GITUP_PLATFORM)/include",
1862+
"Third-Party/libssh2/$(GITUP_PLATFORM)/include",
18631863
);
18641864
OTHER_LDFLAGS = (
1865-
"Third-Party/libsqlite3/$(PLATFORM_NAME)/lib/libsqlite3.a",
1866-
"Third-Party/libssl/$(PLATFORM_NAME)/lib/libcrypto.a",
1867-
"Third-Party/libssh2/$(PLATFORM_NAME)/lib/libssh2.a",
1865+
"Third-Party/libsqlite3/$(GITUP_PLATFORM)/lib/libsqlite3.a",
1866+
"Third-Party/libssl/$(GITUP_PLATFORM)/lib/libcrypto.a",
1867+
"Third-Party/libssh2/$(GITUP_PLATFORM)/lib/libssh2.a",
18681868
);
18691869
};
18701870
name = Release;

GitUpKit/Third-Party/libgit2.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1502,7 +1502,7 @@
15021502
);
15031503
GCC_WARN_UNINITIALIZED_AUTOS = NO;
15041504
HEADER_SEARCH_PATHS = (
1505-
"libssh2/$(PLATFORM_NAME)/include",
1505+
"libssh2/$(GITUP_PLATFORM)/include",
15061506
libgit2/src,
15071507
libgit2/include,
15081508
"libgit2/deps/http-parser",
@@ -1550,7 +1550,7 @@
15501550
);
15511551
GCC_WARN_UNINITIALIZED_AUTOS = NO;
15521552
HEADER_SEARCH_PATHS = (
1553-
"libssh2/$(PLATFORM_NAME)/include",
1553+
"libssh2/$(GITUP_PLATFORM)/include",
15541554
libgit2/src,
15551555
libgit2/include,
15561556
"libgit2/deps/http-parser",

Xcode-Configurations/Base.xcconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,10 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES
4646
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE
4747
GCC_WARN_UNUSED_FUNCTION = YES
4848
GCC_WARN_UNUSED_VARIABLE = YES
49+
50+
// GITUP_PLATFORM determines where to find header files and precompiled libs
51+
// required for build on case-sensitive systems, for ex. headers of libssh2 located in
52+
// "GitUpKit/Third-Party/libssh2/MacOSX/include" folder.
53+
GITUP_PLATFORM[sdk=macosx*] = MacOSX
54+
GITUP_PLATFORM[sdk=iphonesimulator*] = iPhoneSimulator
55+
GITUP_PLATFORM[sdk=iphoneos*] = iPhoneOS

0 commit comments

Comments
 (0)