mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-30 04:08:31 +00:00
configure: Always enable Mac driver on macOS.
This commit is contained in:
parent
e2c081a8eb
commit
87eb0a544a
14
configure
vendored
14
configure
vendored
|
@ -9807,6 +9807,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||
LIBEXT="dylib"
|
||||
DLLFLAGS="$DLLFLAGS -fPIC"
|
||||
LDDLLFLAGS="-fPIC"
|
||||
enable_winemac_drv=${enable_winemac_drv:-yes}
|
||||
COREFOUNDATION_LIBS="-framework CoreFoundation"
|
||||
|
||||
IOKIT_LIBS="-framework IOKit -framework CoreFoundation"
|
||||
|
@ -10034,19 +10035,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
fi
|
||||
|
||||
if test "$ac_cv_header_ApplicationServices_ApplicationServices_h" = "yes"
|
||||
then
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="$LIBS $APPLICATIONSERVICES_LIBS"
|
||||
ac_fn_c_check_func "$LINENO" "CGDisplayModeGetWidth" "ac_cv_func_CGDisplayModeGetWidth"
|
||||
if test "x$ac_cv_func_CGDisplayModeGetWidth" = xyes
|
||||
then :
|
||||
enable_winemac_drv=${enable_winemac_drv:-yes}
|
||||
fi
|
||||
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
|
||||
UNIXLDFLAGS="-dynamiclib -install_name @rpath/\$(UNIXLIB) -Wl,-rpath,@loader_path\/"
|
||||
|
|
10
configure.ac
10
configure.ac
|
@ -682,6 +682,7 @@ case $host_os in
|
|||
LIBEXT="dylib"
|
||||
DLLFLAGS="$DLLFLAGS -fPIC"
|
||||
LDDLLFLAGS="-fPIC"
|
||||
enable_winemac_drv=${enable_winemac_drv:-yes}
|
||||
dnl declare needed frameworks
|
||||
AC_SUBST(COREFOUNDATION_LIBS,"-framework CoreFoundation")
|
||||
AC_SUBST(IOKIT_LIBS,"-framework IOKit -framework CoreFoundation")
|
||||
|
@ -760,15 +761,6 @@ case $host_os in
|
|||
AC_LANG_POP([Objective C])
|
||||
fi
|
||||
|
||||
dnl Enable Mac driver on Mac OS X 10.6 or later
|
||||
if test "$ac_cv_header_ApplicationServices_ApplicationServices_h" = "yes"
|
||||
then
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="$LIBS $APPLICATIONSERVICES_LIBS"
|
||||
AC_CHECK_FUNC(CGDisplayModeGetWidth,enable_winemac_drv=${enable_winemac_drv:-yes})
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
|
||||
UNIXLDFLAGS="-dynamiclib -install_name @rpath/\$(UNIXLIB) -Wl,-rpath,@loader_path\/"
|
||||
AC_SUBST(LIBWINE_SHAREDLIB,"libwine.$libwine_version.dylib")
|
||||
AC_SUBST(LIBWINE_LDFLAGS,["-dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version"])
|
||||
|
|
Loading…
Reference in a new issue