Skip to content

Commit

Permalink
Fix building with Xcode 13.1 and macOS 12.0 SDK.
Browse files Browse the repository at this point in the history 
Fixes #2140
  • Loading branch information
@nevack
nevack committed Nov 13, 2021
1 parent 7c3f8b5 commit f57d47d
Showing 1 changed file with 44 additions and 13 deletions.
57 changes: 44 additions & 13 deletions Transmission.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@
BE1183780CE161390002D0F3 /* libminiupnp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE1183480CE160960002D0F3 /* libminiupnp.a */; };
BE75C38A0C72A1ED00DBEFE0 /* libevent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE75C3490C729E9500DBEFE0 /* libevent.a */; };
BEFC1C050C07753500B0BB3C /* libtransmission.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D18389709DEC0030047D688 /* libtransmission.a */; };
BEFC1C1A0C07756200B0BB3C /* daemon.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1C0E0C07756200B0BB3C /* daemon.c */; };
BEFC1C1A0C07756200B0BB3C /* daemon.cc in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1C0E0C07756200B0BB3C /* daemon.cc */; };
BEFC1D050C07825A00B0BB3C /* remote.cc in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1C140C07756200B0BB3C /* remote.cc */; };
BEFC1D2D0C0783D900B0BB3C /* libtransmission.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D18389709DEC0030047D688 /* libtransmission.a */; };
BEFC1E290C07861A00B0BB3C /* version.h in Headers */ = {isa = PBXBuildFile; fileRef = BEFC1DF00C07861A00B0BB3C /* version.h */; };
Expand Down Expand Up @@ -520,8 +520,8 @@
4D3EA0A908AE13C600EA10C2 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
4D8017E810BBC073008A4AF2 /* torrent-magnet.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "torrent-magnet.cc"; sourceTree = "<group>"; };
4D8017E910BBC073008A4AF2 /* torrent-magnet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "torrent-magnet.h"; sourceTree = "<group>"; };
4D80185710BBC0B0008A4AF2 /* magnet-metainfo.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = magnet-metainfo.cc; sourceTree = "<group>"; };
4D80185810BBC0B0008A4AF2 /* magnet-metainfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = magnet-metainfo.h; sourceTree = "<group>"; };
4D80185710BBC0B0008A4AF2 /* magnet-metainfo.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "magnet-metainfo.cc"; sourceTree = "<group>"; };
4D80185810BBC0B0008A4AF2 /* magnet-metainfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "magnet-metainfo.h"; sourceTree = "<group>"; };
4DB74F070E8CD75100AEB1A8 /* wildmat.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = wildmat.c; sourceTree = "<group>"; };
4DCCBB3C09C3D71100D3CABF /* TorrentCell.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = TorrentCell.mm; sourceTree = "<group>"; };
4DCCBB3D09C3D71100D3CABF /* TorrentCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TorrentCell.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1963,6 +1963,7 @@
isa = PBXNativeTarget;
buildConfigurationList = 3C7A119B0D0B2EE300B5701F /* Build configuration list for PBXNativeTarget "natpmp" */;
buildPhases = (
EDF2BD6C273FF71F00929B94 /* ShellScript */,
3C7A11890D0B2EB800B5701F /* Headers */,
3C7A118A0D0B2EB800B5701F /* Sources */,
3C7A118B0D0B2EB800B5701F /* Frameworks */,
Expand Down Expand Up @@ -2098,6 +2099,7 @@
isa = PBXNativeTarget;
buildConfigurationList = BE11834C0CE160A80002D0F3 /* Build configuration list for PBXNativeTarget "miniupnp" */;
buildPhases = (
EDF2BD6D273FF7DA00929B94 /* ShellScript */,
A2305097100C0293003FDB0C /* ShellScript */,
C12F197C1E1AE55A0005E93F /* ShellScript */,
BE1183440CE160960002D0F3 /* Headers */,
Expand Down Expand Up @@ -2205,7 +2207,6 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 0920;
ORGANIZATIONNAME = "The Transmission Project";
TargetAttributes = {
Expand Down Expand Up @@ -2396,6 +2397,42 @@
shellPath = /bin/sh;
shellScript = "cd third-party/dht && rm -f dht && ln -s . dht\n";
};
EDF2BD6C273FF71F00929B94 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cd third-party/libnatpmp && rm -f VERSION\n";
};
EDF2BD6D273FF7DA00929B94 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"third-party/miniupnpc/VERSION",
);
outputFileListPaths = (
);
outputPaths = (
"third-party/miniupnpc/miniupnpc_VERSION",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Need to rename file to not clash with C++ stdlib <version>\ncd third-party/miniupnpc\nmv -f \"$SCRIPT_INPUT_FILE_0\" \"$SCRIPT_OUTPUT_FILE_0\" &> /dev/null || true\n";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down Expand Up @@ -2984,9 +3021,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_ARC = NO;
HEADER_SEARCH_PATHS = (
"third-party/libevent/include",
);
HEADER_SEARCH_PATHS = "third-party/libevent/include";
OTHER_CFLAGS = "-DHAVE_CONFIG_H";
PRODUCT_NAME = event;
};
Expand Down Expand Up @@ -3510,9 +3545,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_ARC = NO;
HEADER_SEARCH_PATHS = (
"third-party/libevent/include",
);
HEADER_SEARCH_PATHS = "third-party/libevent/include";
OTHER_CFLAGS = "-DHAVE_CONFIG_H";
PRODUCT_NAME = event;
};
Expand Down Expand Up @@ -3633,9 +3666,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_ARC = NO;
HEADER_SEARCH_PATHS = (
"third-party/libevent/include",
);
HEADER_SEARCH_PATHS = "third-party/libevent/include";
OTHER_CFLAGS = "-DHAVE_CONFIG_H";
PRODUCT_NAME = event;
};
Expand Down

0 comments on commit f57d47d

Please sign in to comment.