Search
lxdream.org :: lxdream :: r180:e6dcf9b65658
lxdream 0.9.1
released Jun 29
Download Now
changeset180:e6dcf9b65658
parent179:18dacd91aa73
child181:bc28fd93e233
authornkeynes
dateSun Jul 02 04:59:00 2006 +0000 (13 years ago)
Merge changes made on the MILESTONE1 branch back into head (mostly
release touchups)
Makefile.am
Makefile.in
aclocal.m4
configure
configure.in
dream.glade
src/Makefile.am
src/Makefile.in
src/dream.h
src/dreamcast.c
src/dreamcast.h
src/drivers/audio_esd.c
src/drivers/video_gtk.c
src/gui/callbacks.c
src/gui/interface.c
src/loader.c
src/main.c
src/mem.c
src/mem.h
src/sh4/Makefile.am
src/sh4/Makefile.in
1.1 --- a/Makefile.am Tue Jun 27 14:02:27 2006 +0000
1.2 +++ b/Makefile.am Sun Jul 02 04:59:00 2006 +0000
1.3 @@ -1,6 +1,6 @@
1.4 ## Process this file with automake to produce Makefile.in
1.5
1.6 -SUBDIRS = src po test
1.7 +SUBDIRS = src po
1.8
1.9 EXTRA_DIST = \
1.10 autogen.sh \
2.1 --- a/Makefile.in Tue Jun 27 14:02:27 2006 +0000
2.2 +++ b/Makefile.in Sun Jul 02 04:59:00 2006 +0000
2.3 @@ -101,6 +101,7 @@
2.4 XGETTEXT = @XGETTEXT@
2.5 ac_ct_CC = @ac_ct_CC@
2.6 ac_ct_STRIP = @ac_ct_STRIP@
2.7 +ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
2.8 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
2.9 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
2.10 am__include = @am__include@
2.11 @@ -126,7 +127,7 @@
2.12 sysconfdir = @sysconfdir@
2.13 target_alias = @target_alias@
2.14
2.15 -SUBDIRS = src po test
2.16 +SUBDIRS = src po
2.17
2.18 EXTRA_DIST = \
2.19 autogen.sh \
2.20 @@ -146,7 +147,7 @@
2.21 installdirs-recursive install-recursive uninstall-recursive \
2.22 check-recursive installcheck-recursive
2.23 DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
2.24 - COPYING ChangeLog INSTALL Makefile.am NEWS TODO acconfig.h \
2.25 + COPYING ChangeLog INSTALL Makefile.am NEWS acconfig.h \
2.26 aclocal.m4 config.h.in configure configure.in depcomp \
2.27 install-sh missing mkinstalldirs
2.28 DIST_SUBDIRS = $(SUBDIRS)
3.1 --- a/aclocal.m4 Tue Jun 27 14:02:27 2006 +0000
3.2 +++ b/aclocal.m4 Sun Jul 02 04:59:00 2006 +0000
3.3 @@ -1033,63 +1033,162 @@
3.4
3.5 AU_DEFUN([fp_PROG_CC_STDC], [AM_PROG_CC_STDC])
3.6
3.7 +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
3.8 +#
3.9 +# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
3.10 +#
3.11 +# This program is free software; you can redistribute it and/or modify
3.12 +# it under the terms of the GNU General Public License as published by
3.13 +# the Free Software Foundation; either version 2 of the License, or
3.14 +# (at your option) any later version.
3.15 +#
3.16 +# This program is distributed in the hope that it will be useful, but
3.17 +# WITHOUT ANY WARRANTY; without even the implied warranty of
3.18 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3.19 +# General Public License for more details.
3.20 +#
3.21 +# You should have received a copy of the GNU General Public License
3.22 +# along with this program; if not, write to the Free Software
3.23 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
3.24 +#
3.25 +# As a special exception to the GNU General Public License, if you
3.26 +# distribute this file as part of a program that contains a
3.27 +# configuration script generated by Autoconf, you may include it under
3.28 +# the same distribution terms that you use for the rest of that program.
3.29
3.30 -dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
3.31 -dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
3.32 -dnl also defines GSTUFF_PKG_ERRORS on error
3.33 -AC_DEFUN(PKG_CHECK_MODULES, [
3.34 - succeeded=no
3.35 +# PKG_PROG_PKG_CONFIG([MIN-VERSION])
3.36 +# ----------------------------------
3.37 +AC_DEFUN([PKG_PROG_PKG_CONFIG],
3.38 +[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
3.39 +m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
3.40 +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
3.41 +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
3.42 + AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
3.43 +fi
3.44 +if test -n "$PKG_CONFIG"; then
3.45 + _pkg_min_version=m4_default([$1], [0.9.0])
3.46 + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
3.47 + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
3.48 + AC_MSG_RESULT([yes])
3.49 + else
3.50 + AC_MSG_RESULT([no])
3.51 + PKG_CONFIG=""
3.52 + fi
3.53 +
3.54 +fi[]dnl
3.55 +])# PKG_PROG_PKG_CONFIG
3.56
3.57 - if test -z "$PKG_CONFIG"; then
3.58 - AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
3.59 - fi
3.60 +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
3.61 +#
3.62 +# Check to see whether a particular set of modules exists. Similar
3.63 +# to PKG_CHECK_MODULES(), but does not set variables or print errors.
3.64 +#
3.65 +#
3.66 +# Similar to PKG_CHECK_MODULES, make sure that the first instance of
3.67 +# this or PKG_CHECK_MODULES is called, or make sure to call
3.68 +# PKG_CHECK_EXISTS manually
3.69 +# --------------------------------------------------------------
3.70 +AC_DEFUN([PKG_CHECK_EXISTS],
3.71 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
3.72 +if test -n "$PKG_CONFIG" && \
3.73 + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
3.74 + m4_ifval([$2], [$2], [:])
3.75 +m4_ifvaln([$3], [else
3.76 + $3])dnl
3.77 +fi])
3.78
3.79 - if test "$PKG_CONFIG" = "no" ; then
3.80 - echo "*** The pkg-config script could not be found. Make sure it is"
3.81 - echo "*** in your path, or set the PKG_CONFIG environment variable"
3.82 - echo "*** to the full path to pkg-config."
3.83 - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
3.84 - else
3.85 - PKG_CONFIG_MIN_VERSION=0.9.0
3.86 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
3.87 - AC_MSG_CHECKING(for $2)
3.88
3.89 - if $PKG_CONFIG --exists "$2" ; then
3.90 - AC_MSG_RESULT(yes)
3.91 - succeeded=yes
3.92 +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
3.93 +# ---------------------------------------------
3.94 +m4_define([_PKG_CONFIG],
3.95 +[if test -n "$PKG_CONFIG"; then
3.96 + if test -n "$$1"; then
3.97 + pkg_cv_[]$1="$$1"
3.98 + else
3.99 + PKG_CHECK_EXISTS([$3],
3.100 + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
3.101 + [pkg_failed=yes])
3.102 + fi
3.103 +else
3.104 + pkg_failed=untried
3.105 +fi[]dnl
3.106 +])# _PKG_CONFIG
3.107
3.108 - AC_MSG_CHECKING($1_CFLAGS)
3.109 - $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
3.110 - AC_MSG_RESULT($$1_CFLAGS)
3.111 +# _PKG_SHORT_ERRORS_SUPPORTED
3.112 +# -----------------------------
3.113 +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
3.114 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
3.115 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3.116 + _pkg_short_errors_supported=yes
3.117 +else
3.118 + _pkg_short_errors_supported=no
3.119 +fi[]dnl
3.120 +])# _PKG_SHORT_ERRORS_SUPPORTED
3.121
3.122 - AC_MSG_CHECKING($1_LIBS)
3.123 - $1_LIBS=`$PKG_CONFIG --libs "$2"`
3.124 - AC_MSG_RESULT($$1_LIBS)
3.125 - else
3.126 - $1_CFLAGS=""
3.127 - $1_LIBS=""
3.128 - ## If we have a custom action on failure, don't print errors, but
3.129 - ## do set a variable so people can do so.
3.130 - $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
3.131 - ifelse([$4], ,echo $$1_PKG_ERRORS,)
3.132 +
3.133 +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
3.134 +# [ACTION-IF-NOT-FOUND])
3.135 +#
3.136 +#
3.137 +# Note that if there is a possibility the first call to
3.138 +# PKG_CHECK_MODULES might not happen, you should be sure to include an
3.139 +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
3.140 +#
3.141 +#
3.142 +# --------------------------------------------------------------
3.143 +AC_DEFUN([PKG_CHECK_MODULES],
3.144 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
3.145 +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
3.146 +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
3.147 +
3.148 +pkg_failed=no
3.149 +AC_MSG_CHECKING([for $1])
3.150 +
3.151 +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
3.152 +_PKG_CONFIG([$1][_LIBS], [libs], [$2])
3.153 +
3.154 +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
3.155 +and $1[]_LIBS to avoid the need to call pkg-config.
3.156 +See the pkg-config man page for more details.])
3.157 +
3.158 +if test $pkg_failed = yes; then
3.159 + _PKG_SHORT_ERRORS_SUPPORTED
3.160 + if test $_pkg_short_errors_supported = yes; then
3.161 + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
3.162 + else
3.163 + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
3.164 fi
3.165 + # Put the nasty error message in config.log where it belongs
3.166 + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
3.167
3.168 - AC_SUBST($1_CFLAGS)
3.169 - AC_SUBST($1_LIBS)
3.170 - else
3.171 - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
3.172 - echo "*** See http://www.freedesktop.org/software/pkgconfig"
3.173 - fi
3.174 - fi
3.175 + ifelse([$4], , [AC_MSG_ERROR(dnl
3.176 +[Package requirements ($2) were not met:
3.177
3.178 - if test $succeeded = yes; then
3.179 - ifelse([$3], , :, [$3])
3.180 - else
3.181 - ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
3.182 - fi
3.183 -])
3.184 +$$1_PKG_ERRORS
3.185
3.186 +Consider adjusting the PKG_CONFIG_PATH environment variable if you
3.187 +installed software in a non-standard prefix.
3.188
3.189 +_PKG_TEXT
3.190 +])],
3.191 + [$4])
3.192 +elif test $pkg_failed = untried; then
3.193 + ifelse([$4], , [AC_MSG_FAILURE(dnl
3.194 +[The pkg-config script could not be found or is too old. Make sure it
3.195 +is in your PATH or set the PKG_CONFIG environment variable to the full
3.196 +path to pkg-config.
3.197 +
3.198 +_PKG_TEXT
3.199 +
3.200 +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
3.201 + [$4])
3.202 +else
3.203 + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
3.204 + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
3.205 + AC_MSG_RESULT([yes])
3.206 + ifelse([$3], , :, [$3])
3.207 +fi[]dnl
3.208 +])# PKG_CHECK_MODULES
3.209
3.210 # Copyright (C) 1995-2002 Free Software Foundation, Inc.
3.211 # Copyright (C) 2001-2003,2004 Red Hat, Inc.
4.1 --- a/configure Tue Jun 27 14:02:27 2006 +0000
4.2 +++ b/configure Sun Jul 02 04:59:00 2006 +0000
4.3 @@ -309,7 +309,7 @@
4.4 # include <unistd.h>
4.5 #endif"
4.6
4.7 -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP PKG_CONFIG PACKAGE_CFLAGS PACKAGE_LIBS GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS LIBOBJS LTLIBOBJS'
4.8 +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP PKG_CONFIG ac_pt_PKG_CONFIG PACKAGE_CFLAGS PACKAGE_LIBS GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS LIBOBJS LTLIBOBJS'
4.9 ac_subst_files=''
4.10
4.11 # Initialize some variables set by options.
4.12 @@ -770,6 +770,18 @@
4.13 ac_env_CPP_value=$CPP
4.14 ac_cv_env_CPP_set=${CPP+set}
4.15 ac_cv_env_CPP_value=$CPP
4.16 +ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
4.17 +ac_env_PKG_CONFIG_value=$PKG_CONFIG
4.18 +ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
4.19 +ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
4.20 +ac_env_PACKAGE_CFLAGS_set=${PACKAGE_CFLAGS+set}
4.21 +ac_env_PACKAGE_CFLAGS_value=$PACKAGE_CFLAGS
4.22 +ac_cv_env_PACKAGE_CFLAGS_set=${PACKAGE_CFLAGS+set}
4.23 +ac_cv_env_PACKAGE_CFLAGS_value=$PACKAGE_CFLAGS
4.24 +ac_env_PACKAGE_LIBS_set=${PACKAGE_LIBS+set}
4.25 +ac_env_PACKAGE_LIBS_value=$PACKAGE_LIBS
4.26 +ac_cv_env_PACKAGE_LIBS_set=${PACKAGE_LIBS+set}
4.27 +ac_cv_env_PACKAGE_LIBS_value=$PACKAGE_LIBS
4.28
4.29 #
4.30 # Report the --help message.
4.31 @@ -858,6 +870,11 @@
4.32 CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
4.33 headers in a nonstandard directory <include dir>
4.34 CPP C preprocessor
4.35 + PKG_CONFIG path to pkg-config utility
4.36 + PACKAGE_CFLAGS
4.37 + C compiler flags for PACKAGE, overriding pkg-config
4.38 + PACKAGE_LIBS
4.39 + linker flags for PACKAGE, overriding pkg-config
4.40
4.41 Use these variables to override the choices made by `configure' or to help
4.42 it to find libraries and programs with nonstandard names/locations.
4.43 @@ -4239,11 +4256,11 @@
4.44
4.45
4.46
4.47 - succeeded=no
4.48 -
4.49 - if test -z "$PKG_CONFIG"; then
4.50 - # Extract the first word of "pkg-config", so it can be a program name with args.
4.51 -set dummy pkg-config; ac_word=$2
4.52 +
4.53 +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
4.54 + if test -n "$ac_tool_prefix"; then
4.55 + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
4.56 +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
4.57 echo "$as_me:$LINENO: checking for $ac_word" >&5
4.58 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
4.59 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
4.60 @@ -4268,7 +4285,6 @@
4.61 done
4.62 done
4.63
4.64 - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
4.65 ;;
4.66 esac
4.67 fi
4.68 @@ -4282,60 +4298,179 @@
4.69 echo "${ECHO_T}no" >&6
4.70 fi
4.71
4.72 - fi
4.73 -
4.74 - if test "$PKG_CONFIG" = "no" ; then
4.75 - echo "*** The pkg-config script could not be found. Make sure it is"
4.76 - echo "*** in your path, or set the PKG_CONFIG environment variable"
4.77 - echo "*** to the full path to pkg-config."
4.78 - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
4.79 - else
4.80 - PKG_CONFIG_MIN_VERSION=0.9.0
4.81 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
4.82 - echo "$as_me:$LINENO: checking for libgnomeui-2.0 esound " >&5
4.83 -echo $ECHO_N "checking for libgnomeui-2.0 esound ... $ECHO_C" >&6
4.84 -
4.85 - if $PKG_CONFIG --exists " libgnomeui-2.0 esound " ; then
4.86 - echo "$as_me:$LINENO: result: yes" >&5
4.87 +fi
4.88 +if test -z "$ac_cv_path_PKG_CONFIG"; then
4.89 + ac_pt_PKG_CONFIG=$PKG_CONFIG
4.90 + # Extract the first word of "pkg-config", so it can be a program name with args.
4.91 +set dummy pkg-config; ac_word=$2
4.92 +echo "$as_me:$LINENO: checking for $ac_word" >&5
4.93 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
4.94 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
4.95 + echo $ECHO_N "(cached) $ECHO_C" >&6
4.96 +else
4.97 + case $ac_pt_PKG_CONFIG in
4.98 + [\\/]* | ?:[\\/]*)
4.99 + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
4.100 + ;;
4.101 + *)
4.102 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4.103 +for as_dir in $PATH
4.104 +do
4.105 + IFS=$as_save_IFS
4.106 + test -z "$as_dir" && as_dir=.
4.107 + for ac_exec_ext in '' $ac_executable_extensions; do
4.108 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4.109 + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
4.110 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4.111 + break 2
4.112 + fi
4.113 +done
4.114 +done
4.115 +
4.116 + ;;
4.117 +esac
4.118 +fi
4.119 +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
4.120 +
4.121 +if test -n "$ac_pt_PKG_CONFIG"; then
4.122 + echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
4.123 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
4.124 +else
4.125 + echo "$as_me:$LINENO: result: no" >&5
4.126 +echo "${ECHO_T}no" >&6
4.127 +fi
4.128 +
4.129 + PKG_CONFIG=$ac_pt_PKG_CONFIG
4.130 +else
4.131 + PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
4.132 +fi
4.133 +
4.134 +fi
4.135 +if test -n "$PKG_CONFIG"; then
4.136 + _pkg_min_version=0.9.0
4.137 + echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
4.138 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
4.139 + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
4.140 + echo "$as_me:$LINENO: result: yes" >&5
4.141 echo "${ECHO_T}yes" >&6
4.142 - succeeded=yes
4.143 -
4.144 - echo "$as_me:$LINENO: checking PACKAGE_CFLAGS" >&5
4.145 -echo $ECHO_N "checking PACKAGE_CFLAGS... $ECHO_C" >&6
4.146 - PACKAGE_CFLAGS=`$PKG_CONFIG --cflags " libgnomeui-2.0 esound "`
4.147 - echo "$as_me:$LINENO: result: $PACKAGE_CFLAGS" >&5
4.148 -echo "${ECHO_T}$PACKAGE_CFLAGS" >&6
4.149 -
4.150 - echo "$as_me:$LINENO: checking PACKAGE_LIBS" >&5
4.151 -echo $ECHO_N "checking PACKAGE_LIBS... $ECHO_C" >&6
4.152 - PACKAGE_LIBS=`$PKG_CONFIG --libs " libgnomeui-2.0 esound "`
4.153 - echo "$as_me:$LINENO: result: $PACKAGE_LIBS" >&5
4.154 -echo "${ECHO_T}$PACKAGE_LIBS" >&6
4.155 + else
4.156 + echo "$as_me:$LINENO: result: no" >&5
4.157 +echo "${ECHO_T}no" >&6
4.158 + PKG_CONFIG=""
4.159 + fi
4.160 +
4.161 +fi
4.162 +
4.163 +pkg_failed=no
4.164 +echo "$as_me:$LINENO: checking for PACKAGE" >&5
4.165 +echo $ECHO_N "checking for PACKAGE... $ECHO_C" >&6
4.166 +
4.167 +if test -n "$PKG_CONFIG"; then
4.168 + if test -n "$PACKAGE_CFLAGS"; then
4.169 + pkg_cv_PACKAGE_CFLAGS="$PACKAGE_CFLAGS"
4.170 + else
4.171 + if test -n "$PKG_CONFIG" && \
4.172 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libgnomeui-2.0 esound \"") >&5
4.173 + ($PKG_CONFIG --exists --print-errors " libgnomeui-2.0 esound ") 2>&5
4.174 + ac_status=$?
4.175 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4.176 + (exit $ac_status); }; then
4.177 + pkg_cv_PACKAGE_CFLAGS=`$PKG_CONFIG --cflags " libgnomeui-2.0 esound " 2>/dev/null`
4.178 +else
4.179 + pkg_failed=yes
4.180 +fi
4.181 + fi
4.182 +else
4.183 + pkg_failed=untried
4.184 +fi
4.185 +if test -n "$PKG_CONFIG"; then
4.186 + if test -n "$PACKAGE_LIBS"; then
4.187 + pkg_cv_PACKAGE_LIBS="$PACKAGE_LIBS"
4.188 + else
4.189 + if test -n "$PKG_CONFIG" && \
4.190 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libgnomeui-2.0 esound \"") >&5
4.191 + ($PKG_CONFIG --exists --print-errors " libgnomeui-2.0 esound ") 2>&5
4.192 + ac_status=$?
4.193 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4.194 + (exit $ac_status); }; then
4.195 + pkg_cv_PACKAGE_LIBS=`$PKG_CONFIG --libs " libgnomeui-2.0 esound " 2>/dev/null`
4.196 +else
4.197 + pkg_failed=yes
4.198 +fi
4.199 + fi
4.200 +else
4.201 + pkg_failed=untried
4.202 +fi
4.203 +
4.204 +
4.205 +
4.206 +if test $pkg_failed = yes; then
4.207 +
4.208 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
4.209 + _pkg_short_errors_supported=yes
4.210 +else
4.211 + _pkg_short_errors_supported=no
4.212 +fi
4.213 + if test $_pkg_short_errors_supported = yes; then
4.214 + PACKAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " libgnomeui-2.0 esound "`
4.215 else
4.216 - PACKAGE_CFLAGS=""
4.217 - PACKAGE_LIBS=""
4.218 - ## If we have a custom action on failure, don't print errors, but
4.219 - ## do set a variable so people can do so.
4.220 - PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " libgnomeui-2.0 esound "`
4.221 - echo $PACKAGE_PKG_ERRORS
4.222 + PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " libgnomeui-2.0 esound "`
4.223 fi
4.224 -
4.225 -
4.226 -
4.227 - else
4.228 - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
4.229 - echo "*** See http://www.freedesktop.org/software/pkgconfig"
4.230 - fi
4.231 - fi
4.232 -
4.233 - if test $succeeded = yes; then
4.234 - :
4.235 - else
4.236 - { { echo "$as_me:$LINENO: error: Library requirements ( libgnomeui-2.0 esound ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
4.237 -echo "$as_me: error: Library requirements ( libgnomeui-2.0 esound ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
4.238 - { (exit 1); exit 1; }; }
4.239 - fi
4.240 -
4.241 + # Put the nasty error message in config.log where it belongs
4.242 + echo "$PACKAGE_PKG_ERRORS" >&5
4.243 +
4.244 + { { echo "$as_me:$LINENO: error: Package requirements ( libgnomeui-2.0 esound ) were not met:
4.245 +
4.246 +$PACKAGE_PKG_ERRORS
4.247 +
4.248 +Consider adjusting the PKG_CONFIG_PATH environment variable if you
4.249 +installed software in a non-standard prefix.
4.250 +
4.251 +Alternatively, you may set the environment variables PACKAGE_CFLAGS
4.252 +and PACKAGE_LIBS to avoid the need to call pkg-config.
4.253 +See the pkg-config man page for more details.
4.254 +" >&5
4.255 +echo "$as_me: error: Package requirements ( libgnomeui-2.0 esound ) were not met:
4.256 +
4.257 +$PACKAGE_PKG_ERRORS
4.258 +
4.259 +Consider adjusting the PKG_CONFIG_PATH environment variable if you
4.260 +installed software in a non-standard prefix.
4.261 +
4.262 +Alternatively, you may set the environment variables PACKAGE_CFLAGS
4.263 +and PACKAGE_LIBS to avoid the need to call pkg-config.
4.264 +See the pkg-config man page for more details.
4.265 +" >&2;}
4.266 + { (exit 1); exit 1; }; }
4.267 +elif test $pkg_failed = untried; then
4.268 + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
4.269 +is in your PATH or set the PKG_CONFIG environment variable to the full
4.270 +path to pkg-config.
4.271 +
4.272 +Alternatively, you may set the environment variables PACKAGE_CFLAGS
4.273 +and PACKAGE_LIBS to avoid the need to call pkg-config.
4.274 +See the pkg-config man page for more details.
4.275 +
4.276 +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
4.277 +See \`config.log' for more details." >&5
4.278 +echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
4.279 +is in your PATH or set the PKG_CONFIG environment variable to the full
4.280 +path to pkg-config.
4.281 +
4.282 +Alternatively, you may set the environment variables PACKAGE_CFLAGS
4.283 +and PACKAGE_LIBS to avoid the need to call pkg-config.
4.284 +See the pkg-config man page for more details.
4.285 +
4.286 +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
4.287 +See \`config.log' for more details." >&2;}
4.288 + { (exit 1); exit 1; }; }
4.289 +else
4.290 + PACKAGE_CFLAGS=$pkg_cv_PACKAGE_CFLAGS
4.291 + PACKAGE_LIBS=$pkg_cv_PACKAGE_LIBS
4.292 + echo "$as_me:$LINENO: result: yes" >&5
4.293 +echo "${ECHO_T}yes" >&6
4.294 + :
4.295 +fi
4.296
4.297
4.298
4.299 @@ -6046,6 +6181,9 @@
4.300 < $srcdir/po/POTFILES.in > po/POTFILES
4.301
4.302
4.303 +CFLAGS='-g3'
4.304 +
4.305 +
4.306 ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in"
4.307 cat >confcache <<\_ACEOF
4.308 # This file is a shell script that caches the results of configure
4.309 @@ -6743,6 +6881,7 @@
4.310 s,@CPP@,$CPP,;t t
4.311 s,@EGREP@,$EGREP,;t t
4.312 s,@PKG_CONFIG@,$PKG_CONFIG,;t t
4.313 +s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
4.314 s,@PACKAGE_CFLAGS@,$PACKAGE_CFLAGS,;t t
4.315 s,@PACKAGE_LIBS@,$PACKAGE_LIBS,;t t
4.316 s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
5.1 --- a/configure.in Tue Jun 27 14:02:27 2006 +0000
5.2 +++ b/configure.in Sun Jul 02 04:59:00 2006 +0000
5.3 @@ -26,6 +26,8 @@
5.4 ALL_LINGUAS=""
5.5 AM_GLIB_GNU_GETTEXT
5.6
5.7 +AC_SUBST( CFLAGS, '-g3' )
5.8 +
5.9 AC_OUTPUT([
5.10 Makefile
5.11 src/Makefile
6.1 --- a/dream.glade Tue Jun 27 14:02:27 2006 +0000
6.2 +++ b/dream.glade Sun Jul 02 04:59:00 2006 +0000
6.3 @@ -7,7 +7,7 @@
6.4
6.5 <widget class="GnomeApp" id="debug_win">
6.6 <property name="visible">True</property>
6.7 - <property name="title" translatable="yes">DreamOn! Debugger</property>
6.8 + <property name="title" translatable="yes">lxDream! Debugger</property>
6.9 <property name="type">GTK_WINDOW_TOPLEVEL</property>
6.10 <property name="window_position">GTK_WIN_POS_NONE</property>
6.11 <property name="modal">False</property>
6.12 @@ -896,7 +896,7 @@
6.13
6.14 <widget class="GtkWindow" id="mmr_win">
6.15 <property name="visible">True</property>
6.16 - <property name="title" translatable="yes">DreamOn! - Memory-Mapped Registers</property>
6.17 + <property name="title" translatable="yes">lxDream! - Memory-Mapped Registers</property>
6.18 <property name="type">GTK_WINDOW_TOPLEVEL</property>
6.19 <property name="window_position">GTK_WIN_POS_NONE</property>
6.20 <property name="modal">False</property>
7.1 --- a/src/Makefile.am Tue Jun 27 14:02:27 2006 +0000
7.2 +++ b/src/Makefile.am Sun Jul 02 04:59:00 2006 +0000
7.3 @@ -6,9 +6,9 @@
7.4 -Ish4 \
7.5 @PACKAGE_CFLAGS@
7.6
7.7 -bin_PROGRAMS = dream
7.8 +bin_PROGRAMS = lxdream
7.9
7.10 -dream_SOURCES = \
7.11 +lxdream_SOURCES = \
7.12 main.c \
7.13 mem.c mem.h mmio.h watch.c \
7.14 asic.c asic.h \
7.15 @@ -37,6 +37,6 @@
7.16 drivers/video_null.c drivers/video_gtk.c drivers/video_gtk.h \
7.17 drivers/video_x11.c drivers/video_x11.h
7.18
7.19 -dream_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -lesd
7.20 +lxdream_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -lesd
7.21
7.22 AM_CFLAGS = -D_ISOC99_SOURCE -D_BSD_SOURCE
8.1 --- a/src/Makefile.in Tue Jun 27 14:02:27 2006 +0000
8.2 +++ b/src/Makefile.in Sun Jul 02 04:59:00 2006 +0000
8.3 @@ -101,6 +101,7 @@
8.4 XGETTEXT = @XGETTEXT@
8.5 ac_ct_CC = @ac_ct_CC@
8.6 ac_ct_STRIP = @ac_ct_STRIP@
8.7 +ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
8.8 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
8.9 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
8.10 am__include = @am__include@
8.11 @@ -133,9 +134,9 @@
8.12 @PACKAGE_CFLAGS@
8.13
8.14
8.15 -bin_PROGRAMS = dream
8.16 +bin_PROGRAMS = lxdream
8.17
8.18 -dream_SOURCES = \
8.19 +lxdream_SOURCES = \
8.20 main.c \
8.21 mem.c mem.h mmio.h watch.c \
8.22 asic.c asic.h \
8.23 @@ -165,7 +166,7 @@
8.24 drivers/video_x11.c drivers/video_x11.h
8.25
8.26
8.27 -dream_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -lesd
8.28 +lxdream_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -lesd
8.29
8.30 AM_CFLAGS = -D_ISOC99_SOURCE -D_BSD_SOURCE
8.31 subdir = src
8.32 @@ -173,10 +174,10 @@
8.33 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
8.34 CONFIG_HEADER = $(top_builddir)/config.h
8.35 CONFIG_CLEAN_FILES =
8.36 -bin_PROGRAMS = dream$(EXEEXT)
8.37 +bin_PROGRAMS = lxdream$(EXEEXT)
8.38 PROGRAMS = $(bin_PROGRAMS)
8.39
8.40 -am_dream_OBJECTS = main.$(OBJEXT) mem.$(OBJEXT) watch.$(OBJEXT) \
8.41 +am_lxdream_OBJECTS = main.$(OBJEXT) mem.$(OBJEXT) watch.$(OBJEXT) \
8.42 asic.$(OBJEXT) syscall.$(OBJEXT) bios.$(OBJEXT) \
8.43 dcload.$(OBJEXT) ide.$(OBJEXT) gdrom.$(OBJEXT) nrg.$(OBJEXT) \
8.44 cdi.$(OBJEXT) dreamcast.$(OBJEXT) intc.$(OBJEXT) \
8.45 @@ -191,9 +192,9 @@
8.46 loader.$(OBJEXT) bootstrap.$(OBJEXT) util.$(OBJEXT) \
8.47 display.$(OBJEXT) audio_null.$(OBJEXT) audio_esd.$(OBJEXT) \
8.48 video_null.$(OBJEXT) video_gtk.$(OBJEXT) video_x11.$(OBJEXT)
8.49 -dream_OBJECTS = $(am_dream_OBJECTS)
8.50 -dream_DEPENDENCIES =
8.51 -dream_LDFLAGS =
8.52 +lxdream_OBJECTS = $(am_lxdream_OBJECTS)
8.53 +lxdream_DEPENDENCIES =
8.54 +lxdream_LDFLAGS =
8.55
8.56 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
8.57 depcomp = $(SHELL) $(top_srcdir)/depcomp
8.58 @@ -226,9 +227,9 @@
8.59 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
8.60 CCLD = $(CC)
8.61 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
8.62 -DIST_SOURCES = $(dream_SOURCES)
8.63 +DIST_SOURCES = $(lxdream_SOURCES)
8.64 DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
8.65 -SOURCES = $(dream_SOURCES)
8.66 +SOURCES = $(lxdream_SOURCES)
8.67
8.68 all: all-am
8.69
8.70 @@ -263,9 +264,9 @@
8.71
8.72 clean-binPROGRAMS:
8.73 -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
8.74 -dream$(EXEEXT): $(dream_OBJECTS) $(dream_DEPENDENCIES)
8.75 - @rm -f dream$(EXEEXT)
8.76 - $(LINK) $(dream_LDFLAGS) $(dream_OBJECTS) $(dream_LDADD) $(LIBS)
8.77 +lxdream$(EXEEXT): $(lxdream_OBJECTS) $(lxdream_DEPENDENCIES)
8.78 + @rm -f lxdream$(EXEEXT)
8.79 + $(LINK) $(lxdream_LDFLAGS) $(lxdream_OBJECTS) $(lxdream_LDADD) $(LIBS)
8.80
8.81 mostlyclean-compile:
8.82 -rm -f *.$(OBJEXT) core *.core
9.1 --- a/src/dream.h Tue Jun 27 14:02:27 2006 +0000
9.2 +++ b/src/dream.h Sun Jul 02 04:59:00 2006 +0000
9.3 @@ -1,5 +1,5 @@
9.4 /**
9.5 - * $Id: dream.h,v 1.9 2006-04-30 01:48:38 nkeynes Exp $
9.6 + * $Id: dream.h,v 1.10 2006-07-02 04:59:00 nkeynes Exp $
9.7 *
9.8 * Miscellaneous application-wide declarations (mainly logging atm)
9.9 *
9.10 @@ -29,6 +29,8 @@
9.11 extern "C" {
9.12 #endif
9.13
9.14 +#define APP_NAME "lxDream"
9.15 +
9.16 /************************ Modules ********************************/
9.17 /**
9.18 * Basic module structure defining the common operations across all
9.19 @@ -38,7 +40,7 @@
9.20 char *name;
9.21 /**
9.22 * Perform all initial module setup (ie register / allocate any
9.23 - * memory required, etc). Only called once during DreamOn startup
9.24 + * memory required, etc). Only called once during system startup
9.25 */
9.26 void (*init)();
9.27 /**
9.28 @@ -108,8 +110,6 @@
9.29 #define DEBUG( ... ) emit( NULL, EMIT_DEBUG, MODULE.name, __VA_ARGS__ )
9.30 #define TRACE( ... ) emit( NULL, EMIT_TRACE, MODULE.name, __VA_ARGS__ )
9.31
9.32 -#define BIOS_PATH "../bios"
9.33 -
9.34 void fwrite_string( char *s, FILE *f );
9.35 int fread_string( char *s, int maxlen, FILE *f );
9.36 void fwrite_dump( unsigned char *buf, unsigned int length, FILE *f );
10.1 --- a/src/dreamcast.c Tue Jun 27 14:02:27 2006 +0000
10.2 +++ b/src/dreamcast.c Sun Jul 02 04:59:00 2006 +0000
10.3 @@ -1,5 +1,5 @@
10.4 /**
10.5 - * $Id: dreamcast.c,v 1.17 2006-06-19 11:00:40 nkeynes Exp $
10.6 + * $Id: dreamcast.c,v 1.18 2006-07-02 04:59:00 nkeynes Exp $
10.7 * Central switchboard for the system. This pulls all the individual modules
10.8 * together into some kind of coherent structure. This is also where you'd
10.9 * add Naomi support, if I ever get a board to play with...
10.10 @@ -66,8 +66,11 @@
10.11 mem_create_ram_region( 0x00800000, 2 MB, MEM_REGION_AUDIO );
10.12 mem_create_ram_region( 0x00703000, 8 KB, MEM_REGION_AUDIO_SCRATCH );
10.13 mem_create_ram_region( 0x05000000, 8 MB, MEM_REGION_VIDEO );
10.14 - mem_load_rom( dreamcast_get_config_value(CONFIG_BIOS_PATH),
10.15 - 0x00000000, 0x00200000, 0x89f2b1a1 );
10.16 + if( mem_load_rom( dreamcast_get_config_value(CONFIG_BIOS_PATH),
10.17 + 0x00000000, 0x00200000, 0x89f2b1a1 ) == NULL ) {
10.18 + /* Bios wasn't found. Dump an empty ram region in there for something to do */
10.19 + mem_create_ram_region( 0x00000000, 0x00200000, MEM_REGION_BIOS );
10.20 + }
10.21 mem_create_ram_region( 0x00200000, 0x00020000, MEM_REGION_FLASH );
10.22 mem_load_block( dreamcast_get_config_value(CONFIG_FLASH_PATH),
10.23 0x00200000, 0x00020000 );
10.24 @@ -354,7 +357,7 @@
10.25
10.26 /********************************* Save States *****************************/
10.27
10.28 -#define DREAMCAST_SAVE_MAGIC "%!-DreamOn!Save\0"
10.29 +#define DREAMCAST_SAVE_MAGIC "%!-lxDream!Save\0"
10.30 #define DREAMCAST_SAVE_VERSION 0x00010000
10.31
10.32 struct save_state_header {
10.33 @@ -377,15 +380,15 @@
10.34
10.35 fread( &header, sizeof(header), 1, f );
10.36 if( strncmp( header.magic, DREAMCAST_SAVE_MAGIC, 16 ) != 0 ) {
10.37 - ERROR( "Not a DreamOn save state file" );
10.38 + ERROR( "Not a %s save state file", APP_NAME );
10.39 return 1;
10.40 }
10.41 if( header.version != DREAMCAST_SAVE_VERSION ) {
10.42 - ERROR( "DreamOn save state version not supported" );
10.43 + ERROR( "%s save state version not supported", APP_NAME );
10.44 return 1;
10.45 }
10.46 if( header.module_count > MAX_MODULES ) {
10.47 - ERROR( "DreamOn save state is corrupted (bad module count)" );
10.48 + ERROR( "%s save state is corrupted (bad module count)", APP_NAME );
10.49 return 1;
10.50 }
10.51 for( i=0; i<MAX_MODULES; i++ ) {
10.52 @@ -395,12 +398,12 @@
10.53 for( i=0; i<header.module_count; i++ ) {
10.54 fread(tmp, 4, 1, f );
10.55 if( strncmp(tmp, "BLCK", 4) != 0 ) {
10.56 - ERROR( "DreamOn save state is corrupted (missing block header %d)", i );
10.57 + ERROR( "%s save state is corrupted (missing block header %d)", APP_NAME, i );
10.58 return 2;
10.59 }
10.60 len = fread_string(tmp, sizeof(tmp), f );
10.61 if( len > 64 || len < 1 ) {
10.62 - ERROR( "DreamOn save state is corrupted (bad string)" );
10.63 + ERROR( "%s save state is corrupted (bad string)", APP_NAME );
10.64 return 2;
10.65 }
10.66
10.67 @@ -409,17 +412,17 @@
10.68 if( strcmp(modules[j]->name,tmp) == 0 ) {
10.69 have_read[j] = 1;
10.70 if( modules[j]->load == NULL ) {
10.71 - ERROR( "DreamOn save state is corrupted (no loader for %s)", modules[j]->name );
10.72 + ERROR( "%s save state is corrupted (no loader for %s)", APP_NAME, modules[j]->name );
10.73 return 2;
10.74 } else if( modules[j]->load(f) != 0 ) {
10.75 - ERROR( "DreamOn save state is corrupted (%s failed)", modules[j]->name );
10.76 + ERROR( "%s save state is corrupted (%s failed)", APP_NAME, modules[j]->name );
10.77 return 2;
10.78 }
10.79 break;
10.80 }
10.81 }
10.82 if( j == num_modules ) {
10.83 - ERROR( "DreamOn save state contains unrecognized section" );
10.84 + ERROR( "%s save state contains unrecognized section", APP_NAME );
10.85 return 2;
10.86 }
10.87 }
11.1 --- a/src/dreamcast.h Tue Jun 27 14:02:27 2006 +0000
11.2 +++ b/src/dreamcast.h Sun Jul 02 04:59:00 2006 +0000
11.3 @@ -1,5 +1,5 @@
11.4 /**
11.5 - * $Id: dreamcast.h,v 1.10 2006-06-19 11:00:40 nkeynes Exp $
11.6 + * $Id: dreamcast.h,v 1.11 2006-07-02 04:59:00 nkeynes Exp $
11.7 *
11.8 * Public interface for dreamcast.c -
11.9 * Central switchboard for the system. This pulls all the individual modules
11.10 @@ -35,7 +35,7 @@
11.11 #define CONFIG_TYPE_PATH 2
11.12 #define CONFIG_TYPE_KEY 3
11.13
11.14 -#define DEFAULT_CONFIG_FILENAME "dream.conf"
11.15 +#define DEFAULT_CONFIG_FILENAME "lxdream.rc"
11.16
11.17 typedef struct dreamcast_config_entry {
11.18 const gchar *key;
12.1 --- a/src/drivers/audio_esd.c Tue Jun 27 14:02:27 2006 +0000
12.2 +++ b/src/drivers/audio_esd.c Sun Jul 02 04:59:00 2006 +0000
12.3 @@ -1,5 +1,5 @@
12.4 /**
12.5 - * $Id: audio_esd.c,v 1.7 2006-03-16 12:41:56 nkeynes Exp $
12.6 + * $Id: audio_esd.c,v 1.8 2006-07-02 04:59:00 nkeynes Exp $
12.7 *
12.8 * The esd (esound) audio driver
12.9 *
12.10 @@ -37,7 +37,7 @@
12.11 }
12.12 else esd_format |= ESD_MONO;
12.13
12.14 - esd_handle = esd_play_stream( esd_format, rate, "localhost", "dreamon" );
12.15 + esd_handle = esd_play_stream( esd_format, rate, "localhost", "lxdream" );
12.16 if( esd_handle == -1 ) {
12.17 ERROR( "Unable to open audio output (ESD)" );
12.18 return FALSE;
13.1 --- a/src/drivers/video_gtk.c Tue Jun 27 14:02:27 2006 +0000
13.2 +++ b/src/drivers/video_gtk.c Sun Jul 02 04:59:00 2006 +0000
13.3 @@ -1,5 +1,5 @@
13.4 /**
13.5 - * $Id: video_gtk.c,v 1.7 2006-06-18 11:55:25 nkeynes Exp $
13.6 + * $Id: video_gtk.c,v 1.8 2006-07-02 04:59:00 nkeynes Exp $
13.7 *
13.8 * The PC side of the video support (responsible for actually displaying /
13.9 * rendering frames)
13.10 @@ -20,6 +20,7 @@
13.11 #include <gnome.h>
13.12 #include <gdk/gdkx.h>
13.13 #include <stdint.h>
13.14 +#include "dream.h"
13.15 #include "display.h"
13.16 #include "drivers/video_x11.h"
13.17
13.18 @@ -77,7 +78,7 @@
13.19 video_height = height;
13.20 if( video_win == NULL ) {
13.21 video_win = GTK_WINDOW(gtk_window_new( GTK_WINDOW_TOPLEVEL ));
13.22 - gtk_window_set_title( video_win, "DreamOn! - Emulation Window" );
13.23 + gtk_window_set_title( video_win, APP_NAME " - Emulation Window" );
13.24 gtk_window_set_policy( video_win, FALSE, FALSE, FALSE );
13.25 gtk_window_set_default_size( video_win, width, height );
13.26
14.1 --- a/src/gui/callbacks.c Tue Jun 27 14:02:27 2006 +0000
14.2 +++ b/src/gui/callbacks.c Sun Jul 02 04:59:00 2006 +0000
14.3 @@ -1,5 +1,5 @@
14.4 /**
14.5 - * $Id: callbacks.c,v 1.15 2006-06-19 11:00:42 nkeynes Exp $
14.6 + * $Id: callbacks.c,v 1.16 2006-07-02 04:59:00 nkeynes Exp $
14.7 *
14.8 * All GTK callbacks go here (stubs are autogenerated by Glade)
14.9 *
14.10 @@ -323,7 +323,7 @@
14.11 gpointer user_data)
14.12 {
14.13 const gchar *dir = dreamcast_get_config_value(CONFIG_SAVE_PATH);
14.14 - open_file_dialog( "Load state...", dreamcast_load_state, "*.dst", "DreamOn Save State (*.dst)", dir );
14.15 + open_file_dialog( "Load state...", dreamcast_load_state, "*.dst", "lxDream Save State (*.dst)", dir );
14.16 }
14.17
14.18
14.19 @@ -332,6 +332,6 @@
14.20 gpointer user_data)
14.21 {
14.22 const gchar *dir = dreamcast_get_config_value(CONFIG_SAVE_PATH);
14.23 - save_file_dialog( "Save state...", dreamcast_save_state, "*.dst", "DreamOn Save State (*.dst)", dir );
14.24 + save_file_dialog( "Save state...", dreamcast_save_state, "*.dst", "lxDream Save State (*.dst)", dir );
14.25 }
14.26
15.1 --- a/src/gui/interface.c Tue Jun 27 14:02:27 2006 +0000
15.2 +++ b/src/gui/interface.c Sun Jul 02 04:59:00 2006 +0000
15.3 @@ -151,7 +151,7 @@
15.4
15.5 tooltips = gtk_tooltips_new ();
15.6
15.7 - debug_win = gnome_app_new ("Dream", _("DreamOn! Debugger"));
15.8 + debug_win = gnome_app_new ("Dream", _("lxDream! Debugger"));
15.9 gtk_window_set_default_size (GTK_WINDOW (debug_win), 1000, 700);
15.10
15.11 dock1 = GNOME_APP (debug_win)->dock;
15.12 @@ -502,7 +502,7 @@
15.13 GtkWidget *mmr_close;
15.14
15.15 mmr_win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
15.16 - gtk_window_set_title (GTK_WINDOW (mmr_win), _("DreamOn! - Memory-Mapped Registers"));
15.17 + gtk_window_set_title (GTK_WINDOW (mmr_win), _("lxDream! - Memory-Mapped Registers"));
15.18 gtk_window_set_default_size (GTK_WINDOW (mmr_win), 600, 600);
15.19
15.20 vbox1 = gtk_vbox_new (FALSE, 0);
16.1 --- a/src/loader.c Tue Jun 27 14:02:27 2006 +0000
16.2 +++ b/src/loader.c Sun Jul 02 04:59:00 2006 +0000
16.3 @@ -1,5 +1,5 @@
16.4 /**
16.5 - * $Id: loader.c,v 1.13 2006-06-27 09:34:27 nkeynes Exp $
16.6 + * $Id: loader.c,v 1.14 2006-07-02 04:59:00 nkeynes Exp $
16.7 *
16.8 * File loading routines, mostly for loading demos without going through the
16.9 * whole procedure of making a CD image for them.
16.10 @@ -114,8 +114,12 @@
16.11 /* Load in a bootstrap before the binary, to initialize everything
16.12 * correctly
16.13 */
16.14 - mem_load_block( bootstrap_file, BOOTSTRAP_LOAD_ADDR, BOOTSTRAP_SIZE );
16.15 - sh4_set_pc( BOOTSTRAP_LOAD_ADDR + 0x300 );
16.16 + if( mem_load_block( bootstrap_file, BOOTSTRAP_LOAD_ADDR, BOOTSTRAP_SIZE ) != 0 ) {
16.17 + /* Try it without the bootstrap */
16.18 + sh4_set_pc( pc );
16.19 + } else {
16.20 + sh4_set_pc( BOOTSTRAP_LOAD_ADDR + 0x300 );
16.21 + }
16.22 } else {
16.23 sh4_set_pc( pc );
16.24 }
16.25 @@ -165,5 +169,5 @@
16.26 }
16.27 }
16.28
16.29 - file_load_postload( head.e_entry );
16.30 + return file_load_postload( head.e_entry );
16.31 }
17.1 --- a/src/main.c Tue Jun 27 14:02:27 2006 +0000
17.2 +++ b/src/main.c Sun Jul 02 04:59:00 2006 +0000
17.3 @@ -1,5 +1,5 @@
17.4 /**
17.5 - * $Id: main.c,v 1.17 2006-05-15 08:28:48 nkeynes Exp $
17.6 + * $Id: main.c,v 1.18 2006-07-02 04:59:00 nkeynes Exp $
17.7 *
17.8 * Main program, initializes dreamcast and gui, then passes control off to
17.9 * the gtk main loop (currently).
17.10 @@ -100,7 +100,7 @@
17.11
17.12 if( aica_program == NULL ) {
17.13 if( !headless ) {
17.14 - gnome_init ("dreamon", VERSION, argc, argv);
17.15 + gnome_init ("lxdream", VERSION, argc, argv);
17.16 dreamcast_init();
17.17 dreamcast_register_module( &gtk_gui_module );
17.18 } else {
17.19 @@ -114,7 +114,7 @@
17.20 mem_load_block( s3m_file, 0x00810000, 2048*1024 - 0x10000 );
17.21 }
17.22 if( !headless ) {
17.23 - gnome_init ("dreamon", VERSION, argc, argv);
17.24 + gnome_init ("lxdream", VERSION, argc, argv);
17.25 dreamcast_register_module( &gtk_gui_module );
17.26 set_disassembly_cpu( main_debug, "ARM7" );
17.27 }
17.28 @@ -155,7 +155,7 @@
17.29 }
17.30
17.31 maple_reattach_all();
17.32 - INFO( "DreamOn! ready..." );
17.33 + INFO( "%s! ready...", APP_NAME );
17.34 if( optind < argc ) {
17.35 file_load_magic( argv[optind] );
17.36 }
18.1 --- a/src/mem.c Tue Jun 27 14:02:27 2006 +0000
18.2 +++ b/src/mem.c Sun Jul 02 04:59:00 2006 +0000
18.3 @@ -1,5 +1,5 @@
18.4 /**
18.5 - * $Id: mem.c,v 1.13 2006-06-15 10:25:42 nkeynes Exp $
18.6 + * $Id: mem.c,v 1.14 2006-07-02 04:59:00 nkeynes Exp $
18.7 * mem.c is responsible for creating and maintaining the overall system memory
18.8 * map, as visible from the SH4 processor.
18.9 *
18.10 @@ -197,8 +197,10 @@
18.11 struct stat st;
18.12 FILE *f = fopen(file,"r");
18.13
18.14 - if( f == NULL )
18.15 - return errno;
18.16 + if( f == NULL ) {
18.17 + ERROR( "Unable to load file '%s': %s", file, strerror(errno) );
18.18 + return -1;
18.19 + }
18.20 fstat( fileno(f), &st );
18.21 if( length == 0 || length == -1 || length > st.st_size )
18.22 length = st.st_size;
18.23 @@ -266,13 +268,12 @@
18.24
18.25 void *mem_load_rom( char *file, uint32_t base, uint32_t size, uint32_t crc )
18.26 {
18.27 - char buf[512], *mem;
18.28 + char *mem;
18.29 int fd;
18.30 uint32_t calc_crc;
18.31 - snprintf( buf, 512, "%s/%s",BIOS_PATH, file );
18.32 - fd = open( buf, O_RDONLY );
18.33 + fd = open( file, O_RDONLY );
18.34 if( fd == -1 ) {
18.35 - ERROR( "Bios file not found: %s", buf );
18.36 + ERROR( "Bios file not found: %s", file );
18.37 return NULL;
18.38 }
18.39 mem = mmap( NULL, size, PROT_READ, MAP_PRIVATE, fd, 0 );
19.1 --- a/src/mem.h Tue Jun 27 14:02:27 2006 +0000
19.2 +++ b/src/mem.h Sun Jul 02 04:59:00 2006 +0000
19.3 @@ -1,5 +1,5 @@
19.4 /**
19.5 - * $Id: mem.h,v 1.9 2006-06-15 10:25:42 nkeynes Exp $
19.6 + * $Id: mem.h,v 1.10 2006-07-02 04:59:00 nkeynes Exp $
19.7 *
19.8 * mem is responsible for creating and maintaining the overall system memory
19.9 * map, as visible from the SH4 processor. (Note the ARM has a different map)
19.10 @@ -38,6 +38,7 @@
19.11 #define MAX_IO_REGIONS 24
19.12 #define MAX_MEM_REGIONS 8
19.13
19.14 +#define MEM_REGION_BIOS "Bios ROM"
19.15 #define MEM_REGION_MAIN "System RAM"
19.16 #define MEM_REGION_VIDEO "Video RAM"
19.17 #define MEM_REGION_AUDIO "Audio RAM"
20.1 --- a/src/sh4/Makefile.am Tue Jun 27 14:02:27 2006 +0000
20.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
20.3 @@ -1,10 +0,0 @@
20.4 -## Process this file with automake to produce Makefile.in
20.5 -
20.6 -INCLUDES = \
20.7 - -I$(top_srcdir)/intl -I$(top_srcdir)/src
20.8 -
20.9 -noinst_LIBRARIES = libsh4.a
20.10 -libsh4_a_SOURCES = mem.c mem.h sh4core.c sh4core.h sh4dasm.c sh4dasm.h \
20.11 - sh4mmio.c sh4mmio.h mmio.h intc.c intc.h
20.12 -
20.13 -AM_CFLAGS = -D_ISOC99_SOURCE -D_BSD_SOURCE
21.1 --- a/src/sh4/Makefile.in Tue Jun 27 14:02:27 2006 +0000
21.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
21.3 @@ -1,438 +0,0 @@
21.4 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
21.5 -# @configure_input@
21.6 -
21.7 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
21.8 -# Free Software Foundation, Inc.
21.9 -# This Makefile.in is free software; the Free Software Foundation
21.10 -# gives unlimited permission to copy and/or distribute it,
21.11 -# with or without modifications, as long as this notice is preserved.
21.12 -
21.13 -# This program is distributed in the hope that it will be useful,
21.14 -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
21.15 -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
21.16 -# PARTICULAR PURPOSE.
21.17 -
21.18 -@SET_MAKE@
21.19 -
21.20 -srcdir = @srcdir@
21.21 -top_srcdir = @top_srcdir@
21.22 -VPATH = @srcdir@
21.23 -pkgdatadir = $(datadir)/@PACKAGE@
21.24 -pkglibdir = $(libdir)/@PACKAGE@
21.25 -pkgincludedir = $(includedir)/@PACKAGE@
21.26 -top_builddir = ../..
21.27 -
21.28 -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
21.29 -INSTALL = @INSTALL@
21.30 -install_sh_DATA = $(install_sh) -c -m 644
21.31 -install_sh_PROGRAM = $(install_sh) -c
21.32 -install_sh_SCRIPT = $(install_sh) -c
21.33 -INSTALL_HEADER = $(INSTALL_DATA)
21.34 -transform = $(program_transform_name)
21.35 -NORMAL_INSTALL = :
21.36 -PRE_INSTALL = :
21.37 -POST_INSTALL = :
21.38 -NORMAL_UNINSTALL = :
21.39 -PRE_UNINSTALL = :
21.40 -POST_UNINSTALL = :
21.41 -host_triplet = @host@
21.42 -ACLOCAL = @ACLOCAL@
21.43 -ALLOCA = @ALLOCA@
21.44 -AMDEP_FALSE = @AMDEP_FALSE@
21.45 -AMDEP_TRUE = @AMDEP_TRUE@
21.46 -AMTAR = @AMTAR@
21.47 -AUTOCONF = @AUTOCONF@
21.48 -AUTOHEADER = @AUTOHEADER@
21.49 -AUTOMAKE = @AUTOMAKE@
21.50 -AWK = @AWK@
21.51 -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
21.52 -CATOBJEXT = @CATOBJEXT@
21.53 -CC = @CC@
21.54 -CCDEPMODE = @CCDEPMODE@
21.55 -CFLAGS = @CFLAGS@
21.56 -CPP = @CPP@
21.57 -CPPFLAGS = @CPPFLAGS@
21.58 -CYGPATH_W = @CYGPATH_W@
21.59 -DATADIRNAME = @DATADIRNAME@
21.60 -DEFS = @DEFS@
21.61 -DEPDIR = @DEPDIR@
21.62 -ECHO_C = @ECHO_C@
21.63 -ECHO_N = @ECHO_N@
21.64 -ECHO_T = @ECHO_T@
21.65 -EGREP = @EGREP@
21.66 -EXEEXT = @EXEEXT@
21.67 -GENCAT = @GENCAT@
21.68 -GLIBC21 = @GLIBC21@
21.69 -GMSGFMT = @GMSGFMT@
21.70 -GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@
21.71 -GNOMEUI_LIBS = @GNOMEUI_LIBS@
21.72 -GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@
21.73 -GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@
21.74 -GNOME_CONFIG = @GNOME_CONFIG@
21.75 -GNOME_DOCKLETS_LIBS = @GNOME_DOCKLETS_LIBS@
21.76 -GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@
21.77 -GNOME_LIBDIR = @GNOME_LIBDIR@
21.78 -GNOME_LIBS = @GNOME_LIBS@
21.79 -GNORBA_CFLAGS = @GNORBA_CFLAGS@
21.80 -GNORBA_LIBS = @GNORBA_LIBS@
21.81 -GTKXMHTML_LIBS = @GTKXMHTML_LIBS@
21.82 -GTK_CFLAGS = @GTK_CFLAGS@
21.83 -GTK_CONFIG = @GTK_CONFIG@
21.84 -GTK_LIBS = @GTK_LIBS@
21.85 -HAVE_ASPRINTF = @HAVE_ASPRINTF@
21.86 -HAVE_GNORBA_FALSE = @HAVE_GNORBA_FALSE@
21.87 -HAVE_GNORBA_TRUE = @HAVE_GNORBA_TRUE@
21.88 -HAVE_ORBIT_FALSE = @HAVE_ORBIT_FALSE@
21.89 -HAVE_ORBIT_TRUE = @HAVE_ORBIT_TRUE@
21.90 -HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
21.91 -HAVE_SNPRINTF = @HAVE_SNPRINTF@
21.92 -HAVE_WPRINTF = @HAVE_WPRINTF@
21.93 -INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@
21.94 -INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@
21.95 -INSTALL_DATA = @INSTALL_DATA@
21.96 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
21.97 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
21.98 -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
21.99 -INSTOBJEXT = @INSTOBJEXT@
21.100 -INTLBISON = @INTLBISON@
21.101 -INTLLIBS = @INTLLIBS@
21.102 -INTLOBJS = @INTLOBJS@
21.103 -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
21.104 -LDFLAGS = @LDFLAGS@
21.105 -LIBICONV = @LIBICONV@
21.106 -LIBINTL = @LIBINTL@
21.107 -LIBOBJS = @LIBOBJS@
21.108 -LIBS = @LIBS@
21.109 -LTLIBICONV = @LTLIBICONV@
21.110 -LTLIBINTL = @LTLIBINTL@
21.111 -LTLIBOBJS = @LTLIBOBJS@
21.112 -MAKEINFO = @MAKEINFO@
21.113 -MKINSTALLDIRS = @MKINSTALLDIRS@
21.114 -MSGFMT = @MSGFMT@
21.115 -MSGMERGE = @MSGMERGE@
21.116 -OBJEXT = @OBJEXT@
21.117 -ORBIT_CFLAGS = @ORBIT_CFLAGS@
21.118 -ORBIT_CONFIG = @ORBIT_CONFIG@
21.119 -ORBIT_IDL = @ORBIT_IDL@
21.120 -ORBIT_LIBS = @ORBIT_LIBS@
21.121 -PACKAGE = @PACKAGE@
21.122 -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
21.123 -PACKAGE_NAME = @PACKAGE_NAME@
21.124 -PACKAGE_STRING = @PACKAGE_STRING@
21.125 -PACKAGE_TARNAME = @PACKAGE_TARNAME@
21.126 -PACKAGE_VERSION = @PACKAGE_VERSION@
21.127 -PATH_SEPARATOR = @PATH_SEPARATOR@
21.128 -POSUB = @POSUB@
21.129 -PTHREAD_LIB = @PTHREAD_LIB@
21.130 -RANLIB = @RANLIB@
21.131 -SET_MAKE = @SET_MAKE@
21.132 -SHELL = @SHELL@
21.133 -STRIP = @STRIP@
21.134 -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
21.135 -USE_NLS = @USE_NLS@
21.136 -VERSION = @VERSION@
21.137 -XGETTEXT = @XGETTEXT@
21.138 -XPM_LIBS = @XPM_LIBS@
21.139 -ZVT_LIBS = @ZVT_LIBS@
21.140 -ac_ct_CC = @ac_ct_CC@
21.141 -ac_ct_RANLIB = @ac_ct_RANLIB@
21.142 -ac_ct_STRIP = @ac_ct_STRIP@
21.143 -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
21.144 -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
21.145 -am__include = @am__include@
21.146 -am__leading_dot = @am__leading_dot@
21.147 -am__quote = @am__quote@
21.148 -bindir = @bindir@
21.149 -build = @build@
21.150 -build_alias = @build_alias@
21.151 -build_cpu = @build_cpu@
21.152 -build_os = @build_os@
21.153 -build_vendor = @build_vendor@
21.154 -cflags_set = @cflags_set@
21.155 -datadir = @datadir@
21.156 -exec_prefix = @exec_prefix@
21.157 -host = @host@
21.158 -host_alias = @host_alias@
21.159 -host_cpu = @host_cpu@
21.160 -host_os = @host_os@
21.161 -host_vendor = @host_vendor@
21.162 -includedir = @includedir@
21.163 -infodir = @infodir@
21.164 -install_sh = @install_sh@
21.165 -libdir = @libdir@
21.166 -libexecdir = @libexecdir@
21.167 -localstatedir = @localstatedir@
21.168 -mandir = @mandir@
21.169 -oldincludedir = @oldincludedir@
21.170 -prefix = @prefix@
21.171 -program_transform_name = @program_transform_name@
21.172 -sbindir = @sbindir@
21.173 -sharedstatedir = @sharedstatedir@
21.174 -sysconfdir = @sysconfdir@
21.175 -target_alias = @target_alias@
21.176 -
21.177 -INCLUDES = \
21.178 - -I$(top_srcdir)/intl -I$(top_srcdir)/src
21.179 -
21.180 -
21.181 -noinst_LIBRARIES = libsh4.a
21.182 -libsh4_a_SOURCES = mem.c mem.h sh4core.c sh4core.h sh4dasm.c sh4dasm.h \
21.183 - sh4mmio.c sh4mmio.h mmio.h intc.c intc.h
21.184 -
21.185 -
21.186 -AM_CFLAGS = -D_ISOC99_SOURCE -D_BSD_SOURCE
21.187 -subdir = src/sh4
21.188 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
21.189 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
21.190 -CONFIG_HEADER = $(top_builddir)/config.h
21.191 -CONFIG_CLEAN_FILES =
21.192 -LIBRARIES = $(noinst_LIBRARIES)
21.193 -
21.194 -libsh4_a_AR = $(AR) cru
21.195 -libsh4_a_LIBADD =
21.196 -am_libsh4_a_OBJECTS = mem.$(OBJEXT) sh4core.$(OBJEXT) sh4dasm.$(OBJEXT) \
21.197 - sh4mmio.$(OBJEXT) intc.$(OBJEXT)
21.198 -libsh4_a_OBJECTS = $(am_libsh4_a_OBJECTS)
21.199 -
21.200 -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
21.201 -depcomp = $(SHELL) $(top_srcdir)/depcomp
21.202 -am__depfiles_maybe = depfiles
21.203 -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/intc.Po ./$(DEPDIR)/mem.Po \
21.204 -@AMDEP_TRUE@ ./$(DEPDIR)/sh4core.Po ./$(DEPDIR)/sh4dasm.Po \
21.205 -@AMDEP_TRUE@ ./$(DEPDIR)/sh4mmio.Po
21.206 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
21.207 - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
21.208 -CCLD = $(CC)
21.209 -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
21.210 -DIST_SOURCES = $(libsh4_a_SOURCES)
21.211 -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
21.212 -SOURCES = $(libsh4_a_SOURCES)
21.213 -
21.214 -all: all-am
21.215 -
21.216 -.SUFFIXES:
21.217 -.SUFFIXES: .c .o .obj
21.218 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
21.219 - cd $(top_srcdir) && \
21.220 - $(AUTOMAKE) --gnu src/sh4/Makefile
21.221 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
21.222 - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
21.223 -
21.224 -AR = ar
21.225 -
21.226 -clean-noinstLIBRARIES:
21.227 - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
21.228 -libsh4.a: $(libsh4_a_OBJECTS) $(libsh4_a_DEPENDENCIES)
21.229 - -rm -f libsh4.a
21.230 - $(libsh4_a_AR) libsh4.a $(libsh4_a_OBJECTS) $(libsh4_a_LIBADD)
21.231 - $(RANLIB) libsh4.a
21.232 -
21.233 -mostlyclean-compile:
21.234 - -rm -f *.$(OBJEXT) core *.core
21.235 -
21.236 -distclean-compile:
21.237 - -rm -f *.tab.c
21.238 -
21.239 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intc.Po@am__quote@
21.240 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem.Po@am__quote@
21.241 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sh4core.Po@am__quote@
21.242 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sh4dasm.Po@am__quote@
21.243 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sh4mmio.Po@am__quote@
21.244 -
21.245 -.c.o:
21.246 -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
21.247 -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
21.248 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
21.249 -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
21.250 -@am__fastdepCC_TRUE@ fi
21.251 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
21.252 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
21.253 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
21.254 -@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
21.255 -
21.256 -.c.obj:
21.257 -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
21.258 -@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
21.259 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
21.260 -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
21.261 -@am__fastdepCC_TRUE@ fi
21.262 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
21.263 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
21.264 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
21.265 -@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
21.266 -uninstall-info-am:
21.267 -
21.268 -ETAGS = etags
21.269 -ETAGSFLAGS =
21.270 -
21.271 -CTAGS = ctags
21.272 -CTAGSFLAGS =
21.273 -
21.274 -tags: TAGS
21.275 -
21.276 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
21.277 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
21.278 - unique=`for i in $$list; do \
21.279 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
21.280 - done | \
21.281 - $(AWK) ' { files[$$0] = 1; } \
21.282 - END { for (i in files) print i; }'`; \
21.283 - mkid -fID $$unique
21.284 -
21.285 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
21.286 - $(TAGS_FILES) $(LISP)
21.287 - tags=; \
21.288 - here=`pwd`; \
21.289 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
21.290 - unique=`for i in $$list; do \
21.291 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
21.292 - done | \
21.293 - $(AWK) ' { files[$$0] = 1; } \
21.294 - END { for (i in files) print i; }'`; \
21.295 - test -z "$(ETAGS_ARGS)$$tags$$unique" \
21.296 - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
21.297 - $$tags $$unique
21.298 -
21.299 -ctags: CTAGS
21.300 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
21.301 - $(TAGS_FILES) $(LISP)
21.302 - tags=; \
21.303 - here=`pwd`; \
21.304 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
21.305 - unique=`for i in $$list; do \
21.306 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
21.307 - done | \
21.308 - $(AWK) ' { files[$$0] = 1; } \
21.309 - END { for (i in files) print i; }'`; \
21.310 - test -z "$(CTAGS_ARGS)$$tags$$unique" \
21.311 - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
21.312 - $$tags $$unique
21.313 -
21.314 -GTAGS:
21.315 - here=`$(am__cd) $(top_builddir) && pwd` \
21.316 - && cd $(top_srcdir) \
21.317 - && gtags -i $(GTAGS_ARGS) $$here
21.318 -
21.319 -distclean-tags:
21.320 - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
21.321 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
21.322 -
21.323 -top_distdir = ../..
21.324 -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
21.325 -
21.326 -distdir: $(DISTFILES)
21.327 - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
21.328 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
21.329 - list='$(DISTFILES)'; for file in $$list; do \
21.330 - case $$file in \
21.331 - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
21.332 - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
21.333 - esac; \
21.334 - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
21.335 - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
21.336 - if test "$$dir" != "$$file" && test "$$dir" != "."; then \
21.337 - dir="/$$dir"; \
21.338 - $(mkinstalldirs) "$(distdir)$$dir"; \
21.339 - else \
21.340 - dir=''; \
21.341 - fi; \
21.342 - if test -d $$d/$$file; then \
21.343 - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
21.344 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
21.345 - fi; \
21.346 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
21.347 - else \
21.348 - test -f $(distdir)/$$file \
21.349 - || cp -p $$d/$$file $(distdir)/$$file \
21.350 - || exit 1; \
21.351 - fi; \
21.352 - done
21.353 -check-am: all-am
21.354 -check: check-am
21.355 -all-am: Makefile $(LIBRARIES)
21.356 -
21.357 -installdirs:
21.358 -install: install-am
21.359 -install-exec: install-exec-am
21.360 -install-data: install-data-am
21.361 -uninstall: uninstall-am
21.362 -
21.363 -install-am: all-am
21.364 - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
21.365 -
21.366 -installcheck: installcheck-am
21.367 -install-strip:
21.368 - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
21.369 - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
21.370 - `test -z '$(STRIP)' || \
21.371 - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
21.372 -mostlyclean-generic:
21.373 -
21.374 -clean-generic:
21.375 -
21.376 -distclean-generic:
21.377 - -rm -f $(CONFIG_CLEAN_FILES)
21.378 -
21.379 -maintainer-clean-generic:
21.380 - @echo "This command is intended for maintainers to use"
21.381 - @echo "it deletes files that may require special tools to rebuild."
21.382 -clean: clean-am
21.383 -
21.384 -clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
21.385 -
21.386 -distclean: distclean-am
21.387 - -rm -rf ./$(DEPDIR)
21.388 - -rm -f Makefile
21.389 -distclean-am: clean-am distclean-compile distclean-generic \
21.390 - distclean-tags
21.391 -
21.392 -dvi: dvi-am
21.393 -
21.394 -dvi-am:
21.395 -
21.396 -info: info-am
21.397 -
21.398 -info-am:
21.399 -
21.400 -install-data-am:
21.401 -
21.402 -install-exec-am:
21.403 -
21.404 -install-info: install-info-am
21.405 -
21.406 -install-man:
21.407 -
21.408 -installcheck-am:
21.409 -
21.410 -maintainer-clean: maintainer-clean-am
21.411 - -rm -rf ./$(DEPDIR)
21.412 - -rm -f Makefile
21.413 -maintainer-clean-am: distclean-am maintainer-clean-generic
21.414 -
21.415 -mostlyclean: mostlyclean-am
21.416 -
21.417 -mostlyclean-am: mostlyclean-compile mostlyclean-generic
21.418 -
21.419 -pdf: pdf-am
21.420 -
21.421 -pdf-am:
21.422 -
21.423 -ps: ps-am
21.424 -
21.425 -ps-am:
21.426 -
21.427 -uninstall-am: uninstall-info-am
21.428 -
21.429 -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
21.430 - clean-noinstLIBRARIES ctags distclean distclean-compile \
21.431 - distclean-generic distclean-tags distdir dvi dvi-am info \
21.432 - info-am install install-am install-data install-data-am \
21.433 - install-exec install-exec-am install-info install-info-am \
21.434 - install-man install-strip installcheck installcheck-am \
21.435 - installdirs maintainer-clean maintainer-clean-generic \
21.436 - mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
21.437 - ps ps-am tags uninstall uninstall-am uninstall-info-am
21.438 -
21.439 -# Tell versions [3.59,3.63) of GNU make to not export all variables.
21.440 -# Otherwise a system limit (for SysV at least) may be exceeded.
21.441 -.NOEXPORT:
.