Major update to the autoconf script: cleanup and a nifty cpu detection code by Nach to optimize architecture properly with most cpus. OpenBSD guys, test this - I changed the frame pointer params along the way.
This commit is contained in:
grinvader
@@ -4,14 +4,14 @@ AC_INIT(init.asm)
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
ISODATE=`date +%Y-%m-%d`
|
||||
AC_SUBST(ISODATE)
|
||||
VERSION=1.42
|
||||
VERSION=pre1.43
|
||||
AC_SUBST(VERSION)
|
||||
X8664="false"
|
||||
AC_SUBST(X8664)
|
||||
AC_ARG_WITH(nasm-prefix,[ --with-nasm-prefix=PFX Prefix where nasm is installed (optional)], nasm_prefix="$withval", nasm_prefix="")
|
||||
|
||||
dnl -- Where is our compiler, and who are we compiling for?
|
||||
CFLAGS="$CFLAGS -pipe -I. -Wall -I/usr/local/include -I/usr/include"
|
||||
CFLAGS="$CFLAGS -pipe -I. -I/usr/local/include -I/usr/include"
|
||||
|
||||
dnl -- You might wanna change -I/usr/include if you're trying to do this with
|
||||
dnl Mingw, because it doesnt have a standard file tree. Maybe if ming do this
|
||||
@@ -26,38 +26,33 @@ AC_PROG_CC
|
||||
AC_PROG_CXX
|
||||
AC_CHECK_TOOL(NASMPATH,nasm,"no",$nasm_prefix:$PATH)
|
||||
if test x$NASMPATH = xno; then
|
||||
AC_MSG_ERROR(You need NASM installed to compile ZSNES)
|
||||
AC_MSG_ERROR(You need NASM installed to compile ZSNES)
|
||||
fi
|
||||
NFLAGS="$NFLAGS -w-orphan-labels"
|
||||
AC_PROG_INSTALL
|
||||
case "$target" in
|
||||
*-*-linux*)
|
||||
CFLAGS="$CFLAGS -D__UNIXSDL__"
|
||||
NFLAGS="$NFLAGS -D__UNIXSDL__ -f elf -DELF"
|
||||
;;
|
||||
*-*-beos*)
|
||||
CFLAGS="$CFLAGS -D__UNIXSDL__ -D__BEOS__"
|
||||
NFLAGS="$NFLAGS -D__UNIXSDL__ -D__BEOS__ -f elf -DELF"
|
||||
;;
|
||||
*-*-*openbsd*)
|
||||
CFLAGS="$CFLAGS -D__UNIXSDL__ -D__BSDSDL__"
|
||||
NFLAGS="$NFLAGS -D__UNIXSDL__ -D__BSDSDL__ -DELF -f elf"
|
||||
;;
|
||||
*-*-*bsd*)
|
||||
CFLAGS="$CFLAGS -D__UNIXSDL__ -D__BSDSDL__"
|
||||
NFLAGS="$NFLAGS -D__UNIXSDL__ -D__BSDSDL__ -DELF -f elf"
|
||||
;;
|
||||
*-*-cygwin* | *-*-*ming*)
|
||||
CFLAGS="$CFLAGS -D__UNIXSDL__"
|
||||
NFLAGS="$NFLAGS -D__UNIXSDL__ -f win32"
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR(This Target is Not Supported)
|
||||
;;
|
||||
*-*-linux*)
|
||||
CFLAGS="$CFLAGS -D__UNIXSDL__"
|
||||
NFLAGS="$NFLAGS -D__UNIXSDL__ -f elf -DELF"
|
||||
;;
|
||||
*-*-beos*)
|
||||
CFLAGS="$CFLAGS -D__UNIXSDL__ -D__BEOS__"
|
||||
NFLAGS="$NFLAGS -D__UNIXSDL__ -D__BEOS__ -f elf -DELF"
|
||||
;;
|
||||
*-*-*bsd*)
|
||||
CFLAGS="$CFLAGS -D__UNIXSDL__ -D__BSDSDL__"
|
||||
NFLAGS="$NFLAGS -D__UNIXSDL__ -D__BSDSDL__ -DELF -f elf"
|
||||
;;
|
||||
*-*-cygwin* | *-*-*ming*)
|
||||
CFLAGS="$CFLAGS -D__UNIXSDL__"
|
||||
NFLAGS="$NFLAGS -D__UNIXSDL__ -f win32"
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR(This target is not supported)
|
||||
;;
|
||||
esac
|
||||
|
||||
dnl Checks for libraries.
|
||||
|
||||
dnl -- Where is libSDL and zlib, and do we want/have libPNG and OpenGL support?
|
||||
|
||||
AM_PATH_SDL(1.2.0,,[AC_MSG_ERROR(SDL >= 1.2.0 is required)])
|
||||
@@ -69,92 +64,106 @@ CFLAGS="$CFLAGS $SDL_CFLAGS"
|
||||
LDFLAGS="$LDFLAGS $SDL_LIBS"
|
||||
|
||||
if test x$with_libpng != xyes; then
|
||||
CFLAGS="$CFLAGS -DNO_PNG"
|
||||
NFLAGS="$NFLAGS -DNO_PNG"
|
||||
CFLAGS="$CFLAGS -DNO_PNG"
|
||||
NFLAGS="$NFLAGS -DNO_PNG"
|
||||
else
|
||||
CFLAGS="$CFLAGS $LIBPNG_CFLAGS"
|
||||
LDFLAGS="$LDFLAGS $LIBPNG_LIBS"
|
||||
CFLAGS="$CFLAGS $LIBPNG_CFLAGS"
|
||||
LDFLAGS="$LDFLAGS $LIBPNG_LIBS"
|
||||
fi
|
||||
|
||||
dnl -- opengl stuff
|
||||
|
||||
AC_ARG_ENABLE(opengl,[ --disable-opengl Build without opengl support],,enable_opengl=yes)
|
||||
AC_ARG_WITH(opengl-prefix,[ --with-opengl-prefix=PFX Prefix where opengl is installed (optional)], opengl_prefix="$withval", opengl_prefix="")
|
||||
|
||||
if test x$enable_opengl != xno; then
|
||||
AC_PATH_X
|
||||
if test x$opengl_prefix != x; then
|
||||
CFLAGS="$CFLAGS -I$opengl_prefix/include"
|
||||
LDFLAGS-"$LDFLAGS -L$opengl_prefix/lib"
|
||||
AC_PATH_X
|
||||
if test x$opengl_prefix != x; then
|
||||
CFLAGS="$CFLAGS -I$opengl_prefix/include"
|
||||
LDFLAGS-"$LDFLAGS -L$opengl_prefix/lib"
|
||||
fi
|
||||
if test x$x_libraries != x; then
|
||||
LDFLAGS="$LDFLAGS -L$x_libraries"
|
||||
fi
|
||||
AC_CHECK_LIB(GL, glGetError,found_opengl="yes",,)
|
||||
fi
|
||||
if test x$x_libraries != x; then
|
||||
LDFLAGS="$LDFLAGS -L$x_libraries"
|
||||
fi
|
||||
AC_CHECK_LIB(GL, glGetError,found_opengl="yes",,)
|
||||
if test x$found_opengl = xyes; then
|
||||
echo checking for OpenGL... yes
|
||||
LDFLAGS="$LDFLAGS -lGL"
|
||||
CFLAGS="$CFLAGS -D__OPENGL__"
|
||||
NFLAGS="$NFLAGS -D__OPENGL__"
|
||||
GL_DRAW="\${WINDIR}/gl_draw.o"
|
||||
AC_MSG_CHECKING(for OpenGL)
|
||||
if test x$enable_opengl != xno; then
|
||||
if test x$found_opengl = xyes; then
|
||||
AC_MSG_RESULT(yes)
|
||||
LDFLAGS="$LDFLAGS -lGL"
|
||||
CFLAGS="$CFLAGS -D__OPENGL__"
|
||||
NFLAGS="$NFLAGS -D__OPENGL__"
|
||||
GL_DRAW="\${WINDIR}/gl_draw.o"
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
else
|
||||
echo checking for OpenGL... no
|
||||
fi
|
||||
else
|
||||
echo checking for OpenGL... disabled by user
|
||||
AC_MSG_RESULT(disabled by user)
|
||||
fi
|
||||
dnl --
|
||||
|
||||
|
||||
|
||||
dnl -- Various debug and optimization option checks
|
||||
|
||||
AC_ARG_ENABLE(debug, [ --enable-debug Build GDB Friendly binary (zsnesd) ],debug=yes)
|
||||
AC_ARG_ENABLE(debug, [ --enable-debug Build GDB friendly binary (zsnesd) ],debug=$enableval)
|
||||
AC_MSG_CHECKING(if you want gdb friendly executable)
|
||||
|
||||
if test x$debug = xyes; then
|
||||
AC_MSG_RESULT(yes)
|
||||
|
||||
dnl It is actually easier to debug zsnes with no optimization
|
||||
dnl enabled.
|
||||
AC_MSG_RESULT(yes)
|
||||
|
||||
CFLAGS="$CFLAGS -DDEBUG -O0 -fomit-frame-pointer -ggdb3"
|
||||
NFLAGS="$NFLAGS -DDEBUG -s -O0" dnl it works now
|
||||
ZSNESEXE="zsnesd"
|
||||
dnl It is easier to debug zsnes with no optimization enabled.
|
||||
CFLAGS="$CFLAGS -Wall -W -DDEBUG -O0 -fno-omit-frame-pointer -gstabs3"
|
||||
NFLAGS="$NFLAGS -DDEBUG -g -F stabs -s -O0"
|
||||
ZSNESEXE="zsnesd"
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
|
||||
CFLAGS="$CFLAGS -O3 -ffast-math -fomit-frame-pointer -fexpensive-optimizations -s"
|
||||
NFLAGS="$NFLAGS -O1"
|
||||
ZSNESEXE="zsnes"
|
||||
fi
|
||||
AC_MSG_RESULT(no)
|
||||
ZSNESEXE="zsnes"
|
||||
|
||||
AC_MSG_CHECKING(which processor class to optimize for)
|
||||
if test x$debug != xyes; then
|
||||
case "$target" in
|
||||
i486-*-*)
|
||||
CFLAGS="$CFLAGS -march=i486"
|
||||
AC_MSG_RESULT(486)
|
||||
;;
|
||||
i586-*-*)
|
||||
CFLAGS="$CFLAGS -march=pentium"
|
||||
AC_MSG_RESULT(586)
|
||||
;;
|
||||
i686-*-*)
|
||||
CFLAGS="$CFLAGS -march=pentiumpro"
|
||||
dnl CFLAGS="$CFLAGS -march=pentium3 -mmmx -msse -mfpmath=sse,387"
|
||||
AC_MSG_RESULT(686)
|
||||
;;
|
||||
x86_64-*-* | x86_64-*-*-*)
|
||||
CFLAGS="$CFLAGS -march=k8"
|
||||
X8664="true"
|
||||
AC_MSG_RESULT(x86-64)
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(386)
|
||||
AC_MSG_WARN(*** This is probably not what you want use --target)
|
||||
;;
|
||||
esac
|
||||
else
|
||||
AC_MSG_RESULT(no optimization because debug enabled)
|
||||
AC_ARG_ENABLE(release, [ --enable-release Build ultra-optimized binary (zsnes) ],release=$enableval)
|
||||
AC_MSG_CHECKING(if you want crazy optimizations)
|
||||
|
||||
if test x$release = xyes; then
|
||||
AC_MSG_RESULT(yes)
|
||||
CFLAGS="$CFLAGS -O3 -pipe -fomit-frame-pointer -ffast-math -fno-exceptions -fprefetch-loop-arrays -fno-rtti -frename-registers -fforce-addr -s"
|
||||
NFLAGS="$NFLAGS -O99999999"
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
CFLAGS="$CFLAGS -O2 -fomit-frame-pointer -s"
|
||||
NFLAGS="$NFLAGS -O1"
|
||||
fi
|
||||
|
||||
AM_CPU_DETECT()
|
||||
|
||||
AC_MSG_CHECKING(which processor arch to optimize for)
|
||||
if test x$CPU_INFO = x ; then
|
||||
case "$target" in
|
||||
x86_64-*-* | x86_64-*-*-*)
|
||||
AC_MSG_RESULT(guessing x86-64)
|
||||
CFLAGS="$CFLAGS -march=x86-64"
|
||||
X8664="true"
|
||||
;;
|
||||
i686-*-*)
|
||||
AC_MSG_RESULT(guessing i686)
|
||||
CFLAGS="$CFLAGS -march=i686"
|
||||
;;
|
||||
i586-*-*)
|
||||
AC_MSG_RESULT(guessing i586)
|
||||
CFLAGS="$CFLAGS -march=i586"
|
||||
;;
|
||||
i486-*-*)
|
||||
AC_MSG_RESULT(guessing i486)
|
||||
CFLAGS="$CFLAGS -march=i486"
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(guessing i386)
|
||||
CFLAGS="$CFLAGS -march=i386"
|
||||
AC_MSG_WARN(*** This is probably not what you want *** use --target)
|
||||
;;
|
||||
esac
|
||||
else
|
||||
AC_MSG_RESULT($CPU_INFO)
|
||||
CFLAGS="$CFLAGS -march=$CPU_INFO"
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl Checks for header files.
|
||||
@@ -171,22 +180,22 @@ echo
|
||||
echo
|
||||
echo ZSNES v$VERSION
|
||||
echo
|
||||
echo "SDL support Version `$SDL_CONFIG --version`"
|
||||
echo "NASM support `nasm -r`"
|
||||
echo "ZLib support Version $ZLIB_VERSION"
|
||||
echo "SDL support Version `$SDL_CONFIG --version`"
|
||||
echo "NASM support `nasm -v`"
|
||||
echo "ZLib support Version $ZLIB_VERSION"
|
||||
if test "$with_libpng" = "yes"; then
|
||||
echo "PNG support (png screenshots) Yes, version $LIBPNG_VERSION"
|
||||
echo "PNG support Yes, version $LIBPNG_VERSION"
|
||||
elif test "$enable_libpng" = "no"; then
|
||||
echo "PNG support Disabled by user"
|
||||
echo "PNG support Disabled by user"
|
||||
else
|
||||
echo "PNG support Disabled, library not found"
|
||||
echo "PNG support Disabled, library not found"
|
||||
fi
|
||||
if test "$found_opengl" = "yes"; then
|
||||
echo "OpenGL support Yes"
|
||||
echo "OpenGL support Yes"
|
||||
elif test "$enable_opengl" = "no"; then
|
||||
echo "OpenGL support Disabled by user"
|
||||
echo "OpenGL support Disabled by user"
|
||||
else
|
||||
echo "OpenGL support Disabled, library not found"
|
||||
echo "OpenGL support Disabled, library not found"
|
||||
fi
|
||||
echo
|
||||
echo The binary will be installed in $prefix/bin
|
||||
|
||||
Reference in New Issue
Block a user