From 5e29ea77d71d242546e86111eee42885dd9925ce Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 26 Jun 2006 05:27:34 +0000 Subject: [PATCH] Almost added Mac OS X nasm support --- build-scripts/strip_fPIC.sh | 3 +++ configure.in | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/build-scripts/strip_fPIC.sh b/build-scripts/strip_fPIC.sh index 007c94fb0..8719b896e 100755 --- a/build-scripts/strip_fPIC.sh +++ b/build-scripts/strip_fPIC.sh @@ -8,6 +8,9 @@ while [ $# -gt 0 ]; do -?PIC) # Ignore -fPIC and -DPIC options ;; + -fno-common) + # Ignore -fPIC and -DPIC options + ;; *) command="$command $1" ;; diff --git a/configure.in b/configure.in index 49321014d..a96c1d2a2 100644 --- a/configure.in +++ b/configure.in @@ -611,6 +611,9 @@ AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [[default=yes openbsd) NASMFLAGS="-f aoutb" ;; + macosx) + NASMFLAGS="-f macho" + ;; *) NASMFLAGS="-f elf" ;; @@ -620,7 +623,7 @@ AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [[default=yes dnl See if hidden visibility is supported echo 'GLOBAL _bar:function hidden' > nasm_vis.asm - if $NASM $NASMFLAGS nasm_vis.asm -o nasm_vis.o >&AS_MESSAGE_LOG_FD ; then + if $NASM $NASMFLAGS nasm_vis.asm -o nasm_vis.o >&AS_MESSAGE_LOG_FD 2>&1; then NASMFLAGS="$NASMFLAGS -DHIDDEN_VISIBILITY" fi rm -f nasm_vis.asm nasm_vis.o @@ -2436,6 +2439,10 @@ case "$host" in CheckDummyAudio CheckDLOPEN + # Temporarily disabled: + # ld: mmxp2_32.o has external relocation entries in non-writable section (__TEXT,__text) for symbols: _mmxreturn + #CheckNASM + # Set up files for the shared object loading library # (this needs to be done before the dynamic X11 check) if test x$enable_loadso = xyes -a x$have_dlopen != xyes; then