wrappers: force linking with mincore for UWP targets

it's not needed for regular win32 so shouldn't be either for these targets
This commit is contained in:
Steve Lhomme authored and Martin Storsjö committed 2019-04-18 12:23:38 +03:00
1 parent 707fda6348
commit a270bc3cad
3 files changed
+12 -1

No files matched your search

+2
View File
@@ -303,6 +303,8 @@ int _tmain(int argc, TCHAR* argv[]) {
exec_argv[arg++] = _T("-DWINAPI_FAMILY=WINAPI_FAMILY_APP");
// the Windows Store API only supports Windows Unicode (some rare ANSI ones are available)
exec_argv[arg++] = _T("-DUNICODE");
// add the minimum runtime to use for UWP targets
exec_argv[arg++] = _T("-Wl,-lmincore");
}
exec_argv[arg++] = _T("-target");
+2
View File
@@ -61,6 +61,8 @@ mingw32uwp)
FLAGS="$FLAGS -DWINAPI_FAMILY=WINAPI_FAMILY_APP"
# the Windows Store API only supports Windows Unicode (some rare ANSI ones are available)
FLAGS="$FLAGS -DUNICODE"
# add the minimum runtime to use for UWP targets
FLAGS="$FLAGS -Wl,-lmincore"
;;
esac
+8 -1
View File
@@ -26,10 +26,17 @@ if [ "$TARGET" = "$BASENAME" ]; then
TARGET=$DEFAULT_TARGET
fi
ARCH="${TARGET%%-*}"
TARGET_OS="${TARGET##*-}"
case $ARCH in
i686) M=i386pe ;;
x86_64) M=i386pep ;;
armv7) M=thumb2pe ;;
aarch64) M=arm64pe ;;
esac
ld.lld -m $M "$@"
FLAGS="-m $M"
case $TARGET_OS in
mingw32uwp)
FLAGS="$FLAGS -lmincore"
;;
esac
ld.lld $FLAGS "$@"