Commit cb4f15a0 authored by Sam Lantinga's avatar Sam Lantinga

Almost added Mac OS X nasm support

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401905
parent 554dd3b6
...@@ -8,6 +8,9 @@ while [ $# -gt 0 ]; do ...@@ -8,6 +8,9 @@ while [ $# -gt 0 ]; do
-?PIC) -?PIC)
# Ignore -fPIC and -DPIC options # Ignore -fPIC and -DPIC options
;; ;;
-fno-common)
# Ignore -fPIC and -DPIC options
;;
*) *)
command="$command $1" command="$command $1"
;; ;;
......
...@@ -611,6 +611,9 @@ AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [[default=yes ...@@ -611,6 +611,9 @@ AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [[default=yes
openbsd) openbsd)
NASMFLAGS="-f aoutb" NASMFLAGS="-f aoutb"
;; ;;
macosx)
NASMFLAGS="-f macho"
;;
*) *)
NASMFLAGS="-f elf" NASMFLAGS="-f elf"
;; ;;
...@@ -620,7 +623,7 @@ AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [[default=yes ...@@ -620,7 +623,7 @@ AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [[default=yes
dnl See if hidden visibility is supported dnl See if hidden visibility is supported
echo 'GLOBAL _bar:function hidden' > nasm_vis.asm 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" NASMFLAGS="$NASMFLAGS -DHIDDEN_VISIBILITY"
fi fi
rm -f nasm_vis.asm nasm_vis.o rm -f nasm_vis.asm nasm_vis.o
...@@ -2413,6 +2416,10 @@ case "$host" in ...@@ -2413,6 +2416,10 @@ case "$host" in
CheckDummyAudio CheckDummyAudio
CheckDLOPEN 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 # Set up files for the shared object loading library
# (this needs to be done before the dynamic X11 check) # (this needs to be done before the dynamic X11 check)
if test x$enable_loadso = xyes -a x$have_dlopen != xyes; then if test x$enable_loadso = xyes -a x$have_dlopen != xyes; then
......
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