pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

1.2 pulseaudio: make some function pointers static.

Browse source 
--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%404423
This commit is contained in:
Ryan C. Gordon 2010-01-17 05:17:59 +00:00
parent 3bb17ca192
commit 7e6a3a8a13
2 changed files with 151 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

205
build-scripts/fatbuild.sh
View file

@ -5,96 +5,98 @@
# Number of CPUs (for make -j) # Number of CPUs (for make -j)
NCPU=`sysctl -n hw.ncpu` NCPU=`sysctl -n hw.ncpu`
NJOB=$NCPU NJOB=$NCPU
#NJOB=`expr $NCPU + 1`
# Generic, cross-platform CFLAGS you always want go here. # Generic, cross-platform CFLAGS you always want go here.
CFLAGS="-O3 -g -pipe" CFLAGS="-O3 -g -pipe"
# Locate Xcode SDK path # PowerPC 32-bit configure flags (10.4 runtime compatibility)
SDK_PATH=/Developer/SDKs # We dynamically load X11, so using the system X11 headers is fine.
if [ ! -d $SDK_PATH ]; then CONFIG_PPC="--build=`uname -p`-apple-darwin --host=powerpc-apple-darwin \
echo "Couldn't find SDK path"
exit 1
fi
# See if we can use 10.2 or 10.3 runtime compatibility
if [ -d "$SDK_PATH/MacOSX10.2.8.sdk" ]; then
# PowerPC configure flags (10.2 runtime compatibility)
# We dynamically load X11, so using the system X11 headers is fine.
CONFIG_PPC="--build=`uname -p`-apple-darwin --host=powerpc-apple-darwin \
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib" --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
# PowerPC compiler flags # PowerPC 32-bit compiler flags
CC_PPC="gcc-3.3 -arch ppc" CC_PPC="gcc-4.0 -arch ppc"
CXX_PPC="g++-3.3 -arch ppc" CXX_PPC="g++-4.0 -arch ppc"
CFLAGS_PPC="" CFLAGS_PPC="-mmacosx-version-min=10.4"
CPPFLAGS_PPC="-DMAC_OS_X_VERSION_MIN_REQUIRED=1020 \ CPPFLAGS_PPC="-DMAC_OS_X_VERSION_MIN_REQUIRED=1040 \
-nostdinc \ -nostdinc \
-F$SDK_PATH/MacOSX10.2.8.sdk/System/Library/Frameworks \ -F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks \
-I$SDK_PATH/MacOSX10.2.8.sdk/usr/include/gcc/darwin/3.3 \ -I/Developer/SDKs/MacOSX10.4u.sdk/usr/lib/gcc/powerpc-apple-darwin10/4.0.1/include \
-isystem $SDK_PATH/MacOSX10.2.8.sdk/usr/include" -isystem /Developer/SDKs/MacOSX10.4u.sdk/usr/include"
# PowerPC linker flags # PowerPC 32-bit linker flags
LFLAGS_PPC="-Wl,-headerpad_max_install_names -arch ppc \ LFLAGS_PPC="-arch ppc -mmacosx-version-min=10.4 \
-L$SDK_PATH/MacOSX10.2.8.sdk/usr/lib/gcc/darwin/3.3 \ -F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks \
-F$SDK_PATH/MacOSX10.2.8.sdk/System/Library/Frameworks \ -L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib/gcc/powerpc-apple-darwin10/4.0.1 \
-Wl,-syslibroot,$SDK_PATH/MacOSX10.2.8.sdk" -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
else # 10.2 or 10.3 SDK # PowerPC 64-bit configure flags (10.5 runtime compatibility)
# We dynamically load X11, so using the system X11 headers is fine.
# PowerPC configure flags (10.3 runtime compatibility) CONFIG_PPC64="--build=`uname -p`-apple-darwin --host=powerpc-apple-darwin \
# We dynamically load X11, so using the system X11 headers is fine.
CONFIG_PPC="--build=`uname -p`-apple-darwin --host=powerpc-apple-darwin \
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib" --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
# PowerPC compiler flags # PowerPC 64-bit compiler flags
CC_PPC="gcc-4.0 -arch ppc" CC_PPC64="gcc-4.0 -arch ppc64"
CXX_PPC="g++-4.0 -arch ppc" CXX_PPC64="g++-4.0 -arch ppc64"
CFLAGS_PPC="" CFLAGS_PPC64="-mmacosx-version-min=10.5"
CPPFLAGS_PPC="-DMAC_OS_X_VERSION_MIN_REQUIRED=1030 \ CPPFLAGS_PPC64="-DMAC_OS_X_VERSION_MIN_REQUIRED=1050 \
-nostdinc \ -nostdinc \
-F$SDK_PATH/MacOSX10.3.9.sdk/System/Library/Frameworks \ -F/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks \
-I$SDK_PATH/MacOSX10.3.9.sdk/usr/lib/gcc/powerpc-apple-darwin9/4.0.1/include \ -I/Developer/SDKs/MacOSX10.5.sdk/usr/lib/gcc/powerpc-apple-darwin10/4.0.1/include \
-isystem $SDK_PATH/MacOSX10.3.9.sdk/usr/include" -isystem /Developer/SDKs/MacOSX10.5.sdk/usr/include"
# PowerPC linker flags # PowerPC 64-bit linker flags
LFLAGS_PPC="-Wl,-headerpad_max_install_names -arch ppc -mmacosx-version-min=10.3 \ LFLAGS_PPC64="-arch ppc64 -mmacosx-version-min=10.5 \
-L$SDK_PATH/MacOSX10.3.9.sdk/usr/lib/gcc/powerpc-apple-darwin9/4.0.1 \ -F/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks \
-F$SDK_PATH/MacOSX10.3.9.sdk/System/Library/Frameworks \ -L/Developer/SDKs/MacOSX10.5.sdk/usr/lib/gcc/powerpc-apple-darwin10/4.0.1/ppc64 \
-Wl,-syslibroot,$SDK_PATH/MacOSX10.3.9.sdk" -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk"
fi # 10.2 or 10.3 SDK # Intel 32-bit configure flags (10.4 runtime compatibility)
# Intel configure flags (10.4 runtime compatibility)
# We dynamically load X11, so using the system X11 headers is fine. # We dynamically load X11, so using the system X11 headers is fine.
CONFIG_X86="--build=`uname -p`-apple-darwin --host=i386-apple-darwin \ CONFIG_X86="--build=`uname -p`-apple-darwin --host=i386-apple-darwin \
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib" --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
# They changed this to "darwin10" in Xcode 3.2 (Snow Leopard). # Intel 32-bit configure flags (10.4 runtime compatibility)
GCCUSRPATH="$SDK_PATH/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin9/4.0.1" # We dynamically load X11, so using the system X11 headers is fine.
if [ ! -d "$GCCUSRPATH" ]; then CONFIG_X86="--build=`uname -p`-apple-darwin --host=i386-apple-darwin \
GCCUSRPATH="$SDK_PATH/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin10/4.0.1" --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
fi
if [ ! -d "$GCCUSRPATH" ]; then # Intel 32-bit compiler flags
echo "Couldn't find any GCC usr path"
exit 1
fi
# Intel compiler flags
CC_X86="gcc-4.0 -arch i386" CC_X86="gcc-4.0 -arch i386"
CXX_X86="g++-4.0 -arch i386" CXX_X86="g++-4.0 -arch i386"
CFLAGS_X86="-mmacosx-version-min=10.4" CFLAGS_X86="-mmacosx-version-min=10.4"
CPPFLAGS_X86="-DMAC_OS_X_VERSION_MIN_REQUIRED=1040 \ CPPFLAGS_X86="-DMAC_OS_X_VERSION_MIN_REQUIRED=1040 \
-nostdinc \ -nostdinc \
-F$SDK_PATH/MacOSX10.4u.sdk/System/Library/Frameworks \ -F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks \
-I$GCCUSRPATH/include \ -I/Developer/SDKs/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin10/4.0.1/include \
-isystem $SDK_PATH/MacOSX10.4u.sdk/usr/include" -isystem /Developer/SDKs/MacOSX10.4u.sdk/usr/include"
# Intel linker flags # Intel 32-bit linker flags
LFLAGS_X86="-Wl,-headerpad_max_install_names -arch i386 -mmacosx-version-min=10.4 \ LFLAGS_X86="-arch i386 -mmacosx-version-min=10.4 \
-L$GCCUSRPATH \ -F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks \
-Wl,-syslibroot,$SDK_PATH/MacOSX10.4u.sdk" -L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin10/4.0.1 \
-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
# Intel 64-bit configure flags (10.5 runtime compatibility)
# We dynamically load X11, so using the system X11 headers is fine.
CONFIG_X64="--build=`uname -p`-apple-darwin --host=i386-apple-darwin \
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
# Intel 64-bit compiler flags
CC_X64="gcc-4.0 -arch x86_64"
CXX_X64="g++-4.0 -arch x86_64"
CFLAGS_X64="-mmacosx-version-min=10.5"
CPPFLAGS_X64="-DMAC_OS_X_VERSION_MIN_REQUIRED=1050 \
-nostdinc \
-F/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks \
-I/Developer/SDKs/MacOSX10.5.sdk/usr/lib/gcc/i686-apple-darwin10/4.0.1/include \
-isystem /Developer/SDKs/MacOSX10.5.sdk/usr/include"
# Intel 64-bit linker flags
LFLAGS_X64="-arch x86_64 -mmacosx-version-min=10.5 \
-F/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks \
-L/Developer/SDKs/MacOSX10.5.sdk/usr/lib/gcc/i686-apple-darwin10/4.0.1/x86_64 \
-Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk"
# #
# Find the configure script # Find the configure script
@ -106,8 +108,8 @@ cd $srcdir
# #
# Figure out which phase to build: # Figure out which phase to build:
# all, # all,
# configure, configure-ppc, configure-x86, # configure, configure-ppc, configure-ppc64, configure-x86, configure-x64
# make, make-ppc, make-x86, merge # make, make-ppc, make-ppc64, make-x86, make-x64, merge
# install # install
# clean # clean
if test x"$1" = x; then if test x"$1" = x; then
@ -118,32 +120,52 @@ fi
case $phase in case $phase in
all) all)
configure_ppc="yes" configure_ppc="yes"
#configure_ppc64="yes"
configure_x86="yes" configure_x86="yes"
configure_x64="yes"
make_ppc="yes" make_ppc="yes"
#make_ppc64="yes"
make_x86="yes" make_x86="yes"
make_x64="yes"
merge="yes" merge="yes"
;; ;;
configure) configure)
configure_ppc="yes" configure_ppc="yes"
configure_ppc64="yes"
configure_x86="yes" configure_x86="yes"
configure_x64="yes"
;; ;;
configure-ppc) configure-ppc)
configure_ppc="yes" configure_ppc="yes"
;; ;;
configure-ppc64)
configure_ppc64="yes"
;;
configure-x86) configure-x86)
configure_x86="yes" configure_x86="yes"
;; ;;
configure-x64)
configure_x64="yes"
;;
make) make)
make_ppc="yes" make_ppc="yes"
make_ppc64="yes"
make_x86="yes" make_x86="yes"
make_x64="yes"
merge="yes" merge="yes"
;; ;;
make-ppc) make-ppc)
make_ppc="yes" make_ppc="yes"
;; ;;
make-ppc64)
make_ppc64="yes"
;;
make-x86) make-x86)
make_x86="yes" make_x86="yes"
;; ;;
make-x64)
make_x64="yes"
;;
merge) merge)
merge="yes" merge="yes"
;; ;;
@ -171,16 +193,24 @@ case $phase in
;; ;;
clean) clean)
clean_ppc="yes" clean_ppc="yes"
clean_ppc64="yes"
clean_x86="yes" clean_x86="yes"
clean_x64="yes"
;; ;;
clean-ppc) clean-ppc)
clean_ppc="yes" clean_ppc="yes"
;; ;;
clean-ppc64)
clean_ppc64="yes"
;;
clean-x86) clean-x86)
clean_x86="yes" clean_x86="yes"
;; ;;
clean-x64)
clean_x64="yes"
;;
*) *)
echo "Usage: $0 [all|configure[-ppc|-x86]|make[-ppc|-x86]|merge|install|clean]" echo "Usage: $0 [all|configure[-ppc|-ppc64|-x86|-x64]|make[-ppc|-ppc64|-x86|-x64]|merge|install|clean[-ppc|-ppc64|-x86|-x64]]"
exit 1 exit 1
;; ;;
esac esac
@ -188,9 +218,15 @@ case `uname -p` in
powerpc) powerpc)
native_path=ppc native_path=ppc
;; ;;
powerpc64)
native_path=ppc64
;;
*86) *86)
native_path=x86 native_path=x86
;; ;;
x86_64)
native_path=x64
;;
*) *)
echo "Couldn't figure out native architecture path" echo "Couldn't figure out native architecture path"
exit 1 exit 1
@ -200,7 +236,7 @@ esac
# #
# Create the build directories # Create the build directories
# #
for dir in build build/ppc build/x86; do for dir in build build/ppc build/ppc64 build/x86 build/x64; do
if test -d $dir; then if test -d $dir; then
: :
else else
@ -209,7 +245,7 @@ for dir in build build/ppc build/x86; do
done done
# #
# Build the PowerPC binary # Build the PowerPC 32-bit binary
# #
if test x$configure_ppc = xyes; then if test x$configure_ppc = xyes; then
(cd build/ppc && \ (cd build/ppc && \
@ -220,7 +256,18 @@ if test x$make_ppc = xyes; then
fi fi
# #
# Build the Intel binary # Build the PowerPC 64-bit binary
#
if test x$configure_ppc64 = xyes; then
(cd build/ppc64 && \
sh ../../configure $CONFIG_PPC64 CC="$CC_PPC64" CXX="$CXX_PPC64" CFLAGS="$CFLAGS $CFLAGS_PPC64" CPPFLAGS="$CPPFLAGS_PPC64" LDFLAGS="$LFLAGS_PPC64") || exit 2
fi
if test x$make_ppc64 = xyes; then
(cd build/ppc64 && ls include && make -j$NJOB) || exit 3
fi
#
# Build the Intel 32-bit binary
# #
if test x$configure_x86 = xyes; then if test x$configure_x86 = xyes; then
(cd build/x86 && \ (cd build/x86 && \
@ -230,6 +277,17 @@ if test x$make_x86 = xyes; then
(cd build/x86 && make -j$NJOB) || exit 3 (cd build/x86 && make -j$NJOB) || exit 3
fi fi
#
# Build the Intel 32-bit binary
#
if test x$configure_x64 = xyes; then
(cd build/x64 && \
sh ../../configure $CONFIG_X64 CC="$CC_X64" CXX="$CXX_X64" CFLAGS="$CFLAGS $CFLAGS_X64" CPPFLAGS="$CPPFLAGS_X64" LDFLAGS="$LFLAGS_X64") || exit 2
fi
if test x$make_x64 = xyes; then
(cd build/x64 && make -j$NJOB) || exit 3
fi
# #
# Combine into fat binary # Combine into fat binary
# #
@ -237,9 +295,8 @@ if test x$merge = xyes; then
output=.libs output=.libs
sh $auxdir/mkinstalldirs build/$output sh $auxdir/mkinstalldirs build/$output
cd build cd build
target=`find . -mindepth 3 -type f -name '*.dylib' | head -1 | sed 's|.*/||'` target=`find . -mindepth 4 -maxdepth 4 -type f -name '*.dylib' | head -1 | sed 's|.*/||'`
(lipo -create -o $output/$target `find . -mindepth 3 -type f -name "*.dylib"` && (lipo -create -o $output/$target `find . -mindepth 4 -maxdepth 4 -type f -name "*.dylib"` &&
ln -sf $target $output/libSDL-1.2.0.dylib &&
ln -sf $target $output/libSDL.dylib && ln -sf $target $output/libSDL.dylib &&
lipo -create -o $output/libSDL.a */build/.libs/libSDL.a && lipo -create -o $output/libSDL.a */build/.libs/libSDL.a &&
cp $native_path/build/.libs/libSDL.la $output && cp $native_path/build/.libs/libSDL.la $output &&

40
src/audio/pulse/SDL_pulseaudio.c
View file

@ -82,37 +82,37 @@ static pa_channel_map* (*SDL_NAME(pa_channel_map_init_auto))(
pa_channel_map_def_t def pa_channel_map_def_t def
); );
pa_mainloop * (*SDL_NAME(pa_mainloop_new))(void); static pa_mainloop * (*SDL_NAME(pa_mainloop_new))(void);
pa_mainloop_api * (*SDL_NAME(pa_mainloop_get_api))(pa_mainloop *m); static pa_mainloop_api * (*SDL_NAME(pa_mainloop_get_api))(pa_mainloop *m);
int (*SDL_NAME(pa_mainloop_iterate))(pa_mainloop *m, int block, int *retval); static int (*SDL_NAME(pa_mainloop_iterate))(pa_mainloop *m, int block, int *retval);
void (*SDL_NAME(pa_mainloop_free))(pa_mainloop *m); static void (*SDL_NAME(pa_mainloop_free))(pa_mainloop *m);
pa_operation_state_t (*SDL_NAME(pa_operation_get_state))(pa_operation *o); static pa_operation_state_t (*SDL_NAME(pa_operation_get_state))(pa_operation *o);
void (*SDL_NAME(pa_operation_cancel))(pa_operation *o); static void (*SDL_NAME(pa_operation_cancel))(pa_operation *o);
void (*SDL_NAME(pa_operation_unref))(pa_operation *o); static void (*SDL_NAME(pa_operation_unref))(pa_operation *o);
pa_context * (*SDL_NAME(pa_context_new))( static pa_context * (*SDL_NAME(pa_context_new))(
pa_mainloop_api *m, const char *name); pa_mainloop_api *m, const char *name);
int (*SDL_NAME(pa_context_connect))( static int (*SDL_NAME(pa_context_connect))(
pa_context *c, const char *server, pa_context *c, const char *server,
pa_context_flags_t flags, const pa_spawn_api *api); pa_context_flags_t flags, const pa_spawn_api *api);
pa_context_state_t (*SDL_NAME(pa_context_get_state))(pa_context *c); static pa_context_state_t (*SDL_NAME(pa_context_get_state))(pa_context *c);
void (*SDL_NAME(pa_context_disconnect))(pa_context *c); static void (*SDL_NAME(pa_context_disconnect))(pa_context *c);
void (*SDL_NAME(pa_context_unref))(pa_context *c); static void (*SDL_NAME(pa_context_unref))(pa_context *c);
pa_stream * (*SDL_NAME(pa_stream_new))(pa_context *c, static pa_stream * (*SDL_NAME(pa_stream_new))(pa_context *c,
const char *name, const pa_sample_spec *ss, const pa_channel_map *map); const char *name, const pa_sample_spec *ss, const pa_channel_map *map);
int (*SDL_NAME(pa_stream_connect_playback))(pa_stream *s, const char *dev, static int (*SDL_NAME(pa_stream_connect_playback))(pa_stream *s, const char *dev,
const pa_buffer_attr *attr, pa_stream_flags_t flags, const pa_buffer_attr *attr, pa_stream_flags_t flags,
pa_cvolume *volume, pa_stream *sync_stream); pa_cvolume *volume, pa_stream *sync_stream);
pa_stream_state_t (*SDL_NAME(pa_stream_get_state))(pa_stream *s); static pa_stream_state_t (*SDL_NAME(pa_stream_get_state))(pa_stream *s);
size_t (*SDL_NAME(pa_stream_writable_size))(pa_stream *s); static size_t (*SDL_NAME(pa_stream_writable_size))(pa_stream *s);
int (*SDL_NAME(pa_stream_write))(pa_stream *s, const void *data, size_t nbytes, static int (*SDL_NAME(pa_stream_write))(pa_stream *s, const void *data, size_t nbytes,
pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek); pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek);
pa_operation * (*SDL_NAME(pa_stream_drain))(pa_stream *s, static pa_operation * (*SDL_NAME(pa_stream_drain))(pa_stream *s,
pa_stream_success_cb_t cb, void *userdata); pa_stream_success_cb_t cb, void *userdata);
int (*SDL_NAME(pa_stream_disconnect))(pa_stream *s); static int (*SDL_NAME(pa_stream_disconnect))(pa_stream *s);
void (*SDL_NAME(pa_stream_unref))(pa_stream *s); static void (*SDL_NAME(pa_stream_unref))(pa_stream *s);
static struct { static struct {
const char *name; const char *name;