Skip to content

Commit 56b1296

Browse files
dellis1972dellis1972
committed
Fix build?
1 parent 24925f9 commit 56b1296

1 file changed

Lines changed: 16 additions & 18 deletions

File tree

‎build/BuildMacOSTask.cs‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ private static void BuildArm64(BuildContext context)
5656

5757
var envVariables = new Dictionary<string, string>
5858
{
59-
{"CFLAGS", $"-w -arch arm64 -I{dependencyDir}/include"},
60-
{"CPPFLAGS", $"-arch arm64 -I{dependencyDir}/include"},
61-
{"CXXFLAGS", "-arch arm64"},
62-
{"LDFLAGS", $"-arch arm64 -L{dependencyDir}/lib"},
59+
{"CFLAGS", $"-mmacosx-version-min=10.5 -w -arch arm64 -I{dependencyDir}/include"},
60+
{"CPPFLAGS", $"-mmacosx-version-min=10.5 -arch arm64 -I{dependencyDir}/include"},
61+
{"CXXFLAGS", "-mmacosx-version-min=10.5 -arch arm64"},
62+
{"LDFLAGS", $"-mmacosx-version-min=10.5 -arch arm64 -L{dependencyDir}/lib"},
6363
{"PKG_CONFIG_PATH", $"{dependencyDir}/lib/pkgconfig"}
6464
};
6565

@@ -68,7 +68,6 @@ private static void BuildArm64(BuildContext context)
6868
{
6969
EnvironmentVariables = envVariables
7070
};
71-
var extraFlags = "--extra-cflags='-mmacosx-version-min=10.9' --extra-ldflags='-mmacosx-version-min=10.9'";
7271

7372
var shellCommandPath = "zsh";
7473

@@ -78,7 +77,7 @@ private static void BuildArm64(BuildContext context)
7877
context.StartProcess(shellCommandPath, processSettings);
7978
processSettings.Arguments = $"-c \"./autogen.sh\"";
8079
context.StartProcess(shellCommandPath, processSettings);
81-
processSettings.Arguments = $"-c \"./configure --disable-shared {extraFlags} {prefixFlag} {hostFlag}\"";
80+
processSettings.Arguments = $"-c \"./configure --disable-shared {prefixFlag} {hostFlag}\"";
8281
context.StartProcess(shellCommandPath, processSettings);
8382
processSettings.Arguments = $"-c \"make -j{Environment.ProcessorCount}\"";
8483
context.StartProcess(shellCommandPath, processSettings);
@@ -91,7 +90,7 @@ private static void BuildArm64(BuildContext context)
9190
context.StartProcess(shellCommandPath, processSettings);
9291
processSettings.Arguments = $"-c \"./autogen.sh\"";
9392
context.StartProcess(shellCommandPath, processSettings);
94-
processSettings.Arguments = $"-c \"./configure --disable-examples --disable-docs --disable-shared {extraFlags} {prefixFlag} {hostFlag}\"";
93+
processSettings.Arguments = $"-c \"./configure --disable-examples --disable-docs --disable-shared {prefixFlag} {hostFlag}\"";
9594
context.StartProcess(shellCommandPath, processSettings);
9695
processSettings.Arguments = $"-c \"make -j{Environment.ProcessorCount}\"";
9796
context.StartProcess(shellCommandPath, processSettings);
@@ -102,7 +101,7 @@ private static void BuildArm64(BuildContext context)
102101
processSettings.WorkingDirectory = "./lame";
103102
processSettings.Arguments = $"-c \"make distclean\"";
104103
context.StartProcess(shellCommandPath, processSettings);
105-
processSettings.Arguments = $"-c \"./configure --disable-frontend --disable-decoder --disable-shared {extraFlags} {prefixFlag} {hostFlag}\"";
104+
processSettings.Arguments = $"-c \"./configure --disable-frontend --disable-decoder --disable-shared {prefixFlag} {hostFlag}\"";
106105
context.StartProcess(shellCommandPath, processSettings);
107106
processSettings.Arguments = $"-c \"make -j{Environment.ProcessorCount}\"";
108107
context.StartProcess(shellCommandPath, processSettings);
@@ -113,7 +112,7 @@ private static void BuildArm64(BuildContext context)
113112
processSettings.WorkingDirectory = "./ffmpeg";
114113
processSettings.Arguments = $"-c \"make distclean\"";
115114
context.StartProcess(shellCommandPath, processSettings);
116-
processSettings.Arguments = $"-c \"./configure {binDirFlag} {configureFlags} {extraFlags} {progsSuffixFlag}\"";
115+
processSettings.Arguments = $"-c \"./configure {binDirFlag} {configureFlags} {progsSuffixFlag}\"";
117116
context.StartProcess(shellCommandPath, processSettings);
118117
processSettings.Arguments = $"-c \"make -j{Environment.ProcessorCount}\"";
119118
context.StartProcess(shellCommandPath, processSettings);
@@ -133,10 +132,10 @@ private static void BuildX64(BuildContext context)
133132

134133
var envVariables = new Dictionary<string, string>
135134
{
136-
{"CFLAGS", $"-w -arch x86_64 -I{dependencyDir}/include"},
137-
{"CPPFLAGS", $"-arch x86_64 -I{dependencyDir}/include"},
138-
{"CXXFLAGS", "-arch x86_64"},
139-
{"LDFLAGS", $"-arch x86_64 -L{dependencyDir}/lib"},
135+
{"CFLAGS", $"-mmacosx-version-min=10.5 -w -arch x86_64 -I{dependencyDir}/include"},
136+
{"CPPFLAGS", $"-mmacosx-version-min=10.5 -arch x86_64 -I{dependencyDir}/include"},
137+
{"CXXFLAGS", "-mmacosx-version-min=10.5 -arch x86_64"},
138+
{"LDFLAGS", $"-mmacosx-version-min=10.5 -arch x86_64 -L{dependencyDir}/lib"},
140139
{"PKG_CONFIG_PATH", $"{dependencyDir}/lib/pkgconfig"}
141140
};
142141

@@ -145,7 +144,6 @@ private static void BuildX64(BuildContext context)
145144
{
146145
EnvironmentVariables = envVariables
147146
};
148-
var extraFlags = "--extra-cflags='-mmacosx-version-min=10.9' --extra-ldflags='-mmacosx-version-min=10.9'";
149147

150148
var shellCommandPath = "zsh";
151149

@@ -155,7 +153,7 @@ private static void BuildX64(BuildContext context)
155153
context.StartProcess(shellCommandPath, processSettings);
156154
processSettings.Arguments = $"-c \"./autogen.sh\"";
157155
context.StartProcess(shellCommandPath, processSettings);
158-
processSettings.Arguments = $"-c \"./configure --disable-shared {extraFlags} {prefixFlag} {hostFlag}\"";
156+
processSettings.Arguments = $"-c \"./configure --disable-shared {prefixFlag} {hostFlag}\"";
159157
context.StartProcess(shellCommandPath, processSettings);
160158
processSettings.Arguments = $"-c \"make -j{Environment.ProcessorCount}\"";
161159
context.StartProcess(shellCommandPath, processSettings);
@@ -168,7 +166,7 @@ private static void BuildX64(BuildContext context)
168166
context.StartProcess(shellCommandPath, processSettings);
169167
processSettings.Arguments = $"-c \"./autogen.sh\"";
170168
context.StartProcess(shellCommandPath, processSettings);
171-
processSettings.Arguments = $"-c \"./configure --disable-examples --disable-docs --disable-shared {extraFlags} {prefixFlag} {hostFlag}\"";
169+
processSettings.Arguments = $"-c \"./configure --disable-examples --disable-docs --disable-shared {prefixFlag} {hostFlag}\"";
172170
context.StartProcess(shellCommandPath, processSettings);
173171
processSettings.Arguments = $"-c \"make -j{Environment.ProcessorCount}\"";
174172
context.StartProcess(shellCommandPath, processSettings);
@@ -179,7 +177,7 @@ private static void BuildX64(BuildContext context)
179177
processSettings.WorkingDirectory = "./lame";
180178
processSettings.Arguments = $"-c \"make distclean\"";
181179
context.StartProcess(shellCommandPath, processSettings);
182-
processSettings.Arguments = $"-c \"./configure --disable-frontend --disable-decoder --disable-shared {extraFlags} {prefixFlag} {hostFlag}\"";
180+
processSettings.Arguments = $"-c \"./configure --disable-frontend --disable-decoder --disable-shared {prefixFlag} {hostFlag}\"";
183181
context.StartProcess(shellCommandPath, processSettings);
184182
processSettings.Arguments = $"-c \"make -j{Environment.ProcessorCount}\"";
185183
context.StartProcess(shellCommandPath, processSettings);
@@ -190,7 +188,7 @@ private static void BuildX64(BuildContext context)
190188
processSettings.WorkingDirectory = "./ffmpeg";
191189
processSettings.Arguments = $"-c \"make distclean\"";
192190
context.StartProcess(shellCommandPath, processSettings);
193-
processSettings.Arguments = $"-c \"./configure {binDirFlag} {configureFlags} {extraFlags} {progsSuffixFlag}\"";
191+
processSettings.Arguments = $"-c \"./configure {binDirFlag} {configureFlags} {progsSuffixFlag}\"";
194192
context.StartProcess(shellCommandPath, processSettings);
195193
processSettings.Arguments = $"-c \"make -j{Environment.ProcessorCount}\"";
196194
context.StartProcess(shellCommandPath, processSettings);

0 commit comments

Comments
 (0)