Commit 3e019bf3 authored by Felix Paul Kühne's avatar Felix Paul Kühne

* disable 10.3 usage, as we can't provide a reliable version due to missing...

* disable 10.3 usage, as we can't provide a reliable version due to missing testing possibilities and linking issues against the 10.3.9 SDK
parent 793ded7e
...@@ -188,18 +188,6 @@ case "${target_os}" in ...@@ -188,18 +188,6 @@ case "${target_os}" in
;; ;;
esac esac
;; ;;
darwin1.[0123])
dnl Mac OS X < 10.3
SYS=darwin
CFLAGS_save="${CFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="${CXXFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="${OBJCFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; OBJCFLAGS="${OBJCFLAGS_save}"
VLC_ADD_LDFLAGS([vlc ffmpeg ffmpegaltivec],[-all_load])
VLC_ADD_LDFLAGS([mkv mp4], [-framework IOKit -framework CoreFoundation])
VLC_ADD_CFLAGS([libvlc],[-x objective-c])
VLC_ADD_CFLAGS([vlc],[-x objective-c])
VLC_ADD_LDFLAGS([vlc],[-Wl,-m -Wl,-multiply_defined -Wl,suppress])
;;
darwin*) darwin*)
SYS=darwin SYS=darwin
CFLAGS_save="${CFLAGS_save} -D_INTL_REDIRECT_MACROS"; CFLAGS="${CFLAGS_save}" CFLAGS_save="${CFLAGS_save} -D_INTL_REDIRECT_MACROS"; CFLAGS="${CFLAGS_save}"
...@@ -294,15 +282,12 @@ dnl ...@@ -294,15 +282,12 @@ dnl
dnl Check for Mac OS X SDK settings dnl Check for Mac OS X SDK settings
dnl dnl
AC_ARG_WITH(macosx-sdk, AC_ARG_WITH(macosx-sdk,
[ --with-macosx-sdk compile for Mac OS X 10.3 SDK],[], with_macosx_sdk=no) [ --with-macosx-sdk compile with the Mac OS X 10.4u SDK],[], with_macosx_sdk=no)
if test "${with_macosx_sdk}" != "no" -a "${target_cpu}" = "powerpc"; then if test "${with_macosx_sdk}" != "no"; then
CFLAGS_save="${CFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.3 -isysroot /Developer/SDKs/MacOSX10.3.9.sdk"; CFLAGS="${CFLAGS_save}" CC="${CC} -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
CXXFLAGS_save="${CXXFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.3 -isysroot /Developer/SDKs/MacOSX10.3.9.sdk"; CXXFLAGS="${CXXFLAGS_save}" CXX="${CXX} -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
OBJCFLAGS_save="${OBJCFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.3 -isysroot /Developer/SDKs/MacOSX10.3.9.sdk"; OBJCFLAGS="${OBJCFLAGS_save}" OBJC="${OBJC} -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
LDFLAGS_save="${LDFLAGS_save} -isysroot /Developer/SDKs/MacOSX10.3.9.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk"; LDFLAGS="${LDFLAGS_save}" LD="${LD} -syslibroot /Developer/SDKs/MacOSX10.4u.sdk"
export MACOSX_DEPLOYMENT_TARGET=10.3
MACOSX_DEPLOYMENT_TARGET="10.3"
elif test "${with_macosx_sdk}" != "no" -a "${target_cpu}" != "powerpc"; then
CFLAGS_save="${CFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"; CFLAGS="${CFLAGS_save}" CFLAGS_save="${CFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="${CXXFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"; CXXFLAGS="${CXXFLAGS_save}" CXXFLAGS_save="${CXXFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="${OBJCFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"; OBJCFLAGS="${OBJCFLAGS_save}" OBJCFLAGS_save="${OBJCFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"; OBJCFLAGS="${OBJCFLAGS_save}"
......
...@@ -672,6 +672,21 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -672,6 +672,21 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_controls setupVarMenuItem: o_mi_add_intf target: (vlc_object_t *)p_intf [o_controls setupVarMenuItem: o_mi_add_intf target: (vlc_object_t *)p_intf
var: "intf-add" selector: @selector(toggleVar:)]; var: "intf-add" selector: @selector(toggleVar:)];
/* check whether the user runs a valid version of OSX; alert is auto-released */
if( MACOS_VERSION < 10.4f )
{
NSAlert *ourAlert;
int i_returnValue;
ourAlert = [NSAlert alertWithMessageText: _NS("Your version of Mac OS X is not supported")
defaultButton: _NS("Quit")
alternateButton: NULL
otherButton: NULL
informativeTextWithFormat: _NS("VLC media player requires Mac OS X 10.4 or higher.")];
[ourAlert setAlertStyle: NSCriticalAlertStyle];
i_returnValue = [ourAlert runModal];
[NSApp terminate: self];
}
vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW ); vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
} }
...@@ -1175,7 +1190,21 @@ increase/decrease as long as the user holds the left/right, plus/minus button */ ...@@ -1175,7 +1190,21 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
p_intf->p_sys->b_current_title_update = FALSE; p_intf->p_sys->b_current_title_update = FALSE;
} }
/*
if( p_intf->p_sys->p_input )
{
vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
if(! p_vout )
{
msg_Dbg( p_intf, "no vout needed for current input, closing" );
[[self embeddedwindow] orderOut: [self embeddedwindow]];
}
else
{
msg_Dbg( p_intf, "vout found and present" );
}
}
*/
if( p_intf->p_sys->p_input && [o_timeslider isEnabled] ) if( p_intf->p_sys->p_input && [o_timeslider isEnabled] )
{ {
/* Update the slider */ /* Update the slider */
......
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