a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Committed changed from amit

Browse Source
This commit is contained in:
pagefault
2001-08-10 00:31:35 +00:00
parent 29381fb234
commit 0a529dc502
4 changed files with 77 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
zsnes/src/configure vendored
View File

@@ -536,7 +536,7 @@ fi
echo -- Where is our compiler, and who are we compiling for? echo -- Where is our compiler, and who are we compiling for?
CFLAGS="-pipe -I." CFLAGS="-pipe -I. -Wall"
# Extract the first word of "gcc", so it can be a program name with args. # Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2 set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -980,7 +980,6 @@ case "$target" in
*-*-cygwin* | *-*-*ming*) *-*-cygwin* | *-*-*ming*)
CFLAGS="$CFLAGS -D__LINUX__" CFLAGS="$CFLAGS -D__LINUX__"
NFLAGS="$NFLAGS -D__LINUX__ -f win32" NFLAGS="$NFLAGS -D__LINUX__ -f win32"
ZSNESEXE=".exe"
;; ;;
*) *)
{ echo "configure: error: This Target is Not Supported" 1>&2; exit 1; } { echo "configure: error: This Target is Not Supported" 1>&2; exit 1; }
@@ -991,7 +990,7 @@ esac
echo -- Do we have X, and where is it? Needed for Mesa Checking echo -- Do we have X, and where is it? Needed for Mesa Checking
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
echo "configure:995: checking how to run the C preprocessor" >&5 echo "configure:994: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory. # On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then if test -n "$CPP" && test -d "$CPP"; then
CPP= CPP=
@@ -1006,13 +1005,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser, # On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. # not just through cpp.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1010 "configure" #line 1009 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <assert.h> #include <assert.h>
Syntax Error Syntax Error
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1016: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:1015: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
: :
@@ -1023,13 +1022,13 @@ else
rm -rf conftest* rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp" CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1027 "configure" #line 1026 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <assert.h> #include <assert.h>
Syntax Error Syntax Error
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:1032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
: :
@@ -1040,13 +1039,13 @@ else
rm -rf conftest* rm -rf conftest*
CPP="${CC-cc} -nologo -E" CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1044 "configure" #line 1043 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <assert.h> #include <assert.h>
Syntax Error Syntax Error
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:1049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
: :
@@ -1075,7 +1074,7 @@ echo "$ac_t""$CPP" 1>&6
# Uses ac_ vars as temps to allow command line to override cache and checks. # Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache. # --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6 echo $ac_n "checking for X""... $ac_c" 1>&6
echo "configure:1079: checking for X" >&5 echo "configure:1078: checking for X" >&5
# Check whether --with-x or --without-x was given. # Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then if test "${with_x+set}" = set; then
@@ -1137,12 +1136,12 @@ if test "$ac_x_includes" = NO; then
# First, try using that file with no special directory specified. # First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1141 "configure" #line 1140 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$x_direct_test_include> #include <$x_direct_test_include>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1146: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:1145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
@@ -1211,14 +1210,14 @@ if test "$ac_x_libraries" = NO; then
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS" LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1215 "configure" #line 1214 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
${x_direct_test_function}() ${x_direct_test_function}()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
# We can link X programs with no special library path. # We can link X programs with no special library path.
@@ -1351,7 +1350,7 @@ fi
# Extract the first word of "sdl-config", so it can be a program name with args. # Extract the first word of "sdl-config", so it can be a program name with args.
set dummy sdl-config; ac_word=$2 set dummy sdl-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1355: checking for $ac_word" >&5 echo "configure:1354: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@@ -1386,7 +1385,7 @@ fi
min_sdl_version=1.2.0 min_sdl_version=1.2.0
echo $ac_n "checking for SDL - version >= $min_sdl_version""... $ac_c" 1>&6 echo $ac_n "checking for SDL - version >= $min_sdl_version""... $ac_c" 1>&6
echo "configure:1390: checking for SDL - version >= $min_sdl_version" >&5 echo "configure:1389: checking for SDL - version >= $min_sdl_version" >&5
no_sdl="" no_sdl=""
if test "$SDL_CONFIG" = "no" ; then if test "$SDL_CONFIG" = "no" ; then
no_sdl=yes no_sdl=yes
@@ -1410,7 +1409,7 @@ echo "configure:1390: checking for SDL - version >= $min_sdl_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c" echo $ac_n "cross compiling; assumed OK... $ac_c"
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1414 "configure" #line 1413 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
@@ -1471,7 +1470,7 @@ int main (int argc, char *argv[])
EOF EOF
if { (eval echo configure:1475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:1474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
: :
else else
@@ -1505,7 +1504,7 @@ fi
CFLAGS="$CFLAGS $SDL_CFLAGS" CFLAGS="$CFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS" LIBS="$LIBS $SDL_LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1509 "configure" #line 1508 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
@@ -1520,7 +1519,7 @@ int main() {
return 0; return 0;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means" echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding SDL or finding the wrong" echo "*** that the run-time linker is not finding SDL or finding the wrong"
@@ -1557,10 +1556,10 @@ CFLAGS="$CFLAGS $SDL_CFLAGS"
LDFLAGS="$LDFLAGS $SDL_LIBS" LDFLAGS="$LDFLAGS $SDL_LIBS"
echo $ac_n "checking for zlib""... $ac_c" 1>&6 echo $ac_n "checking for zlib""... $ac_c" 1>&6
echo "configure:1561: checking for zlib" >&5 echo "configure:1560: checking for zlib" >&5
with_zlib=no with_zlib=no
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1564 "configure" #line 1563 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <zlib.h> #include <zlib.h>
@@ -1571,7 +1570,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1575: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:1574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
with_zlib=yes with_zlib=yes
@@ -1597,11 +1596,11 @@ if test "${with_opengl+set}" = set; then
fi fi
echo $ac_n "checking for OpenGL support""... $ac_c" 1>&6 echo $ac_n "checking for OpenGL support""... $ac_c" 1>&6
echo "configure:1601: checking for OpenGL support" >&5 echo "configure:1600: checking for OpenGL support" >&5
if test x$with_opengl != xno; then if test x$with_opengl != xno; then
with_opengl=no with_opengl=no
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1605 "configure" #line 1604 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <GL/gl.h> #include <GL/gl.h>
@@ -1612,7 +1611,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:1615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
with_opengl=yes with_opengl=yes
@@ -1640,11 +1639,11 @@ if test "${enable_png+set}" = set; then
fi fi
echo $ac_n "checking for libPNG support""... $ac_c" 1>&6 echo $ac_n "checking for libPNG support""... $ac_c" 1>&6
echo "configure:1644: checking for libPNG support" >&5 echo "configure:1643: checking for libPNG support" >&5
if test x$with_png != xno; then if test x$with_png != xno; then
with_png=no with_png=no
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1648 "configure" #line 1647 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <png.h> #include <png.h>
@@ -1655,7 +1654,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:1658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
with_png=yes with_png=yes
@@ -1681,24 +1680,24 @@ if test "${enable_debug+set}" = set; then
fi fi
echo $ac_n "checking if you want gdb friendly executable""... $ac_c" 1>&6 echo $ac_n "checking if you want gdb friendly executable""... $ac_c" 1>&6
echo "configure:1685: checking if you want gdb friendly executable" >&5 echo "configure:1684: checking if you want gdb friendly executable" >&5
if test x$debug = xyes; then if test x$debug = xyes; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
CFLAGS="$CFLAGS -Wall -O0 -fno-omit-frame-pointer -ggdb3" CFLAGS="$CFLAGS -DDEBUG -O0 -fno-omit-frame-pointer -ggdb3"
NFLAGS="$NFLAGS -g -s" NFLAGS="$NFLAGS -DDEBUG -g -s"
ZSNESEXE="zsnes-debug$ZSNESEXE" ZSNESEXE="zsnesd"
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
CFLAGS="$CFLAGS -Os -ffast-math -fomit-frame-pointer -fschedule-insns2 -s" CFLAGS="$CFLAGS -Os -ffast-math -fomit-frame-pointer -fschedule-insns2 -s"
ZSNESEXE="zsnes$ZSNESEXE" ZSNESEXE="zsnes"
fi fi
echo $ac_n "checking which processor class to optimize for""... $ac_c" 1>&6 echo $ac_n "checking which processor class to optimize for""... $ac_c" 1>&6
echo "configure:1702: checking which processor class to optimize for" >&5 echo "configure:1701: checking which processor class to optimize for" >&5
if test x$debug != xyes; then if test x$debug != xyes; then
case "$target" in case "$target" in
i486-*-*) i486-*-*)
@@ -1728,12 +1727,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
echo "configure:1732: checking for $ac_hdr that defines DIR" >&5 echo "configure:1731: checking for $ac_hdr that defines DIR" >&5
if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1737 "configure" #line 1736 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <$ac_hdr> #include <$ac_hdr>
@@ -1741,7 +1740,7 @@ int main() {
DIR *dirp = 0; DIR *dirp = 0;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:1744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes" eval "ac_cv_header_dirent_$ac_safe=yes"
else else
@@ -1766,7 +1765,7 @@ done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
echo "configure:1770: checking for opendir in -ldir" >&5 echo "configure:1769: checking for opendir in -ldir" >&5
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@@ -1774,7 +1773,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS" LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1778 "configure" #line 1777 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@@ -1785,7 +1784,7 @@ int main() {
opendir() opendir()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@@ -1807,7 +1806,7 @@ fi
else else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
echo "configure:1811: checking for opendir in -lx" >&5 echo "configure:1810: checking for opendir in -lx" >&5
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@@ -1815,7 +1814,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS" LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1819 "configure" #line 1818 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@@ -1826,7 +1825,7 @@ int main() {
opendir() opendir()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@@ -1849,12 +1848,12 @@ fi
fi fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
echo "configure:1853: checking for ANSI C header files" >&5 echo "configure:1852: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1858 "configure" #line 1857 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
@@ -1862,7 +1861,7 @@ else
#include <float.h> #include <float.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:1865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
@@ -1879,7 +1878,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI. # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1883 "configure" #line 1882 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <string.h> #include <string.h>
EOF EOF
@@ -1897,7 +1896,7 @@ fi
if test $ac_cv_header_stdc = yes; then if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1901 "configure" #line 1900 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
EOF EOF
@@ -1918,7 +1917,7 @@ if test "$cross_compiling" = yes; then
: :
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1922 "configure" #line 1921 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1929,7 +1928,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); } exit (0); }
EOF EOF
if { (eval echo configure:1933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:1932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
: :
else else
@@ -1956,17 +1955,17 @@ for ac_hdr in fcntl.h limits.h malloc.h sys/ioctl.h unistd.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1960: checking for $ac_hdr" >&5 echo "configure:1959: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1965 "configure" #line 1964 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:1969: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
@@ -1994,12 +1993,12 @@ done
echo $ac_n "checking for working const""... $ac_c" 1>&6 echo $ac_n "checking for working const""... $ac_c" 1>&6
echo "configure:1998: checking for working const" >&5 echo "configure:1997: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2003 "configure" #line 2002 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
@@ -2048,7 +2047,7 @@ ccp = (char const *const *) p;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_cv_c_const=yes ac_cv_c_const=yes
else else
@@ -2069,12 +2068,12 @@ EOF
fi fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6 echo $ac_n "checking for size_t""... $ac_c" 1>&6
echo "configure:2073: checking for size_t" >&5 echo "configure:2072: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2078 "configure" #line 2077 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#if STDC_HEADERS #if STDC_HEADERS
@@ -2102,12 +2101,12 @@ EOF
fi fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
echo "configure:2106: checking whether time.h and sys/time.h may both be included" >&5 echo "configure:2105: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2111 "configure" #line 2110 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h> #include <sys/time.h>
@@ -2116,7 +2115,7 @@ int main() {
struct tm *tp; struct tm *tp;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_cv_header_time=yes ac_cv_header_time=yes
else else
@@ -2140,17 +2139,17 @@ for ac_hdr in sys/time.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2144: checking for $ac_hdr" >&5 echo "configure:2143: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2149 "configure" #line 2148 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2154: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
@@ -2465,7 +2464,6 @@ rm -fr confdefs* $ac_clean_files
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
echo echo
echo You may now type gmake to compile $ZSNESEXE echo You may now run make to compile $ZSNESEXE
echo Please make sure you use gmake, as other makes tend not to function echo Make sure you use GNU make when compiling.
echo correctly with zsnes\'s makefiles.

16
zsnes/src/configure.in
View File

@@ -15,7 +15,7 @@ dnl See also: remarks supplied in the debug checking area below
AC_INIT(init.asm) AC_INIT(init.asm)
echo -- Where is our compiler, and who are we compiling for? echo -- Where is our compiler, and who are we compiling for?
CFLAGS="-pipe -I." CFLAGS="-pipe -I. -Wall"
AC_PROG_CC AC_PROG_CC
AC_PATH_PROG(NASMPATH,nasm,[AC_MSG_ERROR(nasm 0.98 is required)]) AC_PATH_PROG(NASMPATH,nasm,[AC_MSG_ERROR(nasm 0.98 is required)])
NFLAGS="$NFLAGS -w-orphan-labels" NFLAGS="$NFLAGS -w-orphan-labels"
@@ -33,7 +33,6 @@ case "$target" in
*-*-cygwin* | *-*-*ming*) *-*-cygwin* | *-*-*ming*)
CFLAGS="$CFLAGS -D__LINUX__" CFLAGS="$CFLAGS -D__LINUX__"
NFLAGS="$NFLAGS -D__LINUX__ -f win32" NFLAGS="$NFLAGS -D__LINUX__ -f win32"
ZSNESEXE=".exe"
;; ;;
*) *)
AC_MSG_ERROR(This Target is Not Supported) AC_MSG_ERROR(This Target is Not Supported)
@@ -124,9 +123,9 @@ if test x$debug = xyes; then
dnl It is actually easier to debug zsnes with no optimization dnl It is actually easier to debug zsnes with no optimization
dnl enabled. dnl enabled.
CFLAGS="$CFLAGS -Wall -O0 -fno-omit-frame-pointer -ggdb3" CFLAGS="$CFLAGS -DDEBUG -O0 -fno-omit-frame-pointer -ggdb3"
NFLAGS="$NFLAGS -g -s" NFLAGS="$NFLAGS -DDEBUG -g -s"
ZSNESEXE="zsnes-debug$ZSNESEXE" ZSNESEXE="zsnesd"
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
@@ -136,7 +135,7 @@ else
dnl effectivly use branch prediction. dnl effectivly use branch prediction.
CFLAGS="$CFLAGS -Os -ffast-math -fomit-frame-pointer -fschedule-insns2 -s" CFLAGS="$CFLAGS -Os -ffast-math -fomit-frame-pointer -fschedule-insns2 -s"
ZSNESEXE="zsnes$ZSNESEXE" ZSNESEXE="zsnes"
fi fi
AC_MSG_CHECKING(which processor class to optimize for) AC_MSG_CHECKING(which processor class to optimize for)
@@ -181,7 +180,6 @@ AC_SUBST(GL_DRAW)
AC_SUBST(NFLAGS) AC_SUBST(NFLAGS)
AC_OUTPUT(Makefile) AC_OUTPUT(Makefile)
echo echo
echo You may now type gmake to compile $ZSNESEXE echo You may now run make to compile $ZSNESEXE
echo Please make sure you use gmake, as other makes tend not to function echo Make sure you use GNU make when compiling.
echo correctly with zsnes\'s makefiles.

13
zsnes/src/gblhdr.h
View File

@@ -59,26 +59,19 @@
// General stdc header stuff, including memory.h stuff, like the fact that // General stdc header stuff, including memory.h stuff, like the fact that
// memcpy, and memmove are easily definable... // memcpy, and memmove are easily definable...
#ifdef ZDOS
#define STDC_HEADERS
#endif
#ifdef _MSC_VER
#define STDC_HEADERS
#endif
#ifdef STDC_HEADERS
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#else
# ifndef HAVE_MEMCPY # ifndef HAVE_MEMCPY
#define memcpy(d, s, n) bcopy ((s), (d), (n)) #define memcpy(d, s, n) bcopy ((s), (d), (n))
#define memmove(d, s, n) bcopy ((s), (d), (n)) #define memmove(d, s, n) bcopy ((s), (d), (n))
# endif # endif
#endif
// unistd.h stuff // unistd.h stuff
#if HAVE_UNISTD_H //#if HAVE_UNISTD_H
//Small hack for now
#if unix
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#endif #endif

2
zsnes/src/linux/gl_draw.c
View File

@@ -69,7 +69,7 @@ int gl_start(int width, int height, int req_depth, int FullScreen)
return FALSE; return FALSE;
} }
glvidbuffer = malloc(512 * 512 * 2); glvidbuffer = (unsigned short *) malloc(512 * 512 * sizeof(short));
gl_clearwin(); gl_clearwin();
SDL_WarpMouse(SurfaceX / 4, SurfaceY / 4); SDL_WarpMouse(SurfaceX / 4, SurfaceY / 4);