ac465d29b4
I'm taking a page from Dolphin's book, and including copies of each dependency's source code. This combines the ease of use of including pre-built libraries instead of needing to navigate a package manager - as is (or was) the case for MSVC - with the portability of using packages. Granted, this method's more of a jack of all trades, master of none, since it's *less* user-friendly than prebuilt packages (compilation times), and you don't get the per-distro compatibility fixes you'd get from a package manager. You can still use system libs if you want. In fact, it's still the default behaviour: compiling the libs manually is just a fallback. I'll add an option to force-enable this soon, however, since it's a nicer way to produce static MSYS2 builds than the hackish nightmare that I was using before. Not to mention, having my own copy of the sources means I can provide my own fixes and tweaks your package manager may not. For example, I can combine MSYS2's FreeType subpixel rendering with vcpkg's fix for SDL2 exporting its symbols in static builds.
72 lines
1.2 KiB
Diff
72 lines
1.2 KiB
Diff
--- config.sub.orig 2017-09-09 08:01:02.139023205 -0700
|
|
+++ config.sub 2017-09-09 07:59:35.798264474 -0700
|
|
@@ -364,6 +364,19 @@
|
|
i*86 | x86_64)
|
|
basic_machine=$basic_machine-pc
|
|
;;
|
|
+ nacl64*)
|
|
+ basic_machine=x86_64-pc
|
|
+ os=-nacl
|
|
+ ;;
|
|
+ nacl*)
|
|
+ basic_machine=i686-pc
|
|
+ os=-nacl
|
|
+ ;;
|
|
+ pnacl*)
|
|
+ # le32-unknown-pnacl comes from http://www.chromium.org/nativeclient/pnacl/stability-of-the-pnacl-bitcode-abi
|
|
+ basic_machine=le32-unknown
|
|
+ os=-pnacl
|
|
+ ;;
|
|
# Object if more than one company name word.
|
|
*-*-*)
|
|
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
|
|
@@ -877,6 +890,10 @@
|
|
basic_machine=le32-unknown
|
|
os=-nacl
|
|
;;
|
|
+ pnacl)
|
|
+ basic_machine=le32-unknown
|
|
+ os=-pnacl
|
|
+ ;;
|
|
ncr3000)
|
|
basic_machine=i486-ncr
|
|
os=-sysv4
|
|
@@ -1429,6 +1446,12 @@
|
|
;;
|
|
esac
|
|
;;
|
|
+ -nacl*)
|
|
+ os=-nacl
|
|
+ ;;
|
|
+ -pnacl*)
|
|
+ os=-pnacl
|
|
+ ;;
|
|
-nto-qnx*)
|
|
;;
|
|
-nto*)
|
|
@@ -1459,6 +1482,9 @@
|
|
-os400*)
|
|
os=-os400
|
|
;;
|
|
+ -cegcc*)
|
|
+ os=-cegcc
|
|
+ ;;
|
|
-wince*)
|
|
os=-wince
|
|
;;
|
|
@@ -1548,9 +1574,15 @@
|
|
os=-dicos
|
|
;;
|
|
-nacl*)
|
|
+ os=-nacl
|
|
+ ;;
|
|
+ -pnacl*)
|
|
+ os=-pnacl
|
|
;;
|
|
-ios)
|
|
;;
|
|
+ -emscripten*)
|
|
+ ;;
|
|
-none)
|
|
;;
|
|
*)
|