Menu
▾
▴
[vba-commit] VisualBoyAdvance Makefile.am,1.6,1.7 Makefile.in,1.9,1.10 configure,1.19,1.20 configure.in,1.18,1.19
|
From: <for...@pr...> - 2004-02-01 15:04:31
|
Update of /cvsroot/vba/VisualBoyAdvance In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23064 Modified Files: Makefile.am Makefile.in configure configure.in Log Message: Remove qt and gp from autoconf/automake Index: Makefile.am =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 21 Nov 2003 21:53:40 -0000 1.6 --- Makefile.am 1 Feb 2004 15:02:38 -0000 1.7 *************** *** 2,4 **** SUBDIRS = src win32 ! EXTRA_DIST = README-win.txt README.CVS qt/VisualBoyAdvance.pro --- 2,5 ---- SUBDIRS = src win32 ! EXTRA_DIST = README-win.txt README.CVS ! Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/Makefile.in,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.in 21 Nov 2003 21:53:40 -0000 1.9 --- Makefile.in 1 Feb 2004 15:02:38 -0000 1.10 *************** *** 90,94 **** STRIP = @STRIP@ VBA_EXTRA = @VBA_EXTRA@ - VBA_GP = @VBA_GP@ VBA_MMX = @VBA_MMX@ VBA_PROF = @VBA_PROF@ --- 90,93 ---- *************** *** 141,145 **** SUBDIRS = src win32 ! EXTRA_DIST = README-win.txt README.CVS qt/VisualBoyAdvance.pro subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --- 140,144 ---- SUBDIRS = src win32 ! EXTRA_DIST = README-win.txt README.CVS subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 *************** *** 319,323 **** $(am__remove_distdir) mkdir $(distdir) - $(mkinstalldirs) $(distdir)/qt @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ --- 318,321 ---- Index: configure =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/configure,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** configure 31 Jan 2004 01:14:35 -0000 1.19 --- configure 1 Feb 2004 15:02:38 -0000 1.20 *************** *** 309,313 **** #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 ac_ct_NASM SDL_CONFIG SDL_CFLAGS SDL_LIBS CPP EGREP VBA_MMX VBA_EXTRA VBA_GP VBA_PROF LIBOBJS LTLIBOBJS' ac_subst_files='' --- 309,313 ---- #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 ac_ct_NASM SDL_CONFIG SDL_CFLAGS SDL_LIBS CPP EGREP VBA_MMX VBA_EXTRA VBA_PROF LIBOBJS LTLIBOBJS' ac_subst_files='' *************** *** 862,866 **** --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-gp enable GP32 emulation (default is NO) --enable-c-core enable C core (default is YES) --enable-dev enable development features (default is YES) --- 862,865 ---- *************** *** 1789,1809 **** - # Check whether --enable-gp or --disable-gp was given. - if test "${enable_gp+set}" = set; then - enableval="$enable_gp" - ac_cv_use_gp=$enableval - else - ac_cv_use_gp=no - fi; - echo "$as_me:$LINENO: checking whether to enable GP32 emulation" >&5 - echo $ECHO_N "checking whether to enable GP32 emulation... $ECHO_C" >&6 - if test "${ac_cv_use_gp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_use_gp=no - fi - echo "$as_me:$LINENO: result: $ac_cv_use_gp" >&5 - echo "${ECHO_T}$ac_cv_use_gp" >&6 - # Check whether --enable-c-core or --disable-c-core was given. if test "${enable_c_core+set}" = set; then --- 1788,1791 ---- *************** *** 5728,5737 **** fi - if test "${ac_cv_use_gp}" = "yes"; then - VBA_EXTRA="$VBA_EXTRA gp" - VBA_GP=gp/libgp.a - CXXFLAGS="$CXXFLAGS -DGP_EMULATION" - fi - if test "${ac_cv_use_mmx}" = "yes"; then CXXFLAGS="$CXXFLAGS -DMMX" --- 5710,5713 ---- *************** *** 5755,5760 **** ! ! ac_config_files="$ac_config_files Makefile win32/Makefile src/Makefile src/gb/Makefile src/gp/Makefile src/i386/Makefile src/prof/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure --- 5731,5735 ---- ! ac_config_files="$ac_config_files Makefile win32/Makefile src/Makefile src/gb/Makefile src/i386/Makefile src/prof/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure *************** *** 6342,6346 **** "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/gb/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gb/Makefile" ;; - "src/gp/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gp/Makefile" ;; "src/i386/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/i386/Makefile" ;; "src/prof/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/prof/Makefile" ;; --- 6317,6320 ---- *************** *** 6498,6502 **** s,@VBA_MMX@,$VBA_MMX,;t t s,@VBA_EXTRA@,$VBA_EXTRA,;t t - s,@VBA_GP@,$VBA_GP,;t t s,@VBA_PROF@,$VBA_PROF,;t t s,@LIBOBJS@,$LIBOBJS,;t t --- 6472,6475 ---- Index: configure.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/configure.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** configure.in 31 Jan 2004 01:14:35 -0000 1.18 --- configure.in 1 Feb 2004 15:02:38 -0000 1.19 *************** *** 17,25 **** AM_INIT_AUTOMAKE(VisualBoyAdvance, 1.7.1) - AC_ARG_ENABLE(gp, - [ --enable-gp enable GP32 emulation (default is NO)], - ac_cv_use_gp=$enableval, ac_cv_use_gp=no) - AC_CACHE_CHECK(whether to enable GP32 emulation, ac_cv_use_gp, ac_cv_use_gp=no) - AC_ARG_ENABLE(c-core, [ --enable-c-core enable C core (default is YES)], --- 17,20 ---- *************** *** 99,108 **** fi - if test "${ac_cv_use_gp}" = "yes"; then - VBA_EXTRA="$VBA_EXTRA gp" - VBA_GP=gp/libgp.a - CXXFLAGS="$CXXFLAGS -DGP_EMULATION" - fi - if test "${ac_cv_use_mmx}" = "yes"; then CXXFLAGS="$CXXFLAGS -DMMX" --- 94,97 ---- *************** *** 125,130 **** AC_SUBST(VBA_MMX) AC_SUBST(VBA_EXTRA) - AC_SUBST(VBA_GP) AC_SUBST(VBA_PROF) ! AC_OUTPUT(Makefile win32/Makefile src/Makefile src/gb/Makefile src/gp/Makefile src/i386/Makefile src/prof/Makefile) --- 114,118 ---- AC_SUBST(VBA_MMX) AC_SUBST(VBA_EXTRA) AC_SUBST(VBA_PROF) ! AC_OUTPUT(Makefile win32/Makefile src/Makefile src/gb/Makefile src/i386/Makefile src/prof/Makefile) |
