Module: wine Branch: master Commit: e11f2397ac847872fc8e5547c95ad7f0d9ed824b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e11f2397ac847872fc8e5547c9...
Author: Alexandre Julliard julliard@winehq.org Date: Tue May 30 12:58:03 2017 +0200
configure: Add Android driver stub.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 16 +++++++++++++++- configure.ac | 15 ++++++++++++++- dlls/wineandroid.drv/Makefile.in | 1 + dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 4 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/configure b/configure index fb22627..9751fa0 100755 --- a/configure +++ b/configure @@ -1465,6 +1465,7 @@ enable_wimgapi enable_windowscodecs enable_windowscodecsext enable_winealsa_drv +enable_wineandroid_drv enable_winebus_sys enable_winecoreaudio_drv enable_wined3d @@ -8367,6 +8368,7 @@ fi linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" 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_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; } if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then : @@ -8481,6 +8483,16 @@ fi
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
enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} enable_wineqtdecoder=${enable_wineqtdecoder:-no} +enable_wineandroid_drv=${enable_wineandroid_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}
@@ -11002,7 +11015,7 @@ else X_LIBS="" fi
-if test "$enable_winemac_drv" = "no" +if test "$enable_wineandroid_drv$enable_winemac_drv" = "nono" then if test "x$X_LIBS" = "x"; then : case "x$with_x" in @@ -18562,6 +18575,7 @@ wine_fn_config_test dlls/windowscodecs/tests windowscodecs_test wine_fn_config_dll windowscodecsext enable_windowscodecsext implib wine_fn_config_test dlls/windowscodecsext/tests windowscodecsext_test 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 winecoreaudio.drv enable_winecoreaudio_drv wine_fn_config_lib winecrt0 diff --git a/configure.ac b/configure.ac index dde867b..74fdf11 100644 --- a/configure.ac +++ b/configure.ac @@ -851,6 +851,7 @@ case $host_os in linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" LDEXECFLAGS="-Wl,-pie" + enable_wineandroid_drv=${enable_wineandroid_drv:-yes} WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic], [WINELOADER_LDFLAGS="-Wl,--export-dynamic"]) WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,$ORIGIN/../lib], @@ -865,6 +866,16 @@ case $host_os in AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so") AC_SUBST(LIBWINE_INSTALL_LIB,"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
enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} enable_wineqtdecoder=${enable_wineqtdecoder:-no} +enable_wineandroid_drv=${enable_wineandroid_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}
@@ -1175,7 +1187,7 @@ else X_LIBS="" fi
-if test "$enable_winemac_drv" = "no" +if test "$enable_wineandroid_drv$enable_winemac_drv" = "nono" then WINE_ERROR_WITH(x,[test "x$X_LIBS" = "x"], [X ${notice_platform}development files not found. Wine will be built @@ -3507,6 +3519,7 @@ WINE_CONFIG_TEST(dlls/windowscodecs/tests) WINE_CONFIG_DLL(windowscodecsext,,[implib]) WINE_CONFIG_TEST(dlls/windowscodecsext/tests) WINE_CONFIG_DLL(winealsa.drv) +WINE_CONFIG_DLL(wineandroid.drv) WINE_CONFIG_DLL(winebus.sys) WINE_CONFIG_DLL(winecoreaudio.drv) WINE_CONFIG_LIB(winecrt0) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in new file mode 100644 index 0000000..5fd0180 --- /dev/null +++ b/dlls/wineandroid.drv/Makefile.in @@ -0,0 +1 @@ +MODULE = wineandroid.drv diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec new file mode 100644 index 0000000..30fd8e1 --- /dev/null +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -0,0 +1 @@ +# Nothing here yet