Menu
▾
▴
[vba-commit] VisualBoyAdvance AUTHORS,1.3,1.4 Makefile.am,1.8,1.9 Makefile.in,1.12,1.13 aclocal.m4,1.4,1.5 configure,1.24,1.25 configure.in,1.23,1.24
|
From: S?bastien G. <kx...@us...> - 2004-05-12 01:07:46
|
Update of /cvsroot/vba/VisualBoyAdvance In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23509 Modified Files: AUTHORS Makefile.am Makefile.in aclocal.m4 configure configure.in Log Message: Added icon. More improvements before the first GTK+ interfaced release. Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/Makefile.in,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile.in 1 May 2004 14:03:51 -0000 1.12 --- Makefile.in 12 May 2004 01:07:03 -0000 1.13 *************** *** 107,110 **** --- 107,111 ---- VBA_EXTRA = @VBA_EXTRA@ VBA_LIBS = @VBA_LIBS@ + VBA_SRC_EXTRA = @VBA_SRC_EXTRA@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ *************** *** 154,158 **** AUTOMAKE_OPTIONS = gnu dist-zip ! SUBDIRS = m4 po src win32 EXTRA_DIST = config.rpath README-win.txt README.CVS VERSION --- 155,165 ---- AUTOMAKE_OPTIONS = gnu dist-zip ! CORE_SUBDIRS = m4 src win32 ! ! EXTRA_SUBDIRS = po ! ! SUBDIRS = $(CORE_SUBDIRS) @VBA_EXTRA@ ! ! DIST_SUBDIRS = $(CORE_SUBDIRS) $(EXTRA_SUBDIRS) EXTRA_DIST = config.rpath README-win.txt README.CVS VERSION *************** *** 175,179 **** config.sub configure configure.in depcomp install-sh missing \ mkinstalldirs - DIST_SUBDIRS = $(SUBDIRS) all: all-recursive --- 182,185 ---- *************** *** 364,368 **** fi; \ done ! list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ --- 370,374 ---- fi; \ done ! list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ Index: Makefile.am =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.am 29 Mar 2004 22:08:37 -0000 1.8 --- Makefile.am 12 May 2004 01:07:03 -0000 1.9 *************** *** 1,5 **** AUTOMAKE_OPTIONS = gnu dist-zip ! SUBDIRS = m4 po src win32 EXTRA_DIST = config.rpath README-win.txt README.CVS VERSION --- 1,11 ---- AUTOMAKE_OPTIONS = gnu dist-zip ! CORE_SUBDIRS = m4 src win32 ! ! EXTRA_SUBDIRS = po ! ! SUBDIRS = $(CORE_SUBDIRS) @VBA_EXTRA@ ! ! DIST_SUBDIRS = $(CORE_SUBDIRS) $(EXTRA_SUBDIRS) EXTRA_DIST = config.rpath README-win.txt README.CVS VERSION Index: configure =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/configure,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** configure 5 May 2004 16:01:09 -0000 1.24 --- configure 12 May 2004 01:07:03 -0000 1.25 *************** *** 310,314 **** #endif" ! 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os 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 MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE 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 LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GETTEXT_PACKAGE YACC LEX LEXLIB LEX_OUTPUT_ROOT CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB NASM CPP EGREP SDL_CONFIG SDL_CFLAGS SDL_LIBS PKG_CONFIG GTKMM_CFLAGS GTKMM_LIBS GTKMM_CPPFLAGS VBA_EXTRA VBA_LIBS LIBOBJS LTLIBOBJS' ac_subst_files='' --- 310,314 ---- #endif" ! 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os 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 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 YACC LEX LEXLIB LEX_OUTPUT_ROOT CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB NASM CPP EGREP SDL_CONFIG SDL_CFLAGS SDL_LIBS MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GETTEXT_PACKAGE PKG_CONFIG GTKMM_CFLAGS GTKMM_LIBS GTKMM_CPPFLAGS VBA_EXTRA VBA_SRC_EXTRA VBA_LIBS LIBOBJS LTLIBOBJS' ac_subst_files='' [...4840 lines suppressed...] - echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 - echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} - { (exit 1); exit 1; }; }; } - - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done - ;; esac done --- 9272,9275 ---- Index: configure.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/configure.in,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** configure.in 5 May 2004 16:01:10 -0000 1.23 --- configure.in 12 May 2004 01:07:03 -0000 1.24 *************** *** 53,63 **** , enable_dev=yes) - dnl Internationalisation support. - ALL_LINGUAS="fr" - AM_GNU_GETTEXT(external) - - GETTEXT_PACKAGE=vba-1.7.2 - AC_SUBST(GETTEXT_PACKAGE) - dnl Checks for programs. AC_PROG_CC --- 53,56 ---- *************** *** 116,120 **** if test "x$enable_profiling" = xyes; then CXXFLAGS="$CXXFLAGS -DPROFILING" ! VBA_EXTRA="$VBA_EXTRA prof" VBA_LIBS="$VBA_LIBS ../prof/libprof.a" fi --- 109,113 ---- if test "x$enable_profiling" = xyes; then CXXFLAGS="$CXXFLAGS -DPROFILING" ! VBA_SRC_EXTRA="$VBA_SRC_EXTRA prof" VBA_LIBS="$VBA_LIBS ../prof/libprof.a" fi *************** *** 125,129 **** fi CXXFLAGS="$CXXFLAGS -DMMX" ! VBA_EXTRA="$VBA_EXTRA i386" VBA_LIBS="$VBA_LIBS ../i386/lib386.a" fi --- 118,122 ---- fi CXXFLAGS="$CXXFLAGS -DMMX" ! VBA_SRC_EXTRA="$VBA_SRC_EXTRA i386" VBA_LIBS="$VBA_LIBS ../i386/lib386.a" fi *************** *** 138,146 **** if test "x$enable_sdl" = xyes; then ! VBA_EXTRA="$VBA_EXTRA sdl" fi if test "x$enable_gtk" = xyes; then AC_CHECK_HEADERS(libintl.h) PKG_CHECK_MODULES(GTKMM, gtkmm-$gtk_version >= 2.0.0 libglademm-$gtk_version >= 2.1.0) AC_SUBST(GTKMM_CFLAGS) --- 131,145 ---- if test "x$enable_sdl" = xyes; then ! VBA_SRC_EXTRA="$VBA_SRC_EXTRA sdl" fi if test "x$enable_gtk" = xyes; then + dnl Internationalisation support. + ALL_LINGUAS="fr" + AM_GNU_GETTEXT(external) AC_CHECK_HEADERS(libintl.h) + GETTEXT_PACKAGE=vba-1.7.2 + AC_SUBST(GETTEXT_PACKAGE) + PKG_CHECK_MODULES(GTKMM, gtkmm-$gtk_version >= 2.0.0 libglademm-$gtk_version >= 2.1.0) AC_SUBST(GTKMM_CFLAGS) *************** *** 150,154 **** fi AC_SUBST(GTKMM_CPPFLAGS) ! VBA_EXTRA="$VBA_EXTRA gtk" fi --- 149,154 ---- fi AC_SUBST(GTKMM_CPPFLAGS) ! VBA_EXTRA="$VBA_EXTRA po" ! VBA_SRC_EXTRA="$VBA_SRC_EXTRA gtk" fi *************** *** 162,165 **** --- 162,166 ---- AC_SUBST(VBA_EXTRA) + AC_SUBST(VBA_SRC_EXTRA) AC_SUBST(VBA_LIBS) *************** *** 172,175 **** --- 173,177 ---- src/gb/Makefile src/gtk/Makefile + src/gtk/images/Makefile src/i386/Makefile src/prof/Makefile Index: aclocal.m4 =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/aclocal.m4,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** aclocal.m4 29 Mar 2004 22:08:37 -0000 1.4 --- aclocal.m4 12 May 2004 01:07:03 -0000 1.5 *************** *** 1615,1618 **** --- 1615,1651 ---- fi])]) + + # Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation; either version 2, or (at your option) + # any later version. + + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + # 02111-1307, USA. + + # serial 3 + + AC_PREREQ(2.50) + + # AM_PROG_LEX + # ----------- + # Autoconf leaves LEX=: if lex or flex can't be found. Change that to a + # "missing" invocation, for better error output. + AC_DEFUN([AM_PROG_LEX], + [AC_REQUIRE([AM_MISSING_HAS_RUN])dnl + AC_REQUIRE([AC_PROG_LEX])dnl + if test "$LEX" = :; then + LEX=${am_missing_run}flex + fi]) + # gettext.m4 serial 28 (gettext-0.13) dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. *************** *** 4246,4282 **** - # Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by - # the Free Software Foundation; either version 2, or (at your option) - # any later version. - - # This program is distributed in the hope that it will be useful, - # but WITHOUT ANY WARRANTY; without even the implied warranty of - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # GNU General Public License for more details. - - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - # 02111-1307, USA. - - # serial 3 - - AC_PREREQ(2.50) - - # AM_PROG_LEX - # ----------- - # Autoconf leaves LEX=: if lex or flex can't be found. Change that to a - # "missing" invocation, for better error output. - AC_DEFUN([AM_PROG_LEX], - [AC_REQUIRE([AM_MISSING_HAS_RUN])dnl - AC_REQUIRE([AC_PROG_LEX])dnl - if test "$LEX" = :; then - LEX=${am_missing_run}flex - fi]) - - dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page --- 4279,4282 ---- Index: AUTHORS =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/AUTHORS,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AUTHORS 29 Mar 2004 22:08:37 -0000 1.3 --- AUTHORS 12 May 2004 01:07:03 -0000 1.4 *************** *** 1,9 **** ! VisualBoy and VisualBoyAdvanced original development: - Forgotten (see the Contact section in the readme) Contributions: - Costis (co...@gb...): object mosaic, GP32 - KVA: ARM/THUMB disassembler ! - kxu: GTK+ frontend --- 1,14 ---- ! VisualBoy and VisualBoyAdvance original development: - Forgotten (see the Contact section in the readme) + Current maintainer: + + - Sébastien Guignot aka kxu (helped and supported by Forgotten) + Contributions: - Costis (co...@gb...): object mosaic, GP32 - KVA: ARM/THUMB disassembler ! - Sébastien Guignot aka kxu: GTK+ interface ! - Yann Parmentier aka kohai: icons |
