mirror of https://code.videolan.org/videolan/vlc
Quelques ajustements pour beos. Les plugins ne compilent toujours pas.
This commit is contained in:
Jean-Marc Dressler
parent
86054cbfba
commit
4eed2dd0c0
17
Makefile.in
17
Makefile.in
|
|
@ -1,3 +1,4 @@
|
|||
# Generated automatically from Makefile.in by configure.
|
||||
################################################################################
|
||||
# vlc (VideoLAN Client) main makefile
|
||||
# (c)1998 VideoLAN
|
||||
|
|
@ -87,10 +88,10 @@ PROGRAM_BUILD = `date` $(USER)
|
|||
DEFINE += -DARCH_$(shell echo $(ARCH) | cut -f1 -d' ')
|
||||
DEFINE += -DSYS_$(SYS)
|
||||
DEFINE += -DPLUGIN_PATH="\"$(PREFIX)/lib/videolan/vlc\""
|
||||
DEFINE += -DPROGRAM_VERSION="\"@VLC_VERSION@\""
|
||||
DEFINE += -DPROGRAM_CODENAME="\"@VLC_CODENAME@\""
|
||||
DEFINE += -DPROGRAM_OPTIONS="\"$(shell echo $(PROGRAM_OPTIONS) | tr 'A-Z' 'a-z')\""
|
||||
DEFINE += -DPROGRAM_BUILD="\"$(PROGRAM_BUILD)\""
|
||||
DEFINE += -DPROGRAM_VERSION="\"0.1.99\""
|
||||
DEFINE += -DPROGRAM_CODENAME="\"Onatopp\""
|
||||
#DEFINE += -DPROGRAM_OPTIONS="\"$(shell echo $(PROGRAM_OPTIONS) | tr 'A-Z' 'a-z')\""
|
||||
#DEFINE += -DPROGRAM_BUILD="\"$(PROGRAM_BUILD)\""
|
||||
ifeq ($(DEBUG),1)
|
||||
DEFINE += -DDEBUG
|
||||
endif
|
||||
|
|
@ -378,7 +379,11 @@ $(PLUGIN_OBJ): %.so: .dep/%.d
|
|||
# audio plugins
|
||||
plugins/aout/aout_dummy.so plugins/aout/aout_dsp.so: %.so: %.c
|
||||
@echo "compiling $*.so from $*.c"
|
||||
ifeq ($(SYS), BEOS)
|
||||
@$(CC) $(CCFLAGS) $(CFLAGS) -nostart -o $@ $<
|
||||
else
|
||||
@$(CC) $(CCFLAGS) $(CFLAGS) -shared -o $@ $<
|
||||
endif
|
||||
|
||||
plugins/aout/aout_esd.so: %.so: %.c
|
||||
@echo "compiling $*.so from $*.c"
|
||||
|
|
@ -392,7 +397,11 @@ endif
|
|||
plugins/intf/intf_dummy.so plugins/vout/vout_dummy.so \
|
||||
plugins/intf/intf_fb.so plugins/vout/vout_fb.so: %.so: %.c
|
||||
@echo "compiling $*.so from $*.c"
|
||||
ifeq ($(SYS), BEOS)
|
||||
@$(CC) $(CCFLAGS) $(CFLAGS) -nostart -o $@ $<
|
||||
else
|
||||
@$(CC) $(CCFLAGS) $(CFLAGS) -shared -o $@ $<
|
||||
endif
|
||||
|
||||
plugins/intf/intf_x11.so plugins/vout/vout_x11.so: %.so: %.c
|
||||
@echo "compiling $*.so from $*.c"
|
||||
|
|
|
|||
|
|
@ -2731,7 +2731,7 @@ fi
|
|||
done
|
||||
|
||||
|
||||
for ac_hdr in cthreads.h pthread.h kernel/sheduler.h kernel/OS.h
|
||||
for ac_hdr in cthreads.h pthread.h kernel/scheduler.h kernel/OS.h
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ AC_CHECK_HEADERS(dlfcn.h image.h)
|
|||
AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
|
||||
|
||||
dnl Check for threads library
|
||||
AC_CHECK_HEADERS(cthreads.h pthread.h kernel/sheduler.h kernel/OS.h)
|
||||
AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h)
|
||||
|
||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
AC_C_CONST
|
||||
|
|
|
|||
|
|
@ -73,8 +73,8 @@
|
|||
/* Define if you have the <kernel/OS.h> header file. */
|
||||
#undef HAVE_KERNEL_OS_H
|
||||
|
||||
/* Define if you have the <kernel/sheduler.h> header file. */
|
||||
#undef HAVE_KERNEL_SHEDULER_H
|
||||
/* Define if you have the <kernel/scheduler.h> header file. */
|
||||
#undef HAVE_KERNEL_SCHEDULER_H
|
||||
|
||||
/* Define if you have the <machine/soundcard.h> header file. */
|
||||
#undef HAVE_MACHINE_SOUNDCARD_H
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
#elif defined(HAVE_CTHREADS_H) /* GNUMach */
|
||||
#include <cthreads.h>
|
||||
|
||||
#elif defined(HAVE_KERNEL_SHEDULER_H) && defined(HAVE_KERNEL_OS_H) /* BeOS */
|
||||
#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H) /* BeOS */
|
||||
#include <kernel/OS.h>
|
||||
#include <kernel/scheduler.h>
|
||||
|
||||
|
|
@ -88,7 +88,7 @@ typedef struct s_condition {
|
|||
struct cond_imp *implications;
|
||||
} vlc_cond_t;
|
||||
|
||||
#elif defined(HAVE_KERNEL_SHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
|
||||
typedef thread_id vlc_thread_t;
|
||||
|
||||
|
|
@ -152,7 +152,7 @@ static __inline__ int vlc_thread_create( vlc_thread_t *p_thread,
|
|||
*p_thread = cthread_fork( (cthread_fn_t)func, (any_t)p_data );
|
||||
return( 0 );
|
||||
|
||||
#elif defined(HAVE_KERNEL_SHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
*p_thread = spawn_thread( (thread_func)func, psz_name, B_NORMAL_PRIORITY, p_data );
|
||||
return resume_thread( *p_thread );
|
||||
|
||||
|
|
@ -171,7 +171,7 @@ static __inline__ void vlc_thread_exit( void )
|
|||
int result;
|
||||
cthread_exit( &result );
|
||||
|
||||
#elif defined(HAVE_KERNEL_SHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
exit_thread( 0 );
|
||||
|
||||
#elif defined(HAVE_PTHREAD_H)
|
||||
|
|
@ -188,7 +188,7 @@ static __inline__ void vlc_thread_join( vlc_thread_t thread )
|
|||
#if defined(HAVE_CTHREADS_H)
|
||||
cthread_join( thread );
|
||||
|
||||
#elif defined(HAVE_KERNEL_SHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
int32 exit_value;
|
||||
wait_for_thread( thread, &exit_value );
|
||||
|
||||
|
|
@ -198,7 +198,7 @@ static __inline__ void vlc_thread_join( vlc_thread_t thread )
|
|||
#endif
|
||||
}
|
||||
|
||||
#if defined(HAVE_KERNEL_SHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
#if defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
/* lazy_init_mutex */
|
||||
static __inline__ void lazy_init_mutex(vlc_mutex_t* p_mutex)
|
||||
{
|
||||
|
|
@ -223,7 +223,7 @@ static __inline__ int vlc_mutex_init( vlc_mutex_t *p_mutex )
|
|||
mutex_init( p_mutex );
|
||||
return( 0 );
|
||||
|
||||
#elif defined(HAVE_KERNEL_SHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
// check the arguments and whether it's already been initialized
|
||||
if( !p_mutex ) return B_BAD_VALUE;
|
||||
if( p_mutex->init == 9999 ) return EALREADY;
|
||||
|
|
@ -248,7 +248,7 @@ static __inline__ int vlc_mutex_lock( vlc_mutex_t *p_mutex )
|
|||
mutex_lock( p_mutex );
|
||||
return( 0 );
|
||||
|
||||
#elif defined(HAVE_KERNEL_SHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
status_t err;
|
||||
|
||||
if( !p_mutex ) return B_BAD_VALUE;
|
||||
|
|
@ -274,7 +274,7 @@ static __inline__ int vlc_mutex_unlock( vlc_mutex_t *p_mutex )
|
|||
mutex_unlock( p_mutex );
|
||||
return( 0 );
|
||||
|
||||
#elif defined(HAVE_KERNEL_SHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
if(! p_mutex) return B_BAD_VALUE;
|
||||
if( p_mutex->init < 2000 ) return B_NO_INIT;
|
||||
lazy_init_mutex( p_mutex );
|
||||
|
|
@ -290,7 +290,7 @@ static __inline__ int vlc_mutex_unlock( vlc_mutex_t *p_mutex )
|
|||
#endif
|
||||
}
|
||||
|
||||
#if defined(HAVE_KERNEL_SHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
#if defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
/* lazy_init_cond */
|
||||
static __inline__ void lazy_init_cond( vlc_cond_t* p_condvar )
|
||||
{
|
||||
|
|
@ -320,7 +320,7 @@ static __inline__ int vlc_cond_init( vlc_cond_t *p_condvar )
|
|||
|
||||
return( 0 );
|
||||
|
||||
#elif defined(HAVE_KERNEL_SHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
if( !p_condvar ) return B_BAD_VALUE;
|
||||
if( p_condvar->init == 9999 ) return EALREADY;
|
||||
|
||||
|
|
@ -350,7 +350,7 @@ static __inline__ int vlc_cond_signal( vlc_cond_t *p_condvar )
|
|||
}
|
||||
return( 0 );
|
||||
|
||||
#elif defined(HAVE_KERNEL_SHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
status_t err = B_OK;
|
||||
|
||||
if( !p_condvar ) return B_BAD_VALUE;
|
||||
|
|
@ -388,7 +388,7 @@ static __inline__ int vlc_cond_wait( vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex
|
|||
condition_wait( (condition_t)p_condvar, (mutex_t)p_mutex );
|
||||
return( 0 );
|
||||
|
||||
#elif defined(HAVE_KERNEL_SHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
|
||||
status_t err;
|
||||
|
||||
if( !p_condvar ) return B_BAD_VALUE;
|
||||
|
|
|
|||
|
|
@ -520,8 +520,8 @@ static void Usage( int i_fashion )
|
|||
*****************************************************************************/
|
||||
static void Version( void )
|
||||
{
|
||||
intf_Msg( "vlc " PROGRAM_VERSION " " PROGRAM_CODENAME
|
||||
" (" PROGRAM_BUILD ") (" PROGRAM_OPTIONS ")\n"
|
||||
intf_Msg( "vlc " " "
|
||||
" (" ") (" ")\n"
|
||||
"Copyright 1996-2000 VideoLAN\n"
|
||||
"This program comes with NO WARRANTY, to the extent permitted by law.\n"
|
||||
"You may redistribute it under the terms of the GNU General Public License;\n"
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ int RequestPlugin ( plugin_id_t * p_plugin, char * psz_mask, char * psz_name )
|
|||
*p_plugin = dlopen( psz_plugin, RTLD_NOW | RTLD_GLOBAL );
|
||||
|
||||
#elif defined(HAVE_IMAGE_H)
|
||||
*p_plugin = load_addon_image( psz_plugin );
|
||||
*p_plugin = load_add_on( psz_plugin );
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue