Alexandre Julliard : configure: Stop building libwine on Android.
Alexandre Julliard
julliard at winehq.org
Thu Apr 22 15:55:25 CDT 2021
Module: wine
Branch: master
Commit: a639db3e8c18f58d28c3e76bc4f9bc90a48ad93a
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a639db3e8c18f58d28c3e76bc4f9bc90a48ad93a
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Apr 22 15:33:30 2021 +0200
configure: Stop building libwine on Android.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
configure | 6 ------
configure.ac | 4 ----
dlls/ntdll/unix/loader.c | 2 --
3 files changed, 12 deletions(-)
diff --git a/configure b/configure
index 39639235469..762c0b8e2e2 100755
--- a/configure
+++ b/configure
@@ -9164,12 +9164,6 @@ if test "x$ac_cv_cflags__fPIC__Wl___export_dynamic" = xyes; then :
fi
WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000"
- LIBWINE_SHAREDLIB="libwine.so"
-
- LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so"
-
- TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so"
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lEGL" >&5
$as_echo_n "checking for -lEGL... " >&6; }
if ${ac_cv_lib_soname_EGL+:} false; then :
diff --git a/configure.ac b/configure.ac
index 797f8cfbbbf..68366339ea2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -893,10 +893,6 @@ case $host_os in
[WINELOADER_LDFLAGS="-Wl,--export-dynamic"])
WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000"
- AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so")
- AC_SUBST(LIBWINE_LDFLAGS,["-shared -Wl,-soname,libwine.so"])
- TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so"
-
WINE_CHECK_SONAME(EGL,eglGetProcAddress)
WINE_CHECK_SONAME(GLESv2,glFlush)
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index 16bba12b571..9947ff2f447 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -935,8 +935,6 @@ static void load_libwine(void)
{
#ifdef __APPLE__
#define LIBWINE "libwine.1.dylib"
-#elif defined(__ANDROID__)
-#define LIBWINE "libwine.so"
#else
#define LIBWINE "libwine.so.1"
#endif
More information about the wine-cvs
mailing list