Skip to content

Commit e51e311

Browse files
committed
Use MingGW posix
1 parent 8d3ab4a commit e51e311

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

ae.nimble

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ proc cmakeBuild(package: Package, buildPath: string, crossWindows: bool = false)
204204

205205
if crossWindows:
206206
cmakeArgs.add("-DCMAKE_SYSTEM_NAME=Windows")
207-
cmakeArgs.add("-DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc")
208-
cmakeArgs.add("-DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++")
207+
cmakeArgs.add("-DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc-posix")
208+
cmakeArgs.add("-DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++-posix")
209209
cmakeArgs.add("-DCMAKE_RC_COMPILER=x86_64-w64-mingw32-windres")
210210
cmakeArgs.add("-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER")
211211
cmakeArgs.add("-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY")
@@ -260,8 +260,8 @@ proc x265Build(buildPath: string, crossWindows: bool = false) =
260260
# Add cross-compilation flags if needed
261261
if crossWindows:
262262
cmakeArgs.add("-DCMAKE_SYSTEM_NAME=Windows")
263-
cmakeArgs.add("-DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc")
264-
cmakeArgs.add("-DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++")
263+
cmakeArgs.add("-DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc-posix")
264+
cmakeArgs.add("-DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++-posix")
265265
cmakeArgs.add("-DCMAKE_RC_COMPILER=x86_64-w64-mingw32-windres")
266266
cmakeArgs.add("-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER")
267267
cmakeArgs.add("-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY")
@@ -292,8 +292,8 @@ proc x265Build(buildPath: string, crossWindows: bool = false) =
292292
# Add cross-compilation flags if needed
293293
if crossWindows:
294294
cmakeArgs.add("-DCMAKE_SYSTEM_NAME=Windows")
295-
cmakeArgs.add("-DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc")
296-
cmakeArgs.add("-DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++")
295+
cmakeArgs.add("-DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc-posix")
296+
cmakeArgs.add("-DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++-posix")
297297
cmakeArgs.add("-DCMAKE_RC_COMPILER=x86_64-w64-mingw32-windres")
298298
cmakeArgs.add("-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER")
299299
cmakeArgs.add("-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY")
@@ -322,8 +322,8 @@ proc x265Build(buildPath: string, crossWindows: bool = false) =
322322
# Add cross-compilation flags if needed
323323
if crossWindows:
324324
cmakeArgs.add("-DCMAKE_SYSTEM_NAME=Windows")
325-
cmakeArgs.add("-DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc")
326-
cmakeArgs.add("-DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++")
325+
cmakeArgs.add("-DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc-posix")
326+
cmakeArgs.add("-DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++-posix")
327327
cmakeArgs.add("-DCMAKE_RC_COMPILER=x86_64-w64-mingw32-windres")
328328
cmakeArgs.add("-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER")
329329
cmakeArgs.add("-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY")
@@ -389,8 +389,8 @@ proc mesonBuild(buildPath: string, crossWindows: bool = false) =
389389
let crossFile = "build_meson/meson-cross.txt"
390390
writeFile(crossFile, """
391391
[binaries]
392-
c = 'x86_64-w64-mingw32-gcc'
393-
cpp = 'x86_64-w64-mingw32-g++'
392+
c = 'x86_64-w64-mingw32-gcc-posix'
393+
cpp = 'x86_64-w64-mingw32-g++-posix'
394394
ar = 'x86_64-w64-mingw32-ar'
395395
strip = 'x86_64-w64-mingw32-strip'
396396
pkgconfig = 'x86_64-w64-mingw32-pkg-config'
@@ -458,7 +458,7 @@ proc ffmpegSetup(crossWindows: bool) =
458458
args.add("--target=x86_64-win64-gcc")
459459
else:
460460
args.add("--host=x86_64-w64-mingw32")
461-
envPrefix = "CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ AR=x86_64-w64-mingw32-ar STRIP=x86_64-w64-mingw32-strip RANLIB=x86_64-w64-mingw32-ranlib "
461+
envPrefix = "CC=x86_64-w64-mingw32-gcc-posix CXX=x86_64-w64-mingw32-g++-posix AR=x86_64-w64-mingw32-ar STRIP=x86_64-w64-mingw32-strip RANLIB=x86_64-w64-mingw32-ranlib "
462462
let cmd = &"{envPrefix}./configure --prefix=\"{buildPath}\" --disable-shared --enable-static " & args.join(" ")
463463
echo "RUN: ", cmd
464464
exec cmd
@@ -541,7 +541,7 @@ task makeffwin, "Build FFmpeg for Windows cross-compilation":
541541
when defined(linux):
542542
ldflags &= &" -L{buildPath}/lib/x86_64-linux-gnu -L{buildPath}/lib64"
543543

544-
exec (&"""CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ AR=x86_64-w64-mingw32-ar STRIP=x86_64-w64-mingw32-strip RANLIB=x86_64-w64-mingw32-ranlib PKG_CONFIG_PATH="{buildPath}/lib/pkgconfig" ./configure --prefix="{buildPath}" \
544+
exec (&"""CC=x86_64-w64-mingw32-gcc-posix CXX=x86_64-w64-mingw32-g++-posix AR=x86_64-w64-mingw32-ar STRIP=x86_64-w64-mingw32-strip RANLIB=x86_64-w64-mingw32-ranlib PKG_CONFIG_PATH="{buildPath}/lib/pkgconfig" ./configure --prefix="{buildPath}" \
545545
--pkg-config-flags="--static" \
546546
--extra-cflags="-I{buildPath}/include" \
547547
--extra-ldflags="{ldflags}" \
@@ -558,8 +558,8 @@ task windows, "Cross-compile to Windows (requires mingw-w64)":
558558
echo "FFmpeg for Windows not found. Run 'nimble makeffwin' first."
559559
else:
560560
exec "nim c -d:danger " & disableHevc & " --os:windows --cpu:amd64 --cc:gcc " &
561-
"--gcc.exe:x86_64-w64-mingw32-gcc " &
562-
"--gcc.linkerexe:x86_64-w64-mingw32-gcc " &
561+
"--gcc.exe:x86_64-w64-mingw32-gcc-posix " &
562+
"--gcc.linkerexe:x86_64-w64-mingw32-gcc-posix " &
563563
"--passL:-lbcrypt " & # Add Windows Bcrypt library
564564
"--passL:-lstdc++ " & # Add C++ standard library
565565
"--passL:-static " &

0 commit comments

Comments
 (0)