Commit e11f2397 authored by Alexandre Julliard's avatar Alexandre Julliard

configure: Add Android driver stub.

parent ebf5b23c
...@@ -1465,6 +1465,7 @@ enable_wimgapi ...@@ -1465,6 +1465,7 @@ enable_wimgapi
enable_windowscodecs enable_windowscodecs
enable_windowscodecsext enable_windowscodecsext
enable_winealsa_drv enable_winealsa_drv
enable_wineandroid_drv
enable_winebus_sys enable_winebus_sys
enable_winecoreaudio_drv enable_winecoreaudio_drv
enable_wined3d enable_wined3d
...@@ -8367,6 +8368,7 @@ fi ...@@ -8367,6 +8368,7 @@ fi
linux-android*) linux-android*)
DLLFLAGS="$DLLFLAGS -fPIC" DLLFLAGS="$DLLFLAGS -fPIC"
LDEXECFLAGS="-Wl,-pie" LDEXECFLAGS="-Wl,-pie"
enable_wineandroid_drv=${enable_wineandroid_drv:-yes}
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5
$as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; } $as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; }
if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then : if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then :
...@@ -8481,6 +8483,16 @@ fi ...@@ -8481,6 +8483,16 @@ fi
LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so" LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so"
if test "x$exec_prefix" = xNONE
then
case $host_cpu in
*i[3456]86*) exec_prefix='${prefix}/x86' ;;
*x86_64*) exec_prefix='${prefix}/x86_64' ;;
*arm*) exec_prefix='${prefix}/armeabi-v7a' ;;
*aarch64*) exec_prefix='${prefix}/arm64-v8a' ;;
esac
fi
;; ;;
*) *)
...@@ -8873,6 +8885,7 @@ esac ...@@ -8873,6 +8885,7 @@ esac
enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
enable_wineqtdecoder=${enable_wineqtdecoder:-no} enable_wineqtdecoder=${enable_wineqtdecoder:-no}
enable_wineandroid_drv=${enable_wineandroid_drv:-no}
enable_winemac_drv=${enable_winemac_drv:-no} enable_winemac_drv=${enable_winemac_drv:-no}
test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no}
...@@ -11002,7 +11015,7 @@ else ...@@ -11002,7 +11015,7 @@ else
X_LIBS="" X_LIBS=""
fi fi
if test "$enable_winemac_drv" = "no" if test "$enable_wineandroid_drv$enable_winemac_drv" = "nono"
then then
if test "x$X_LIBS" = "x"; then : if test "x$X_LIBS" = "x"; then :
case "x$with_x" in case "x$with_x" in
...@@ -18562,6 +18575,7 @@ wine_fn_config_test dlls/windowscodecs/tests windowscodecs_test ...@@ -18562,6 +18575,7 @@ wine_fn_config_test dlls/windowscodecs/tests windowscodecs_test
wine_fn_config_dll windowscodecsext enable_windowscodecsext implib wine_fn_config_dll windowscodecsext enable_windowscodecsext implib
wine_fn_config_test dlls/windowscodecsext/tests windowscodecsext_test wine_fn_config_test dlls/windowscodecsext/tests windowscodecsext_test
wine_fn_config_dll winealsa.drv enable_winealsa_drv wine_fn_config_dll winealsa.drv enable_winealsa_drv
wine_fn_config_dll wineandroid.drv enable_wineandroid_drv
wine_fn_config_dll winebus.sys enable_winebus_sys wine_fn_config_dll winebus.sys enable_winebus_sys
wine_fn_config_dll winecoreaudio.drv enable_winecoreaudio_drv wine_fn_config_dll winecoreaudio.drv enable_winecoreaudio_drv
wine_fn_config_lib winecrt0 wine_fn_config_lib winecrt0
......
...@@ -851,6 +851,7 @@ case $host_os in ...@@ -851,6 +851,7 @@ case $host_os in
linux-android*) linux-android*)
DLLFLAGS="$DLLFLAGS -fPIC" DLLFLAGS="$DLLFLAGS -fPIC"
LDEXECFLAGS="-Wl,-pie" LDEXECFLAGS="-Wl,-pie"
enable_wineandroid_drv=${enable_wineandroid_drv:-yes}
WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic], WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic],
[WINELOADER_LDFLAGS="-Wl,--export-dynamic"]) [WINELOADER_LDFLAGS="-Wl,--export-dynamic"])
WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib], WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
...@@ -865,6 +866,16 @@ case $host_os in ...@@ -865,6 +866,16 @@ case $host_os in
AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so") AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so")
AC_SUBST(LIBWINE_INSTALL_LIB,"libwine.so") AC_SUBST(LIBWINE_INSTALL_LIB,"libwine.so")
AC_SUBST(LIBWINE_LDFLAGS,["-shared -Wl,-soname,libwine.so"]) AC_SUBST(LIBWINE_LDFLAGS,["-shared -Wl,-soname,libwine.so"])
if test "x$exec_prefix" = xNONE
then
case $host_cpu in
*i[[3456]]86*) exec_prefix='${prefix}/x86' ;;
*x86_64*) exec_prefix='${prefix}/x86_64' ;;
*arm*) exec_prefix='${prefix}/armeabi-v7a' ;;
*aarch64*) exec_prefix='${prefix}/arm64-v8a' ;;
esac
fi
;; ;;
*) *)
...@@ -938,6 +949,7 @@ esac ...@@ -938,6 +949,7 @@ esac
enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
enable_wineqtdecoder=${enable_wineqtdecoder:-no} enable_wineqtdecoder=${enable_wineqtdecoder:-no}
enable_wineandroid_drv=${enable_wineandroid_drv:-no}
enable_winemac_drv=${enable_winemac_drv:-no} enable_winemac_drv=${enable_winemac_drv:-no}
test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no}
...@@ -1175,7 +1187,7 @@ else ...@@ -1175,7 +1187,7 @@ else
X_LIBS="" X_LIBS=""
fi fi
if test "$enable_winemac_drv" = "no" if test "$enable_wineandroid_drv$enable_winemac_drv" = "nono"
then then
WINE_ERROR_WITH(x,[test "x$X_LIBS" = "x"], WINE_ERROR_WITH(x,[test "x$X_LIBS" = "x"],
[X ${notice_platform}development files not found. Wine will be built [X ${notice_platform}development files not found. Wine will be built
...@@ -3507,6 +3519,7 @@ WINE_CONFIG_TEST(dlls/windowscodecs/tests) ...@@ -3507,6 +3519,7 @@ WINE_CONFIG_TEST(dlls/windowscodecs/tests)
WINE_CONFIG_DLL(windowscodecsext,,[implib]) WINE_CONFIG_DLL(windowscodecsext,,[implib])
WINE_CONFIG_TEST(dlls/windowscodecsext/tests) WINE_CONFIG_TEST(dlls/windowscodecsext/tests)
WINE_CONFIG_DLL(winealsa.drv) WINE_CONFIG_DLL(winealsa.drv)
WINE_CONFIG_DLL(wineandroid.drv)
WINE_CONFIG_DLL(winebus.sys) WINE_CONFIG_DLL(winebus.sys)
WINE_CONFIG_DLL(winecoreaudio.drv) WINE_CONFIG_DLL(winecoreaudio.drv)
WINE_CONFIG_LIB(winecrt0) WINE_CONFIG_LIB(winecrt0)
......
MODULE = wineandroid.drv
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment