Skip to content

Commit 0e8e1c4

Browse files
committed
Remove macOS version prefix for parser bindings.
1 parent aea3d05 commit 0e8e1c4

17 files changed

+9
-8
lines changed

build/Helpers.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,11 @@ function AddPlatformSpecificFiles(folder, filename)
253253
files { path.join(folder, "i686-pc-win32-msvc", filename) }
254254
elseif os.istarget("macosx") then
255255
filter { "architecture:arm64" }
256-
files { path.join(folder, "arm64-apple-darwin12.4.0", filename) }
256+
files { path.join(folder, "arm64-apple-darwin", filename) }
257257
filter { "architecture:x86_64" }
258-
files { path.join(folder, "x86_64-apple-darwin12.4.0", filename) }
258+
files { path.join(folder, "x86_64-apple-darwin", filename) }
259259
filter {"architecture:x86" }
260-
files { path.join(folder, "i686-apple-darwin12.4.0", filename) }
260+
files { path.join(folder, "i686-apple-darwin", filename) }
261261
elseif os.istarget("linux") then
262262
filter { "architecture:arm64" }
263263
files { path.join(folder, "arm64-linux-gnu" .. (UseCxx11ABI() and "-cxx11abi" or ""), filename) }

src/CppParser/Bindings/CSharp/CppSharp.Parser.CSharp.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
<PlatformParserFolder Condition="$(IsWindows) AND $(PlatformTarget) == x64">x86_64-pc-win32-msvc</PlatformParserFolder>
1010
<PlatformParserFolder Condition="$(IsLinux) AND $(PlatformTarget) == x64 AND $(UseCXX11ABI)">x86_64-linux-gnu-cxx11abi</PlatformParserFolder>
1111
<PlatformParserFolder Condition="$(IsLinux) AND $(PlatformTarget) == x64 AND !$(UseCXX11ABI)">x86_64-linux-gnu</PlatformParserFolder>
12-
<PlatformParserFolder Condition="$(IsMacOSX) AND $(PlatformTarget) == x64">x86_64-apple-darwin12.4.0</PlatformParserFolder>
12+
<PlatformParserFolder Condition="$(IsMacOSX) AND $(PlatformTarget) == x64">x86_64-apple-darwin</PlatformParserFolder>
13+
<PlatformParserFolder Condition="$(IsMacOSX) AND $(PlatformTarget) == arm64">arm64-apple-darwin</PlatformParserFolder>
1314
<PlatformParserFolder Condition="$(IsWindows) AND $(PlatformTarget) == x86">i686-pc-win32-msvc</PlatformParserFolder>
14-
<PlatformParserFolder Condition="$(IsMacOSX) AND $(PlatformTarget) == x86">i686-apple-darwin12.4.0</PlatformParserFolder>
15+
<PlatformParserFolder Condition="$(IsMacOSX) AND $(PlatformTarget) == x86">i686-apple-darwin</PlatformParserFolder>
1516
</PropertyGroup>
1617

1718
<ItemGroup>

src/CppParser/ParserGen/ParserGen.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -175,15 +175,15 @@ public static void Main(string[] args)
175175
if (Directory.Exists(osxHeadersPath) || Platform.IsMacOS)
176176
{
177177
Console.WriteLine("Generating the C# parser bindings for macOS x86...");
178-
ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "i686-apple-darwin12.4.0"));
178+
ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "i686-apple-darwin"));
179179
Console.WriteLine();
180180

181181
Console.WriteLine("Generating the C# parser bindings for macOS x64...");
182-
ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "x86_64-apple-darwin12.4.0"));
182+
ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "x86_64-apple-darwin"));
183183
Console.WriteLine();
184184

185185
Console.WriteLine("Generating the C# parser bindings for macOS ARM64...");
186-
ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "arm64-apple-darwin12.4.0"));
186+
ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "arm64-apple-darwin"));
187187
Console.WriteLine();
188188
}
189189
else

0 commit comments

Comments
 (0)