Search
lxdream.org :: lxdream :: r521:33d2d92784c7
lxdream 0.9.1
released Jun 29
Download Now
changeset521:33d2d92784c7
parent520:7d6f8584897f
child522:791d2f0fb7e7
authornkeynes
dateSat Nov 17 01:13:41 2007 +0000 (16 years ago)
Detect presence of SH4 + ARM cross-compilers, and disable the system tests if
we don't find the sh-elf environment.
Detect build host to see if we can make a working translator
Makefile.am
Makefile.in
configure
configure.in
test/Makefile
test/Makefile.in
1.1 --- a/Makefile.am Fri Nov 16 23:51:23 2007 +0000
1.2 +++ b/Makefile.am Sat Nov 17 01:13:41 2007 +0000
1.3 @@ -1,6 +1,9 @@
1.4 ## Process this file with automake to produce Makefile.in
1.5
1.6 -SUBDIRS = src po test
1.7 +if BUILD_SYSTEST
1.8 + TEST_SUBDIR = test
1.9 +endif
1.10 +SUBDIRS = src po $(TEST_SUBDIR)
1.11
1.12 EXTRA_DIST = autogen.sh
1.13
2.1 --- a/Makefile.in Fri Nov 16 23:51:23 2007 +0000
2.2 +++ b/Makefile.in Sat Nov 17 01:13:41 2007 +0000
2.3 @@ -39,10 +39,19 @@
2.4 AMDEP_FALSE = @AMDEP_FALSE@
2.5 AMDEP_TRUE = @AMDEP_TRUE@
2.6 AMTAR = @AMTAR@
2.7 +ARMCC = @ARMCC@
2.8 +ARMLD = @ARMLD@
2.9 +ARMOBJCOPY = @ARMOBJCOPY@
2.10 AUTOCONF = @AUTOCONF@
2.11 AUTOHEADER = @AUTOHEADER@
2.12 AUTOMAKE = @AUTOMAKE@
2.13 AWK = @AWK@
2.14 +BUILD_ARMTEST_FALSE = @BUILD_ARMTEST_FALSE@
2.15 +BUILD_ARMTEST_TRUE = @BUILD_ARMTEST_TRUE@
2.16 +BUILD_SH4X86_FALSE = @BUILD_SH4X86_FALSE@
2.17 +BUILD_SH4X86_TRUE = @BUILD_SH4X86_TRUE@
2.18 +BUILD_SYSTEST_FALSE = @BUILD_SYSTEST_FALSE@
2.19 +BUILD_SYSTEST_TRUE = @BUILD_SYSTEST_TRUE@
2.20 CATALOGS = @CATALOGS@
2.21 CATOBJEXT = @CATOBJEXT@
2.22 CC = @CC@
2.23 @@ -97,7 +106,10 @@
2.24 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
2.25 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
2.26 SET_MAKE = @SET_MAKE@
2.27 +SHCC = @SHCC@
2.28 SHELL = @SHELL@
2.29 +SHLD = @SHLD@
2.30 +SHOBJCOPY = @SHOBJCOPY@
2.31 STRIP = @STRIP@
2.32 USE_NLS = @USE_NLS@
2.33 VERSION = @VERSION@
2.34 @@ -109,7 +121,11 @@
2.35 am__leading_dot = @am__leading_dot@
2.36 am__quote = @am__quote@
2.37 bindir = @bindir@
2.38 +build = @build@
2.39 build_alias = @build_alias@
2.40 +build_cpu = @build_cpu@
2.41 +build_os = @build_os@
2.42 +build_vendor = @build_vendor@
2.43 datadir = @datadir@
2.44 datarootdir = @datarootdir@
2.45 docdir = @docdir@
2.46 @@ -135,14 +151,15 @@
2.47 sysconfdir = @sysconfdir@
2.48 target_alias = @target_alias@
2.49
2.50 -SUBDIRS = src po test
2.51 +@BUILD_SYSTEST_TRUE@TEST_SUBDIR = test
2.52 +SUBDIRS = src po $(TEST_SUBDIR)
2.53
2.54 EXTRA_DIST = autogen.sh
2.55 subdir = .
2.56 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
2.57 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
2.58 CONFIG_HEADER = config.h
2.59 -CONFIG_CLEAN_FILES =
2.60 +CONFIG_CLEAN_FILES = test/Makefile
2.61 DIST_SOURCES =
2.62
2.63 RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
2.64 @@ -154,7 +171,7 @@
2.65 COPYING ChangeLog INSTALL Makefile.am NEWS acconfig.h \
2.66 aclocal.m4 config.guess config.h.in config.sub configure \
2.67 configure.in depcomp install-sh missing mkinstalldirs
2.68 -DIST_SUBDIRS = $(SUBDIRS)
2.69 +DIST_SUBDIRS = src po test
2.70 all: config.h
2.71 $(MAKE) $(AM_MAKEFLAGS) all-recursive
2.72
2.73 @@ -192,6 +209,8 @@
2.74
2.75 distclean-hdr:
2.76 -rm -f config.h stamp-h1
2.77 +test/Makefile: $(top_builddir)/config.status $(top_srcdir)/test/Makefile.in
2.78 + cd $(top_builddir) && $(SHELL) ./config.status $@
2.79 uninstall-info-am:
2.80
2.81 # This directory's subdirectories are mostly independent; you can cd
2.82 @@ -334,7 +353,7 @@
2.83 distdir: $(DISTFILES)
2.84 $(am__remove_distdir)
2.85 mkdir $(distdir)
2.86 - $(mkinstalldirs) $(distdir)/po
2.87 + $(mkinstalldirs) $(distdir)/po $(distdir)/test
2.88 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
2.89 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
2.90 list='$(DISTFILES)'; for file in $$list; do \
2.91 @@ -361,7 +380,7 @@
2.92 || exit 1; \
2.93 fi; \
2.94 done
2.95 - list='$(SUBDIRS)'; for subdir in $$list; do \
2.96 + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
2.97 if test "$$subdir" = .; then :; else \
2.98 test -d $(distdir)/$$subdir \
2.99 || mkdir $(distdir)/$$subdir \
3.1 --- a/configure Fri Nov 16 23:51:23 2007 +0000
3.2 +++ b/configure Sat Nov 17 01:13:41 2007 +0000
3.3 @@ -690,11 +690,31 @@
3.4 CPP
3.5 GREP
3.6 EGREP
3.7 +build
3.8 +build_cpu
3.9 +build_vendor
3.10 +build_os
3.11 +host
3.12 +host_cpu
3.13 +host_vendor
3.14 +host_os
3.15 PKG_CONFIG
3.16 PACKAGE_CFLAGS
3.17 PACKAGE_LIBS
3.18 +BUILD_SH4X86_TRUE
3.19 +BUILD_SH4X86_FALSE
3.20 CDROM_LINUX_TRUE
3.21 CDROM_LINUX_FALSE
3.22 +SHCC
3.23 +SHLD
3.24 +SHOBJCOPY
3.25 +ARMCC
3.26 +ARMLD
3.27 +ARMOBJCOPY
3.28 +BUILD_SYSTEST_TRUE
3.29 +BUILD_SYSTEST_FALSE
3.30 +BUILD_ARMTEST_TRUE
3.31 +BUILD_ARMTEST_FALSE
3.32 GETTEXT_PACKAGE
3.33 USE_NLS
3.34 MSGFMT
3.35 @@ -1289,6 +1309,10 @@
3.36 --program-prefix=PREFIX prepend PREFIX to installed program names
3.37 --program-suffix=SUFFIX append SUFFIX to installed program names
3.38 --program-transform-name=PROGRAM run sed PROGRAM on installed program names
3.39 +
3.40 +System types:
3.41 + --build=BUILD configure for building on BUILD [guessed]
3.42 + --host=HOST cross-compile to build programs to run on HOST [BUILD]
3.43 _ACEOF
3.44 fi
3.45
3.46 @@ -4818,6 +4842,89 @@
3.47
3.48 fi
3.49
3.50 +# Make sure we can run config.sub.
3.51 +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
3.52 + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
3.53 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
3.54 + { (exit 1); exit 1; }; }
3.55 +
3.56 +{ echo "$as_me:$LINENO: checking build system type" >&5
3.57 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
3.58 +if test "${ac_cv_build+set}" = set; then
3.59 + echo $ECHO_N "(cached) $ECHO_C" >&6
3.60 +else
3.61 + ac_build_alias=$build_alias
3.62 +test "x$ac_build_alias" = x &&
3.63 + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
3.64 +test "x$ac_build_alias" = x &&
3.65 + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
3.66 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
3.67 + { (exit 1); exit 1; }; }
3.68 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
3.69 + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
3.70 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
3.71 + { (exit 1); exit 1; }; }
3.72 +
3.73 +fi
3.74 +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
3.75 +echo "${ECHO_T}$ac_cv_build" >&6; }
3.76 +case $ac_cv_build in
3.77 +*-*-*) ;;
3.78 +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
3.79 +echo "$as_me: error: invalid value of canonical build" >&2;}
3.80 + { (exit 1); exit 1; }; };;
3.81 +esac
3.82 +build=$ac_cv_build
3.83 +ac_save_IFS=$IFS; IFS='-'
3.84 +set x $ac_cv_build
3.85 +shift
3.86 +build_cpu=$1
3.87 +build_vendor=$2
3.88 +shift; shift
3.89 +# Remember, the first character of IFS is used to create $*,
3.90 +# except with old shells:
3.91 +build_os=$*
3.92 +IFS=$ac_save_IFS
3.93 +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
3.94 +
3.95 +
3.96 +{ echo "$as_me:$LINENO: checking host system type" >&5
3.97 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
3.98 +if test "${ac_cv_host+set}" = set; then
3.99 + echo $ECHO_N "(cached) $ECHO_C" >&6
3.100 +else
3.101 + if test "x$host_alias" = x; then
3.102 + ac_cv_host=$ac_cv_build
3.103 +else
3.104 + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
3.105 + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
3.106 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
3.107 + { (exit 1); exit 1; }; }
3.108 +fi
3.109 +
3.110 +fi
3.111 +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
3.112 +echo "${ECHO_T}$ac_cv_host" >&6; }
3.113 +case $ac_cv_host in
3.114 +*-*-*) ;;
3.115 +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
3.116 +echo "$as_me: error: invalid value of canonical host" >&2;}
3.117 + { (exit 1); exit 1; }; };;
3.118 +esac
3.119 +host=$ac_cv_host
3.120 +ac_save_IFS=$IFS; IFS='-'
3.121 +set x $ac_cv_host
3.122 +shift
3.123 +host_cpu=$1
3.124 +host_vendor=$2
3.125 +shift; shift
3.126 +# Remember, the first character of IFS is used to create $*,
3.127 +# except with old shells:
3.128 +host_os=$*
3.129 +IFS=$ac_save_IFS
3.130 +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
3.131 +
3.132 +
3.133
3.134
3.135
3.136 @@ -5200,7 +5307,6 @@
3.137 exit 1
3.138 fi
3.139
3.140 -
3.141 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
3.142
3.143
3.144 @@ -5270,6 +5376,158 @@
3.145 done
3.146
3.147
3.148 +if test "${ac_cv_header_GL_gl_h+set}" = set; then
3.149 + { echo "$as_me:$LINENO: checking for GL/gl.h" >&5
3.150 +echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6; }
3.151 +if test "${ac_cv_header_GL_gl_h+set}" = set; then
3.152 + echo $ECHO_N "(cached) $ECHO_C" >&6
3.153 +fi
3.154 +{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
3.155 +echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; }
3.156 +else
3.157 + # Is the header compilable?
3.158 +{ echo "$as_me:$LINENO: checking GL/gl.h usability" >&5
3.159 +echo $ECHO_N "checking GL/gl.h usability... $ECHO_C" >&6; }
3.160 +cat >conftest.$ac_ext <<_ACEOF
3.161 +/* confdefs.h. */
3.162 +_ACEOF
3.163 +cat confdefs.h >>conftest.$ac_ext
3.164 +cat >>conftest.$ac_ext <<_ACEOF
3.165 +/* end confdefs.h. */
3.166 +$ac_includes_default
3.167 +#include <GL/gl.h>
3.168 +_ACEOF
3.169 +rm -f conftest.$ac_objext
3.170 +if { (ac_try="$ac_compile"
3.171 +case "(($ac_try" in
3.172 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.173 + *) ac_try_echo=$ac_try;;
3.174 +esac
3.175 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.176 + (eval "$ac_compile") 2>conftest.er1
3.177 + ac_status=$?
3.178 + grep -v '^ *+' conftest.er1 >conftest.err
3.179 + rm -f conftest.er1
3.180 + cat conftest.err >&5
3.181 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.182 + (exit $ac_status); } && {
3.183 + test -z "$ac_c_werror_flag" ||
3.184 + test ! -s conftest.err
3.185 + } && test -s conftest.$ac_objext; then
3.186 + ac_header_compiler=yes
3.187 +else
3.188 + echo "$as_me: failed program was:" >&5
3.189 +sed 's/^/| /' conftest.$ac_ext >&5
3.190 +
3.191 + ac_header_compiler=no
3.192 +fi
3.193 +
3.194 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.195 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
3.196 +echo "${ECHO_T}$ac_header_compiler" >&6; }
3.197 +
3.198 +# Is the header present?
3.199 +{ echo "$as_me:$LINENO: checking GL/gl.h presence" >&5
3.200 +echo $ECHO_N "checking GL/gl.h presence... $ECHO_C" >&6; }
3.201 +cat >conftest.$ac_ext <<_ACEOF
3.202 +/* confdefs.h. */
3.203 +_ACEOF
3.204 +cat confdefs.h >>conftest.$ac_ext
3.205 +cat >>conftest.$ac_ext <<_ACEOF
3.206 +/* end confdefs.h. */
3.207 +#include <GL/gl.h>
3.208 +_ACEOF
3.209 +if { (ac_try="$ac_cpp conftest.$ac_ext"
3.210 +case "(($ac_try" in
3.211 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.212 + *) ac_try_echo=$ac_try;;
3.213 +esac
3.214 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.215 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
3.216 + ac_status=$?
3.217 + grep -v '^ *+' conftest.er1 >conftest.err
3.218 + rm -f conftest.er1
3.219 + cat conftest.err >&5
3.220 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.221 + (exit $ac_status); } >/dev/null && {
3.222 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
3.223 + test ! -s conftest.err
3.224 + }; then
3.225 + ac_header_preproc=yes
3.226 +else
3.227 + echo "$as_me: failed program was:" >&5
3.228 +sed 's/^/| /' conftest.$ac_ext >&5
3.229 +
3.230 + ac_header_preproc=no
3.231 +fi
3.232 +
3.233 +rm -f conftest.err conftest.$ac_ext
3.234 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
3.235 +echo "${ECHO_T}$ac_header_preproc" >&6; }
3.236 +
3.237 +# So? What about this header?
3.238 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
3.239 + yes:no: )
3.240 + { echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5
3.241 +echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
3.242 + { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the compiler's result" >&5
3.243 +echo "$as_me: WARNING: GL/gl.h: proceeding with the compiler's result" >&2;}
3.244 + ac_header_preproc=yes
3.245 + ;;
3.246 + no:yes:* )
3.247 + { echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5
3.248 +echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;}
3.249 + { echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5
3.250 +echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;}
3.251 + { echo "$as_me:$LINENO: WARNING: GL/gl.h: see the Autoconf documentation" >&5
3.252 +echo "$as_me: WARNING: GL/gl.h: see the Autoconf documentation" >&2;}
3.253 + { echo "$as_me:$LINENO: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&5
3.254 +echo "$as_me: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&2;}
3.255 + { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5
3.256 +echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;}
3.257 + { echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&5
3.258 +echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&2;}
3.259 +
3.260 + ;;
3.261 +esac
3.262 +{ echo "$as_me:$LINENO: checking for GL/gl.h" >&5
3.263 +echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6; }
3.264 +if test "${ac_cv_header_GL_gl_h+set}" = set; then
3.265 + echo $ECHO_N "(cached) $ECHO_C" >&6
3.266 +else
3.267 + ac_cv_header_GL_gl_h=$ac_header_preproc
3.268 +fi
3.269 +{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
3.270 +echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; }
3.271 +
3.272 +fi
3.273 +if test $ac_cv_header_GL_gl_h = yes; then
3.274 + :
3.275 +else
3.276 +
3.277 + echo "The OpenGL header files (eg GL/gl.h) could not be found, but are required."
3.278 + exit 1
3.279 +fi
3.280 +
3.281 +
3.282 +
3.283 +case $host_cpu in
3.284 + i386|i486|i586|i686|x86_64)
3.285 + TRANSLATOR="x86";;
3.286 + *)
3.287 + echo "Warning: No translator available for $host. Building emulation core only";;
3.288 +esac
3.289 +
3.290 +
3.291 +if test "$TRANSLATOR"="x86"; then
3.292 + BUILD_SH4X86_TRUE=
3.293 + BUILD_SH4X86_FALSE='#'
3.294 +else
3.295 + BUILD_SH4X86_TRUE='#'
3.296 + BUILD_SH4X86_FALSE=
3.297 +fi
3.298 +
3.299 +
3.300 if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
3.301 { echo "$as_me:$LINENO: checking for linux/cdrom.h" >&5
3.302 echo $ECHO_N "checking for linux/cdrom.h... $ECHO_C" >&6; }
3.303 @@ -5414,6 +5672,280 @@
3.304 fi
3.305
3.306
3.307 +# Extract the first word of "sh-elf-gcc", so it can be a program name with args.
3.308 +set dummy sh-elf-gcc; ac_word=$2
3.309 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3.310 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3.311 +if test "${ac_cv_path_SHCC+set}" = set; then
3.312 + echo $ECHO_N "(cached) $ECHO_C" >&6
3.313 +else
3.314 + case $SHCC in
3.315 + [\\/]* | ?:[\\/]*)
3.316 + ac_cv_path_SHCC="$SHCC" # Let the user override the test with a path.
3.317 + ;;
3.318 + *)
3.319 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3.320 +for as_dir in $PATH
3.321 +do
3.322 + IFS=$as_save_IFS
3.323 + test -z "$as_dir" && as_dir=.
3.324 + for ac_exec_ext in '' $ac_executable_extensions; do
3.325 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.326 + ac_cv_path_SHCC="$as_dir/$ac_word$ac_exec_ext"
3.327 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.328 + break 2
3.329 + fi
3.330 +done
3.331 +done
3.332 +IFS=$as_save_IFS
3.333 +
3.334 + ;;
3.335 +esac
3.336 +fi
3.337 +SHCC=$ac_cv_path_SHCC
3.338 +if test -n "$SHCC"; then
3.339 + { echo "$as_me:$LINENO: result: $SHCC" >&5
3.340 +echo "${ECHO_T}$SHCC" >&6; }
3.341 +else
3.342 + { echo "$as_me:$LINENO: result: no" >&5
3.343 +echo "${ECHO_T}no" >&6; }
3.344 +fi
3.345 +
3.346 +
3.347 +# Extract the first word of "sh-elf-ld", so it can be a program name with args.
3.348 +set dummy sh-elf-ld; ac_word=$2
3.349 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3.350 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3.351 +if test "${ac_cv_path_SHLD+set}" = set; then
3.352 + echo $ECHO_N "(cached) $ECHO_C" >&6
3.353 +else
3.354 + case $SHLD in
3.355 + [\\/]* | ?:[\\/]*)
3.356 + ac_cv_path_SHLD="$SHLD" # Let the user override the test with a path.
3.357 + ;;
3.358 + *)
3.359 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3.360 +for as_dir in $PATH
3.361 +do
3.362 + IFS=$as_save_IFS
3.363 + test -z "$as_dir" && as_dir=.
3.364 + for ac_exec_ext in '' $ac_executable_extensions; do
3.365 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.366 + ac_cv_path_SHLD="$as_dir/$ac_word$ac_exec_ext"
3.367 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.368 + break 2
3.369 + fi
3.370 +done
3.371 +done
3.372 +IFS=$as_save_IFS
3.373 +
3.374 + ;;
3.375 +esac
3.376 +fi
3.377 +SHLD=$ac_cv_path_SHLD
3.378 +if test -n "$SHLD"; then
3.379 + { echo "$as_me:$LINENO: result: $SHLD" >&5
3.380 +echo "${ECHO_T}$SHLD" >&6; }
3.381 +else
3.382 + { echo "$as_me:$LINENO: result: no" >&5
3.383 +echo "${ECHO_T}no" >&6; }
3.384 +fi
3.385 +
3.386 +
3.387 +# Extract the first word of "sh-elf-objcopy", so it can be a program name with args.
3.388 +set dummy sh-elf-objcopy; ac_word=$2
3.389 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3.390 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3.391 +if test "${ac_cv_path_SHOBJCOPY+set}" = set; then
3.392 + echo $ECHO_N "(cached) $ECHO_C" >&6
3.393 +else
3.394 + case $SHOBJCOPY in
3.395 + [\\/]* | ?:[\\/]*)
3.396 + ac_cv_path_SHOBJCOPY="$SHOBJCOPY" # Let the user override the test with a path.
3.397 + ;;
3.398 + *)
3.399 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3.400 +for as_dir in $PATH
3.401 +do
3.402 + IFS=$as_save_IFS
3.403 + test -z "$as_dir" && as_dir=.
3.404 + for ac_exec_ext in '' $ac_executable_extensions; do
3.405 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.406 + ac_cv_path_SHOBJCOPY="$as_dir/$ac_word$ac_exec_ext"
3.407 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.408 + break 2
3.409 + fi
3.410 +done
3.411 +done
3.412 +IFS=$as_save_IFS
3.413 +
3.414 + ;;
3.415 +esac
3.416 +fi
3.417 +SHOBJCOPY=$ac_cv_path_SHOBJCOPY
3.418 +if test -n "$SHOBJCOPY"; then
3.419 + { echo "$as_me:$LINENO: result: $SHOBJCOPY" >&5
3.420 +echo "${ECHO_T}$SHOBJCOPY" >&6; }
3.421 +else
3.422 + { echo "$as_me:$LINENO: result: no" >&5
3.423 +echo "${ECHO_T}no" >&6; }
3.424 +fi
3.425 +
3.426 +
3.427 +# Extract the first word of "arm-elf-gcc", so it can be a program name with args.
3.428 +set dummy arm-elf-gcc; ac_word=$2
3.429 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3.430 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3.431 +if test "${ac_cv_path_ARMCC+set}" = set; then
3.432 + echo $ECHO_N "(cached) $ECHO_C" >&6
3.433 +else
3.434 + case $ARMCC in
3.435 + [\\/]* | ?:[\\/]*)
3.436 + ac_cv_path_ARMCC="$ARMCC" # Let the user override the test with a path.
3.437 + ;;
3.438 + *)
3.439 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3.440 +for as_dir in $PATH
3.441 +do
3.442 + IFS=$as_save_IFS
3.443 + test -z "$as_dir" && as_dir=.
3.444 + for ac_exec_ext in '' $ac_executable_extensions; do
3.445 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.446 + ac_cv_path_ARMCC="$as_dir/$ac_word$ac_exec_ext"
3.447 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.448 + break 2
3.449 + fi
3.450 +done
3.451 +done
3.452 +IFS=$as_save_IFS
3.453 +
3.454 + ;;
3.455 +esac
3.456 +fi
3.457 +ARMCC=$ac_cv_path_ARMCC
3.458 +if test -n "$ARMCC"; then
3.459 + { echo "$as_me:$LINENO: result: $ARMCC" >&5
3.460 +echo "${ECHO_T}$ARMCC" >&6; }
3.461 +else
3.462 + { echo "$as_me:$LINENO: result: no" >&5
3.463 +echo "${ECHO_T}no" >&6; }
3.464 +fi
3.465 +
3.466 +
3.467 +# Extract the first word of "arm-elf-ld", so it can be a program name with args.
3.468 +set dummy arm-elf-ld; ac_word=$2
3.469 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3.470 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3.471 +if test "${ac_cv_path_ARMLD+set}" = set; then
3.472 + echo $ECHO_N "(cached) $ECHO_C" >&6
3.473 +else
3.474 + case $ARMLD in
3.475 + [\\/]* | ?:[\\/]*)
3.476 + ac_cv_path_ARMLD="$ARMLD" # Let the user override the test with a path.
3.477 + ;;
3.478 + *)
3.479 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3.480 +for as_dir in $PATH
3.481 +do
3.482 + IFS=$as_save_IFS
3.483 + test -z "$as_dir" && as_dir=.
3.484 + for ac_exec_ext in '' $ac_executable_extensions; do
3.485 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.486 + ac_cv_path_ARMLD="$as_dir/$ac_word$ac_exec_ext"
3.487 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.488 + break 2
3.489 + fi
3.490 +done
3.491 +done
3.492 +IFS=$as_save_IFS
3.493 +
3.494 + ;;
3.495 +esac
3.496 +fi
3.497 +ARMLD=$ac_cv_path_ARMLD
3.498 +if test -n "$ARMLD"; then
3.499 + { echo "$as_me:$LINENO: result: $ARMLD" >&5
3.500 +echo "${ECHO_T}$ARMLD" >&6; }
3.501 +else
3.502 + { echo "$as_me:$LINENO: result: no" >&5
3.503 +echo "${ECHO_T}no" >&6; }
3.504 +fi
3.505 +
3.506 +
3.507 +# Extract the first word of "arm-elf-objcopy", so it can be a program name with args.
3.508 +set dummy arm-elf-objcopy; ac_word=$2
3.509 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3.510 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3.511 +if test "${ac_cv_path_ARMOBJCOPY+set}" = set; then
3.512 + echo $ECHO_N "(cached) $ECHO_C" >&6
3.513 +else
3.514 + case $ARMOBJCOPY in
3.515 + [\\/]* | ?:[\\/]*)
3.516 + ac_cv_path_ARMOBJCOPY="$ARMOBJCOPY" # Let the user override the test with a path.
3.517 + ;;
3.518 + *)
3.519 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3.520 +for as_dir in $PATH
3.521 +do
3.522 + IFS=$as_save_IFS
3.523 + test -z "$as_dir" && as_dir=.
3.524 + for ac_exec_ext in '' $ac_executable_extensions; do
3.525 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.526 + ac_cv_path_ARMOBJCOPY="$as_dir/$ac_word$ac_exec_ext"
3.527 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.528 + break 2
3.529 + fi
3.530 +done
3.531 +done
3.532 +IFS=$as_save_IFS
3.533 +
3.534 + ;;
3.535 +esac
3.536 +fi
3.537 +ARMOBJCOPY=$ac_cv_path_ARMOBJCOPY
3.538 +if test -n "$ARMOBJCOPY"; then
3.539 + { echo "$as_me:$LINENO: result: $ARMOBJCOPY" >&5
3.540 +echo "${ECHO_T}$ARMOBJCOPY" >&6; }
3.541 +else
3.542 + { echo "$as_me:$LINENO: result: no" >&5
3.543 +echo "${ECHO_T}no" >&6; }
3.544 +fi
3.545 +
3.546 +
3.547 +
3.548 +if test "x$SHCC" = "x" -o "x$SHLD" = "x" -o "x$SHOBJCOPY" = "x"; then
3.549 + BUILD_SH="no"
3.550 + echo "Warning: SH4 cross-compiler not found, system tests will be disabled."
3.551 +else
3.552 + BUILD_SH="yes"
3.553 +fi
3.554 +if test "x$ARMCC" = "x" -o "x$ARMLD" = "x" -o "x$ARMOBJCOPY" = "x"; then
3.555 + BUILD_ARM="no"
3.556 + echo "Warning: ARM cross-compiler not found, AICA tests will be disabled."
3.557 +else
3.558 + BUILD_ARM="yes"
3.559 +fi
3.560 +
3.561 +
3.562 +if test "$BUILD_SH" = "yes"; then
3.563 + BUILD_SYSTEST_TRUE=
3.564 + BUILD_SYSTEST_FALSE='#'
3.565 +else
3.566 + BUILD_SYSTEST_TRUE='#'
3.567 + BUILD_SYSTEST_FALSE=
3.568 +fi
3.569 +
3.570 +
3.571 +
3.572 +if test "$BUILD_ARM" = "yes"; then
3.573 + BUILD_ARMTEST_TRUE=
3.574 + BUILD_ARMTEST_FALSE='#'
3.575 +else
3.576 + BUILD_ARMTEST_TRUE='#'
3.577 + BUILD_ARMTEST_FALSE=
3.578 +fi
3.579 +
3.580 +
3.581 GETTEXT_PACKAGE=lxdream
3.582
3.583 cat >>confdefs.h <<_ACEOF
3.584 @@ -6913,7 +7445,7 @@
3.585 < $srcdir/po/POTFILES.in > po/POTFILES
3.586
3.587
3.588 -ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in"
3.589 +ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in test/Makefile"
3.590
3.591 cat >confcache <<\_ACEOF
3.592 # This file is a shell script that caches the results of configure
3.593 @@ -7039,6 +7571,13 @@
3.594 Usually this means the macro was only invoked conditionally." >&2;}
3.595 { (exit 1); exit 1; }; }
3.596 fi
3.597 +if test -z "${BUILD_SH4X86_TRUE}" && test -z "${BUILD_SH4X86_FALSE}"; then
3.598 + { { echo "$as_me:$LINENO: error: conditional \"BUILD_SH4X86\" was never defined.
3.599 +Usually this means the macro was only invoked conditionally." >&5
3.600 +echo "$as_me: error: conditional \"BUILD_SH4X86\" was never defined.
3.601 +Usually this means the macro was only invoked conditionally." >&2;}
3.602 + { (exit 1); exit 1; }; }
3.603 +fi
3.604 if test -z "${CDROM_LINUX_TRUE}" && test -z "${CDROM_LINUX_FALSE}"; then
3.605 { { echo "$as_me:$LINENO: error: conditional \"CDROM_LINUX\" was never defined.
3.606 Usually this means the macro was only invoked conditionally." >&5
3.607 @@ -7046,6 +7585,20 @@
3.608 Usually this means the macro was only invoked conditionally." >&2;}
3.609 { (exit 1); exit 1; }; }
3.610 fi
3.611 +if test -z "${BUILD_SYSTEST_TRUE}" && test -z "${BUILD_SYSTEST_FALSE}"; then
3.612 + { { echo "$as_me:$LINENO: error: conditional \"BUILD_SYSTEST\" was never defined.
3.613 +Usually this means the macro was only invoked conditionally." >&5
3.614 +echo "$as_me: error: conditional \"BUILD_SYSTEST\" was never defined.
3.615 +Usually this means the macro was only invoked conditionally." >&2;}
3.616 + { (exit 1); exit 1; }; }
3.617 +fi
3.618 +if test -z "${BUILD_ARMTEST_TRUE}" && test -z "${BUILD_ARMTEST_FALSE}"; then
3.619 + { { echo "$as_me:$LINENO: error: conditional \"BUILD_ARMTEST\" was never defined.
3.620 +Usually this means the macro was only invoked conditionally." >&5
3.621 +echo "$as_me: error: conditional \"BUILD_ARMTEST\" was never defined.
3.622 +Usually this means the macro was only invoked conditionally." >&2;}
3.623 + { (exit 1); exit 1; }; }
3.624 +fi
3.625
3.626 : ${CONFIG_STATUS=./config.status}
3.627 ac_clean_files_save=$ac_clean_files
3.628 @@ -7519,6 +8072,7 @@
3.629 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
3.630 "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
3.631 "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
3.632 + "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
3.633
3.634 *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
3.635 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
3.636 @@ -7658,11 +8212,72 @@
3.637 CPP!$CPP$ac_delim
3.638 GREP!$GREP$ac_delim
3.639 EGREP!$EGREP$ac_delim
3.640 +build!$build$ac_delim
3.641 +build_cpu!$build_cpu$ac_delim
3.642 +build_vendor!$build_vendor$ac_delim
3.643 +build_os!$build_os$ac_delim
3.644 +host!$host$ac_delim
3.645 +host_cpu!$host_cpu$ac_delim
3.646 +host_vendor!$host_vendor$ac_delim
3.647 +host_os!$host_os$ac_delim
3.648 PKG_CONFIG!$PKG_CONFIG$ac_delim
3.649 PACKAGE_CFLAGS!$PACKAGE_CFLAGS$ac_delim
3.650 PACKAGE_LIBS!$PACKAGE_LIBS$ac_delim
3.651 +BUILD_SH4X86_TRUE!$BUILD_SH4X86_TRUE$ac_delim
3.652 +BUILD_SH4X86_FALSE!$BUILD_SH4X86_FALSE$ac_delim
3.653 CDROM_LINUX_TRUE!$CDROM_LINUX_TRUE$ac_delim
3.654 CDROM_LINUX_FALSE!$CDROM_LINUX_FALSE$ac_delim
3.655 +SHCC!$SHCC$ac_delim
3.656 +SHLD!$SHLD$ac_delim
3.657 +SHOBJCOPY!$SHOBJCOPY$ac_delim
3.658 +ARMCC!$ARMCC$ac_delim
3.659 +ARMLD!$ARMLD$ac_delim
3.660 +_ACEOF
3.661 +
3.662 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
3.663 + break
3.664 + elif $ac_last_try; then
3.665 + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
3.666 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
3.667 + { (exit 1); exit 1; }; }
3.668 + else
3.669 + ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
3.670 + fi
3.671 +done
3.672 +
3.673 +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
3.674 +if test -n "$ac_eof"; then
3.675 + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
3.676 + ac_eof=`expr $ac_eof + 1`
3.677 +fi
3.678 +
3.679 +cat >>$CONFIG_STATUS <<_ACEOF
3.680 +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
3.681 +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
3.682 +_ACEOF
3.683 +sed '
3.684 +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
3.685 +s/^/s,@/; s/!/@,|#_!!_#|/
3.686 +:n
3.687 +t n
3.688 +s/'"$ac_delim"'$/,g/; t
3.689 +s/$/\\/; p
3.690 +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
3.691 +' >>$CONFIG_STATUS <conf$$subs.sed
3.692 +rm -f conf$$subs.sed
3.693 +cat >>$CONFIG_STATUS <<_ACEOF
3.694 +CEOF$ac_eof
3.695 +_ACEOF
3.696 +
3.697 +
3.698 +ac_delim='%!_!# '
3.699 +for ac_last_try in false false false false false :; do
3.700 + cat >conf$$subs.sed <<_ACEOF
3.701 +ARMOBJCOPY!$ARMOBJCOPY$ac_delim
3.702 +BUILD_SYSTEST_TRUE!$BUILD_SYSTEST_TRUE$ac_delim
3.703 +BUILD_SYSTEST_FALSE!$BUILD_SYSTEST_FALSE$ac_delim
3.704 +BUILD_ARMTEST_TRUE!$BUILD_ARMTEST_TRUE$ac_delim
3.705 +BUILD_ARMTEST_FALSE!$BUILD_ARMTEST_FALSE$ac_delim
3.706 GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
3.707 USE_NLS!$USE_NLS$ac_delim
3.708 MSGFMT!$MSGFMT$ac_delim
3.709 @@ -7678,53 +8293,12 @@
3.710 PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
3.711 POFILES!$POFILES$ac_delim
3.712 POSUB!$POSUB$ac_delim
3.713 -_ACEOF
3.714 -
3.715 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
3.716 - break
3.717 - elif $ac_last_try; then
3.718 - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
3.719 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
3.720 - { (exit 1); exit 1; }; }
3.721 - else
3.722 - ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
3.723 - fi
3.724 -done
3.725 -
3.726 -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
3.727 -if test -n "$ac_eof"; then
3.728 - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
3.729 - ac_eof=`expr $ac_eof + 1`
3.730 -fi
3.731 -
3.732 -cat >>$CONFIG_STATUS <<_ACEOF
3.733 -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
3.734 -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
3.735 -_ACEOF
3.736 -sed '
3.737 -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
3.738 -s/^/s,@/; s/!/@,|#_!!_#|/
3.739 -:n
3.740 -t n
3.741 -s/'"$ac_delim"'$/,g/; t
3.742 -s/$/\\/; p
3.743 -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
3.744 -' >>$CONFIG_STATUS <conf$$subs.sed
3.745 -rm -f conf$$subs.sed
3.746 -cat >>$CONFIG_STATUS <<_ACEOF
3.747 -CEOF$ac_eof
3.748 -_ACEOF
3.749 -
3.750 -
3.751 -ac_delim='%!_!# '
3.752 -for ac_last_try in false false false false false :; do
3.753 - cat >conf$$subs.sed <<_ACEOF
3.754 MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
3.755 LIBOBJS!$LIBOBJS$ac_delim
3.756 LTLIBOBJS!$LTLIBOBJS$ac_delim
3.757 _ACEOF
3.758
3.759 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then
3.760 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then
3.761 break
3.762 elif $ac_last_try; then
3.763 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
4.1 --- a/configure.in Fri Nov 16 23:51:23 2007 +0000
4.2 +++ b/configure.in Sat Nov 17 01:13:41 2007 +0000
4.3 @@ -9,6 +9,8 @@
4.4 AC_PROG_CC
4.5 AM_PROG_CC_STDC
4.6 AC_HEADER_STDC
4.7 +AC_CANONICAL_BUILD
4.8 +AC_CANONICAL_HOST
4.9
4.10 PKG_CHECK_MODULES(PACKAGE,
4.11 [ gtk+-2.0 dnl
4.12 @@ -20,12 +22,47 @@
4.13 AC_CHECK_LIB(GL, glXQueryVersion, [], [
4.14 echo "The OpenGL library (libGL.so) could not be found, but is required."
4.15 exit 1])
4.16 +AC_CHECK_HEADER([GL/gl.h], [], [
4.17 + echo "The OpenGL header files (eg GL/gl.h) could not be found, but are required."
4.18 + exit 1])
4.19 +
4.20 +dnl Check for a supported cpu target for translation purposes
4.21 +case $host_cpu in
4.22 + i386|i486|i586|i686|x86_64)
4.23 + TRANSLATOR="x86";;
4.24 + *)
4.25 + echo "Warning: No translator available for $host. Building emulation core only";;
4.26 +esac
4.27 +AM_CONDITIONAL(BUILD_SH4X86, [test "$TRANSLATOR"="x86"])
4.28
4.29 dnl Check for cdrom device support
4.30 AC_CHECK_HEADER([linux/cdrom.h], [HAVE_LINUX_CDROM_H=yes], [
4.31 echo "Linux CDROM support not found, building without it."] )
4.32 AM_CONDITIONAL(CDROM_LINUX, [test "$HAVE_LINUX_CDROM_H" = "yes"])
4.33
4.34 +dnl Check for cross-compiler availability
4.35 +AC_PATH_PROG(SHCC, [sh-elf-gcc])
4.36 +AC_PATH_PROG(SHLD, [sh-elf-ld])
4.37 +AC_PATH_PROG(SHOBJCOPY, [sh-elf-objcopy])
4.38 +AC_PATH_PROG(ARMCC, [arm-elf-gcc])
4.39 +AC_PATH_PROG(ARMLD, [arm-elf-ld])
4.40 +AC_PATH_PROG(ARMOBJCOPY, [arm-elf-objcopy])
4.41 +
4.42 +if test "x$SHCC" = "x" -o "x$SHLD" = "x" -o "x$SHOBJCOPY" = "x"; then
4.43 + BUILD_SH="no"
4.44 + echo "Warning: SH4 cross-compiler not found, system tests will be disabled."
4.45 +else
4.46 + BUILD_SH="yes"
4.47 +fi
4.48 +if test "x$ARMCC" = "x" -o "x$ARMLD" = "x" -o "x$ARMOBJCOPY" = "x"; then
4.49 + BUILD_ARM="no"
4.50 + echo "Warning: ARM cross-compiler not found, AICA tests will be disabled."
4.51 +else
4.52 + BUILD_ARM="yes"
4.53 +fi
4.54 +AM_CONDITIONAL(BUILD_SYSTEST, [test "$BUILD_SH" = "yes"])
4.55 +AM_CONDITIONAL(BUILD_ARMTEST, [test "$BUILD_ARM" = "yes"])
4.56 +
4.57 GETTEXT_PACKAGE=lxdream
4.58 AC_SUBST(GETTEXT_PACKAGE)
4.59 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
4.60 @@ -41,5 +78,6 @@
4.61 Makefile
4.62 src/Makefile
4.63 po/Makefile.in
4.64 +test/Makefile
4.65 ])
4.66
5.1 --- a/test/Makefile Fri Nov 16 23:51:23 2007 +0000
5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
5.3 @@ -1,139 +0,0 @@
5.4 -# host compiler and flags
5.5 -HOSTCC = gcc
5.6 -HOSTCFLAGS = -O2
5.7 -SH4CC = sh-elf-gcc
5.8 -SH4INC = -Iinclude
5.9 -SH4CFLAGS = $(SH4INC) -D_arch_dreamcast -D_arch_sub_pristine \
5.10 - -O2 -fno-builtin -fno-strict-aliasing -ml -m4-single-only \
5.11 - -fno-optimize-sibling-calls
5.12 -SH4LD = sh-elf-ld
5.13 -SH4LDFLAGS = -fno-builtin -fno-strict-aliasing -ml -m4-single-only \
5.14 - -Wl,-Tdc.x -nostartfiles -nostdlib -Llib
5.15 -SH4LIBS = -Wl,--start-group -lc -lgcc -lm -Wl,--end-group
5.16 -SH4OBJCOPY = sh-elf-objcopy -O binary
5.17 -ARMCC = arm-elf-gcc
5.18 -ARMCFLAGS = -O2
5.19 -ARMLD = arm-elf-ld
5.20 -ARMOBJCOPY = arm-elf-objcopy
5.21 -
5.22 -BFDLIB = -L/usr/local/sh-elf-bfd/lib -lbfd -liberty
5.23 -BFDINCLUDE = /usr/local/sh-elf-bfd/include
5.24 -RUNTEST = ../src/lxdream -c ./lxdream.rc -puh
5.25 -
5.26 -
5.27 -# cygwin
5.28 -# these must point to your sh-elf bfd, not the system one
5.29 -#BFDLIB = -L/usr/local/lib -lbfd -liberty -lintl
5.30 -#BFDINCLUDE = /usr/local/include
5.31 -
5.32 -#SHARED_OBJECTS = crt0.so dcload-syscall.so dcload-syscalls.so memcpy.so lib.so
5.33 -SHARED_OBJECTS =
5.34 -
5.35 -%.ao: %.c
5.36 - $(ARMCC) $(ARMCFLAGS) -o $@ -c $<
5.37 -
5.38 -%.ao: %.s
5.39 - $(ARMCC) $(ARMCFLAGS) -o $@ -c $<
5.40 -
5.41 -%.so: %.c
5.42 - $(SH4CC) $(SH4CFLAGS) -o $@ -c $<
5.43 -
5.44 -%.so: %.ac
5.45 - $(SH4CC) $(SH4CFLAGS) -o $@ -c $<
5.46 -
5.47 -%.so: %.s
5.48 - $(SH4CC) $(SH4CFLAGS) -o $@ -c $<
5.49 -
5.50 -%.so: %.S
5.51 - $(SH4CC) $(SH4CFLAGS) -o $@ -c $<
5.52 -
5.53 -%.o: %.c
5.54 - $(HOSTCC) $(HOSTCFLAGS) -o $@ -c $<
5.55 -
5.56 -%.arm: %.ao arm_crt0.ao
5.57 - $(ARMCC) -Wl,-Ttext,0x00000000 -nostartfiles -nostdlib -e reset -o $@ arm_crt0.ao $< -lgcc
5.58 -
5.59 -
5.60 -%.bin: %.arm
5.61 - $(ARMOBJCOPY) -O binary $< $@
5.62 -
5.63 -%.aso: %.bin bin2c
5.64 - ./bin2c $< $<.c
5.65 - $(SH4CC) $(SH4CFLAGS) -o $@ -c $<.c
5.66 -
5.67 -all: build-tests
5.68 -
5.69 -check: build-tests
5.70 - $(RUNTEST) testsh4
5.71 - $(RUNTEST) testide -d ../disc/test.nrg
5.72 - $(RUNTEST) testta < testta.data < testta2.data < testta3.data < testta4.data < testta5.data
5.73 - $(RUNTEST) testregs
5.74 - $(RUNTEST) testmath
5.75 -
5.76 -build-tests: testsh4 testmath testide testta testregs testrend testdisp testspu
5.77 -
5.78 -testsh4: crt0.so sh4/testsh4.so timer.so interrupt.so \
5.79 - sh4/add.so sh4/addc.so sh4/addv.so sh4/and.so sh4/andi.so \
5.80 - sh4/bf.so sh4/bsr.so sh4/bt.so sh4/cmp.so sh4/cmpstr.so \
5.81 - sh4/div0.so sh4/div1.so sh4/float.so sh4/fmov.so sh4/ftrc.so \
5.82 - sh4/mac.s \
5.83 - sh4/rot.so sh4/shl.so sh4/shld.so sh4/sub.so sh4/subc.so \
5.84 - sh4/tas.so sh4/xtrct.so \
5.85 - sh4/excslot.so sh4/undef.so
5.86 - $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
5.87 - $(SH4OBJCOPY) testsh4 testsh4.bin
5.88 -
5.89 -testide: crt0.so testide.so ide.so lib.so testdata.so
5.90 - $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
5.91 - $(SH4OBJCOPY) testide testide.bin
5.92 -
5.93 -testmath: crt0.so $(SHARED_OBJECTS) testmath.so math.so
5.94 - $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
5.95 -
5.96 -testregs: crt0.so $(SHARED_OBJECTS) testregs.so ide.so
5.97 - $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
5.98 - $(SH4OBJCOPY) testregs testregs.bin
5.99 -
5.100 -testta: crt0.so $(SHARED_OBJECTS) testta.so pvr.so dmac.so asic.so lib.so testdata.so
5.101 - $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
5.102 - $(SH4OBJCOPY) testta testta.bin
5.103 -
5.104 -testrend: crt0.so $(SHARED_OBJECTS) testrend.so pvr.so dmac.so asic.so lib.so testdata.so
5.105 - $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
5.106 - $(SH4OBJCOPY) testrend testrend.bin
5.107 -
5.108 -testblend: crt0.so $(SHARED_OBJECTS) testblend.so pvr.so dmac.so asic.so lib.so testdata.so
5.109 - $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
5.110 - $(SH4OBJCOPY) testblend testblend.bin
5.111 -
5.112 -testdisp: crt0.so $(SHARED_OBJECTS) testdisp.so pvr.so asic.so lib.so testdata.so timer.so
5.113 - $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
5.114 - $(SH4OBJCOPY) testdisp testdisp.bin
5.115 -
5.116 -testyuv: crt0.so $(SHARED_OBJECTS) testyuv.so pvr.so asic.so lib.so testdata.so timer.so dmac.so
5.117 - $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
5.118 - $(SH4OBJCOPY) testyuv testyuv.bin
5.119 -
5.120 -testspu: crt0.so $(SHARED_OBJECTS) testspu.so asic.so lib.so testdata.so timer.so dmac.so
5.121 - $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
5.122 - $(SH4OBJCOPY) testspu testspu.bin
5.123 -
5.124 -testg2: crt0.so $(SHARED_OBJECTS) testg2.so asic.so lib.so testdata.so timer.so dmac.so
5.125 - $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
5.126 - $(SH4OBJCOPY) testg2 testg2.bin
5.127 -
5.128 -readdata: crt0.so readdata.so
5.129 - $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
5.130 -
5.131 -rend: crt0.so rendload.so asic.so lib.so timer.so pvr.so
5.132 - $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
5.133 - $(SH4OBJCOPY) rend rend.bin
5.134 -
5.135 -testFF10: crt0.so testFF10.so lib.so
5.136 - $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
5.137 - $(SH4OBJCOPY) testFF10 testFF10.bin
5.138 -
5.139 -.PHONY : clean
5.140 -clean:
5.141 - rm -f *.o *.so *.ao *.ac *.bin mapleid ide readmem dumpasic
5.142 -
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
6.2 +++ b/test/Makefile.in Sat Nov 17 01:13:41 2007 +0000
6.3 @@ -0,0 +1,138 @@
6.4 +# host compiler and flags
6.5 +HOSTCC = @CC@
6.6 +HOSTCFLAGS = @CFLAGS@
6.7 +SH4CC = @SHCC@
6.8 +SH4INC = -Iinclude
6.9 +SH4CFLAGS = $(SH4INC) -D_arch_dreamcast -D_arch_sub_pristine \
6.10 + -O2 -fno-builtin -fno-strict-aliasing -ml -m4-single-only \
6.11 + -fno-optimize-sibling-calls
6.12 +SH4LD = @SHLD@
6.13 +SH4LDFLAGS = -fno-builtin -fno-strict-aliasing -ml -m4-single-only \
6.14 + -Wl,-Tdc.x -nostartfiles -nostdlib -Llib
6.15 +SH4LIBS = -Wl,--start-group -lc -lgcc -lm -Wl,--end-group
6.16 +SH4OBJCOPY = @SHOBJCOPY@ -O binary
6.17 +ARMCC = @ARMCC@
6.18 +ARMCFLAGS = -O2
6.19 +ARMLD = @ARMLD@
6.20 +ARMOBJCOPY = @ARMOBJCOPY@
6.21 +
6.22 +RUNTEST = ../src/lxdream -c ./lxdream.rc -puh
6.23 +
6.24 +
6.25 +# cygwin
6.26 +# these must point to your sh-elf bfd, not the system one
6.27 +#BFDLIB = -L/usr/local/lib -lbfd -liberty -lintl
6.28 +#BFDINCLUDE = /usr/local/include
6.29 +
6.30 +#SHARED_OBJECTS = crt0.so dcload-syscall.so dcload-syscalls.so memcpy.so lib.so
6.31 +SHARED_OBJECTS =
6.32 +
6.33 +%.ao: %.c
6.34 + $(ARMCC) $(ARMCFLAGS) -o $@ -c $<
6.35 +
6.36 +%.ao: %.s
6.37 + $(ARMCC) $(ARMCFLAGS) -o $@ -c $<
6.38 +
6.39 +%.so: %.c
6.40 + $(SH4CC) $(SH4CFLAGS) -o $@ -c $<
6.41 +
6.42 +%.so: %.ac
6.43 + $(SH4CC) $(SH4CFLAGS) -o $@ -c $<
6.44 +
6.45 +%.so: %.s
6.46 + $(SH4CC) $(SH4CFLAGS) -o $@ -c $<
6.47 +
6.48 +%.so: %.S
6.49 + $(SH4CC) $(SH4CFLAGS) -o $@ -c $<
6.50 +
6.51 +%.o: %.c
6.52 + $(HOSTCC) $(HOSTCFLAGS) -o $@ -c $<
6.53 +
6.54 +%.arm: %.ao arm_crt0.ao
6.55 + $(ARMCC) -Wl,-Ttext,0x00000000 -nostartfiles -nostdlib -e reset -o $@ arm_crt0.ao $< -lgcc
6.56 +
6.57 +
6.58 +%.bin: %.arm
6.59 + $(ARMOBJCOPY) -O binary $< $@
6.60 +
6.61 +%.aso: %.bin bin2c
6.62 + ./bin2c $< $<.c
6.63 + $(SH4CC) $(SH4CFLAGS) -o $@ -c $<.c
6.64 +
6.65 +all: build-tests
6.66 +
6.67 +check: build-tests
6.68 + cat testta.data testta2.data testta3.data testta4.data testta5.data | $(RUNTEST) testta
6.69 + $(RUNTEST) testsh4
6.70 + $(RUNTEST) testregs
6.71 + $(RUNTEST) testmath
6.72 + $(RUNTEST) testide -d ../disc/test.nrg
6.73 +
6.74 +
6.75 +build-tests: testsh4 testmath testide testta testregs testrend testdisp testspu
6.76 +
6.77 +testsh4: crt0.so sh4/testsh4.so timer.so interrupt.so \
6.78 + sh4/add.so sh4/addc.so sh4/addv.so sh4/and.so sh4/andi.so \
6.79 + sh4/bf.so sh4/bsr.so sh4/bt.so sh4/cmp.so sh4/cmpstr.so \
6.80 + sh4/div0.so sh4/div1.so sh4/float.so sh4/fmov.so sh4/ftrc.so \
6.81 + sh4/mac.s \
6.82 + sh4/rot.so sh4/shl.so sh4/shld.so sh4/sub.so sh4/subc.so \
6.83 + sh4/tas.so sh4/xtrct.so \
6.84 + sh4/excslot.so sh4/undef.so
6.85 + $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
6.86 + $(SH4OBJCOPY) testsh4 testsh4.bin
6.87 +
6.88 +testide: crt0.so testide.so ide.so lib.so testdata.so
6.89 + $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
6.90 + $(SH4OBJCOPY) testide testide.bin
6.91 +
6.92 +testmath: crt0.so $(SHARED_OBJECTS) testmath.so math.so
6.93 + $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
6.94 +
6.95 +testregs: crt0.so $(SHARED_OBJECTS) testregs.so ide.so
6.96 + $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
6.97 + $(SH4OBJCOPY) testregs testregs.bin
6.98 +
6.99 +testta: crt0.so $(SHARED_OBJECTS) testta.so pvr.so dmac.so asic.so lib.so testdata.so
6.100 + $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
6.101 + $(SH4OBJCOPY) testta testta.bin
6.102 +
6.103 +testrend: crt0.so $(SHARED_OBJECTS) testrend.so pvr.so dmac.so asic.so lib.so testdata.so
6.104 + $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
6.105 + $(SH4OBJCOPY) testrend testrend.bin
6.106 +
6.107 +testblend: crt0.so $(SHARED_OBJECTS) testblend.so pvr.so dmac.so asic.so lib.so testdata.so
6.108 + $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
6.109 + $(SH4OBJCOPY) testblend testblend.bin
6.110 +
6.111 +testdisp: crt0.so $(SHARED_OBJECTS) testdisp.so pvr.so asic.so lib.so testdata.so timer.so
6.112 + $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
6.113 + $(SH4OBJCOPY) testdisp testdisp.bin
6.114 +
6.115 +testyuv: crt0.so $(SHARED_OBJECTS) testyuv.so pvr.so asic.so lib.so testdata.so timer.so dmac.so
6.116 + $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
6.117 + $(SH4OBJCOPY) testyuv testyuv.bin
6.118 +
6.119 +testspu: crt0.so $(SHARED_OBJECTS) testspu.so asic.so lib.so testdata.so timer.so dmac.so
6.120 + $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
6.121 + $(SH4OBJCOPY) testspu testspu.bin
6.122 +
6.123 +testg2: crt0.so $(SHARED_OBJECTS) testg2.so asic.so lib.so testdata.so timer.so dmac.so
6.124 + $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
6.125 + $(SH4OBJCOPY) testg2 testg2.bin
6.126 +
6.127 +readdata: crt0.so readdata.so
6.128 + $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
6.129 +
6.130 +rend: crt0.so rendload.so asic.so lib.so timer.so pvr.so
6.131 + $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
6.132 + $(SH4OBJCOPY) rend rend.bin
6.133 +
6.134 +testFF10: crt0.so testFF10.so lib.so
6.135 + $(SH4CC) $(SH4LDFLAGS) $^ -o $@ $(SH4LIBS)
6.136 + $(SH4OBJCOPY) testFF10 testFF10.bin
6.137 +
6.138 +.PHONY : clean
6.139 +clean:
6.140 + rm -f *.o *.so *.ao *.ac *.bin mapleid ide readmem dumpasic
6.141 +
.