Commit f0ca586f authored by Phil Krylov's avatar Phil Krylov Committed by Alexandre Julliard

explorer: Build on Darwin versions prior to 8.0.

parent b81b44f6
...@@ -1016,8 +1016,12 @@ case $host_os in ...@@ -1016,8 +1016,12 @@ case $host_os in
dnl declare needed frameworks dnl declare needed frameworks
AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation")
AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation") AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation")
AC_SUBST(DISKARBITRATIONLIB,"-framework DiskArbitration -framework CoreFoundation")
AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHARED_HEAP,0x7f000000"]) AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHARED_HEAP,0x7f000000"])
if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes"
then
dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found
AC_SUBST(DISKARBITRATIONLIB,"-framework DiskArbitration -framework CoreFoundation")
fi
if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes"
then then
dnl CoreServices needed by AudioUnit dnl CoreServices needed by AudioUnit
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(explorer); WINE_DEFAULT_DEBUG_CHANNEL(explorer);
#ifdef __APPLE__ #ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H
#include <DiskArbitration/DiskArbitration.h> #include <DiskArbitration/DiskArbitration.h>
...@@ -133,11 +133,11 @@ void initialize_diskarbitration(void) ...@@ -133,11 +133,11 @@ void initialize_diskarbitration(void)
CloseHandle( handle ); CloseHandle( handle );
} }
#else /* __APPLE__ */ #else /* HAVE_DISKARBITRATION_DISKARBITRATION_H */
void initialize_diskarbitration(void) void initialize_diskarbitration(void)
{ {
WINE_TRACE( "Skipping on non-Apple platform\n" ); WINE_TRACE( "Skipping, Disk Arbitration support not compiled in\n" );
} }
#endif /* __APPLE__ */ #endif /* HAVE_DISKARBITRATION_DISKARBITRATION_H */
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