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:
1 parent
707fda6348
commit
a270bc3cad
3 files changed
+12
-1
No files matched your search
@@ -303,6 +303,8 @@ int _tmain(int argc, TCHAR* argv[]) {
|
|||||||
exec_argv[arg++] = _T("-DWINAPI_FAMILY=WINAPI_FAMILY_APP");
|
exec_argv[arg++] = _T("-DWINAPI_FAMILY=WINAPI_FAMILY_APP");
|
||||||
// the Windows Store API only supports Windows Unicode (some rare ANSI ones are available)
|
// the Windows Store API only supports Windows Unicode (some rare ANSI ones are available)
|
||||||
exec_argv[arg++] = _T("-DUNICODE");
|
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");
|
exec_argv[arg++] = _T("-target");
|
||||||
|
|||||||
@@ -61,6 +61,8 @@ mingw32uwp)
|
|||||||
FLAGS="$FLAGS -DWINAPI_FAMILY=WINAPI_FAMILY_APP"
|
FLAGS="$FLAGS -DWINAPI_FAMILY=WINAPI_FAMILY_APP"
|
||||||
# the Windows Store API only supports Windows Unicode (some rare ANSI ones are available)
|
# the Windows Store API only supports Windows Unicode (some rare ANSI ones are available)
|
||||||
FLAGS="$FLAGS -DUNICODE"
|
FLAGS="$FLAGS -DUNICODE"
|
||||||
|
# add the minimum runtime to use for UWP targets
|
||||||
|
FLAGS="$FLAGS -Wl,-lmincore"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|||||||
@@ -26,10 +26,17 @@ if [ "$TARGET" = "$BASENAME" ]; then
|
|||||||
TARGET=$DEFAULT_TARGET
|
TARGET=$DEFAULT_TARGET
|
||||||
fi
|
fi
|
||||||
ARCH="${TARGET%%-*}"
|
ARCH="${TARGET%%-*}"
|
||||||
|
TARGET_OS="${TARGET##*-}"
|
||||||
case $ARCH in
|
case $ARCH in
|
||||||
i686) M=i386pe ;;
|
i686) M=i386pe ;;
|
||||||
x86_64) M=i386pep ;;
|
x86_64) M=i386pep ;;
|
||||||
armv7) M=thumb2pe ;;
|
armv7) M=thumb2pe ;;
|
||||||
aarch64) M=arm64pe ;;
|
aarch64) M=arm64pe ;;
|
||||||
esac
|
esac
|
||||||
ld.lld -m $M "$@"
|
FLAGS="-m $M"
|
||||||
|
case $TARGET_OS in
|
||||||
|
mingw32uwp)
|
||||||
|
FLAGS="$FLAGS -lmincore"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
ld.lld $FLAGS "$@"
|
||||||
Reference in new issue
Block a user