Commit 70bb5bcc authored by Jérome Decoodt's avatar Jérome Decoodt
Browse files

Try to fix libtool on macos

Thanks to sam and pdherbemont (blame them too if this breaks everything!)
parent 925fa467
......@@ -173,7 +173,10 @@ case "${host_os}" in
VLC_ADD_LDFLAGS([mkv mp4], [-Wl,-framework,IOKit,-framework,CoreFoundation])
VLC_ADD_CFLAGS([libvlc vlc],[-x objective-c])
VLC_ADD_LDFLAGS([vlc],[-Wl,-undefined,dynamic_lookup])
VLC_ADD_LDFLAGS([libvlc_control],[-Wl,dynamic_lookup])
VLC_ADD_LDFLAGS([ffmpeg i420_rgb_mmx],[-Wl,-read_only_relocs,suppress])
VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings])
VLC_ADD_LDFLAGS([libvlc],[-Wl,-framework,Cocoa,-framework,CoreFoundation])
VLC_ADD_LDFLAGS([motion],[-Wl,-framework,IOKit,-framework,CoreFoundation])
AC_ARG_ENABLE(macosx-defaults,
[ --enable-macosx-defaults Build the default configuration on Mac OS X (default enabled)])
......@@ -4628,7 +4631,7 @@ if test "${enable_macosx-audio}" != "no" &&
then
AC_CHECK_HEADERS(CoreAudio/CoreAudio.h,
[ VLC_ADD_BUILTINS([auhal])
VLC_ADD_LDFLAGS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox])
VLC_ADD_LDFLAGS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,Carbon])
], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ])
fi
......
......@@ -118,7 +118,7 @@ typedef struct {
* Allocate a RGBPicture structure.
* \param datasize: the size of the data
*/
mediacontrol_RGBPicture *mediacontrol_RGBPicture__alloc( int datasize );
VLC_PRIVATE_API mediacontrol_RGBPicture *mediacontrol_RGBPicture__alloc( int datasize );
/**
* Free a RGBPicture structure.
......@@ -126,11 +126,11 @@ mediacontrol_RGBPicture *mediacontrol_RGBPicture__alloc( int datasize );
*/
VLC_PUBLIC_API void mediacontrol_RGBPicture__free( mediacontrol_RGBPicture *pic );
mediacontrol_RGBPicture *
VLC_PRIVATE_API mediacontrol_RGBPicture *
_mediacontrol_createRGBPicture( int, int, long, vlc_int64_t l_date,
char *, int);
mediacontrol_PlaylistSeq *mediacontrol_PlaylistSeq__alloc( int size );
VLC_PRIVATE_API mediacontrol_PlaylistSeq *mediacontrol_PlaylistSeq__alloc( int size );
VLC_PUBLIC_API void mediacontrol_PlaylistSeq__free( mediacontrol_PlaylistSeq *ps );
......
......@@ -474,10 +474,12 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */
#if defined (WIN32) && defined (DLL_EXPORT)
# ifdef __cplusplus
# define VLC_PUBLIC_API __declspec(dllexport)
# define VLC_PRIVATE_API __declspec(dllexport)
# define VLC_EXPORT( type, name, args ) extern "C" __declspec(dllexport) type name args
# define VLC_INTERNAL( type, name, args ) extern "C" type name args
# else
# define VLC_PUBLIC_API extern __declspec(dllexport)
# define VLC_PRIVATE_API extern __declspec(dllexport)
# define VLC_EXPORT( type, name, args ) __declspec(dllexport) type name args
# define VLC_INTERNAL( type, name, args ) type name args
# endif
......@@ -486,6 +488,7 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */
# ifdef __cplusplus
# if HAVE_ATTRIBUTE_VISIBILITY
# define VLC_PUBLIC_API __attribute__((visibility("default")))
# define VLC_PRIVATE_API __attribute__((visibility("default")))
# define VLC_EXPORT( type, name, args ) extern "C" __attribute__((visibility("default"))) type name args
# define VLC_INTERNAL( type, name, args ) extern "C" __attribute__((visibility("hidden"))) type name args
# else
......@@ -496,16 +499,19 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */
# else
# if HAVE_ATTRIBUTE_VISIBILITY
# define VLC_PUBLIC_API extern __attribute__((visibility("default")))
# define VLC_PRIVATE_API extern __attribute__((visibility("default")))
# define VLC_EXPORT( type, name, args ) __attribute__((visibility("default"))) type name args
# define VLC_INTERNAL( type, name, args ) __attribute__((visibility("hidden"))) type name args
# else
# define VLC_PUBLIC_API extern
# define VLC_PRIVATE_API extern
# define VLC_EXPORT( type, name, args ) type name args
# define VLC_INTERNAL( type, name, args ) type name args
# endif
# endif
# else
# define VLC_PUBLIC_API
# define VLC_RIVATE_API
# define VLC_EXPORT( type, name, args ) struct _u_n_u_s_e_d_
# define VLC_INTERNAL( type, name, args ) struct _u_n_u_s_e_d_
extern module_symbols_t* p_symbols;
......
......@@ -38,11 +38,11 @@ struct mediacontrol_Instance {
playlist_t *p_playlist;
};
vlc_int64_t mediacontrol_unit_convert( input_thread_t *p_input,
VLC_PRIVATE_API vlc_int64_t mediacontrol_unit_convert( input_thread_t *p_input,
mediacontrol_PositionKey from,
mediacontrol_PositionKey to,
vlc_int64_t value );
vlc_int64_t mediacontrol_position2microsecond(
VLC_PRIVATE_API vlc_int64_t mediacontrol_position2microsecond(
input_thread_t *p_input,
const mediacontrol_Position *pos );
......
sout_MethodRelease
sout_SAPMethod
sout_SessionSetMedia
vlc_b64_encode_binary
vlc_strnlen
stream_Block
__config_GetDataDir
__vlc_object_find_name
__var_Command
net_Listen
stream_Control
stream_Peek
stream_Read
__var_TriggerCallback
stream_Delete
vlc_CPU
NTPtime64
__str_format
path_sanitize
__vlc_object_kill
vlc_b64_encode
__net_Connect
__net_ConnectDgram
__net_OpenDgram
vlc_module_set
vlc_submodule_create
libvlc_InternalCleanup
libvlc_InternalCreate
libvlc_InternalDestroy
libvlc_InternalInit
msg_GetObjectTypeName
vlm_Control
ACL_AddNet
ACL_Check
__ACL_Create
......@@ -46,7 +78,6 @@ __config_ChainParse
config_Duplicate
config_FindConfig
config_FindModule
config_GetDataDir
__config_GetFloat
__config_GetInt
__config_GetPsz
......@@ -156,17 +187,10 @@ msleep
mstrtime
mwait
__net_Accept
net_Close
__net_ConnectTCP
__net_ConnectUDP
__net_Gets
net_ListenClose
net_ListenSingle
__net_ListenTCP
__net_OpenUDP
net_Printf
__net_Read
__net_ReadNonBlock
__net_Select
net_SetDSCP
__net_vaPrintf
......@@ -232,7 +256,6 @@ sout_AccessOutNew
sout_AccessOutRead
sout_AccessOutSeek
sout_AccessOutWrite
sout_AnnounceMethodCreate
sout_AnnounceRegister
sout_AnnounceRegisterSDP
sout_AnnounceSessionCreate
......@@ -316,12 +339,8 @@ __var_Get
__var_OptionParse
__var_Set
__var_Type
vlc_alphasort
vlc_asprintf
vlc_atof
vlc_atoll
VLC_Changeset
vlc_closedir
VLC_CompileBy
VLC_CompileDomain
VLC_CompileHost
......@@ -335,26 +354,18 @@ VLC_Die
__vlc_cond_destroy
__vlc_cond_init
vlc_current_object
vlc_dgettext
vlc_DictClear
vlc_DictGet
vlc_DictInsert
vlc_DictLookup
vlc_DictNew
vlc_error
VLC_Error
__vlc_execve
vlc_freeaddrinfo
vlc_gai_strerror
vlc_getaddrinfo
vlc_getenv
vlc_getnameinfo
vlc_iconv
vlc_iconv_close
vlc_iconv_open
__vlc_list_find
vlc_list_release
vlc_lldiv
__vlc_mutex_destroy
__vlc_mutex_init
__vlc_object_attach
......@@ -365,17 +376,8 @@ __vlc_object_find
__vlc_object_get
__vlc_object_release
__vlc_object_yield
vlc_opendir
vlc_parse_cmdline
vlc_readdir
vlc_scandir
vlc_strcasecmp
vlc_strcasestr
vlc_strdup
vlc_strlcpy
vlc_strncasecmp
vlc_strndup
vlc_strtoll
__vlc_thread_create
__vlc_thread_join
__vlc_thread_ready
......@@ -385,25 +387,13 @@ __vlc_threads_init
vlc_ureduce
vlc_vasprintf
VLC_Version
vlc_wclosedir
vlc_wraptext
vlm_Delete
vlm_ExecuteCommand
vlm_Load
vlm_MediaControl
vlm_MediaDelete
vlm_MediaNew
vlm_MediaSearch
vlm_MediaSetup
vlm_MediaVodControl
vlm_MessageDelete
vlm_MessageNew
vlm_MessageAdd
__vlm_New
vlm_Save
vlm_ScheduleDelete
vlm_ScheduleNew
vlm_ScheduleSetup
__vout_AllocatePicture
vout_ChromaCmp
vout_ControlWindow
......
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