diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 408a11fa6f..0000000000 --- a/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -## Need 1.7 for subdir support. (Well, 1.4 doesn't work, I don't know if anything between does.) -AUTOMAKE_OPTIONS = 1.7 foreign -SUBDIRS = bundle src -ACLOCAL_AMFLAGS = -I autoconf/m4 - -installFiles = src/stepmania -if HAVE_GTK -installFiles += src/GtkModule.so -endif - -installData = $(srcdir)/Announcers $(srcdir)/BGAnimations $(srcdir)/Themes $(srcdir)/Characters $(srcdir)/Scripts $(srcdir)/Courses $(srcdir)/BackgroundEffects $(srcdir)/Data $(srcdir)/BackgroundTransitions $(srcdir)/Docs $(srcdir)/NoteSkins - -.PHONY: SMData -SMData: - $(srcdir)/Utils/CreatePackage.pl $(srcdir) . - -dist-hook: SMData - mkdir -p "$(distdir)/Packages" - mv GameData.smzip "$(distdir)/Packages" - cp -r "$(srcdir)/Docs" "$(distdir)" - cp -r -t "$(distdir)" $(installFiles) - -install-exec-hook: - mkdir -p "$(DESTDIR)$(prefix)/stepmania-$(VERSION)" - $(INSTALL) $(installFiles) "$(DESTDIR)$(prefix)/stepmania-$(VERSION)" - -install-data-local: - mkdir -p "$(DESTDIR)$(prefix)/stepmania-$(VERSION)/Songs" - cp -r -t "$(DESTDIR)$(prefix)/stepmania-$(VERSION)" $(installData) - -uninstall-hook: - rm -f "$(DESTDIR)$(prefix)/stepmania-$(VERSION)/stepmania" - rm -f "$(DESTDIR)$(prefix)/stepmania-$(VERSION)/GtkModule.so" -# todo: properly remove data diff --git a/Utils/make-src-archive.sh b/Utils/make-src-archive.sh index 75c2833b8b..d1b1d9f279 100755 --- a/Utils/make-src-archive.sh +++ b/Utils/make-src-archive.sh @@ -1,6 +1,6 @@ #!/bin/sh -LINUX= MAC= WIN= +MAC= WIN= # Parse options while :; do @@ -54,11 +54,6 @@ mkdir dist { echo './dist' echo '*/.hg*' - echo './autoconf/m4' - echo './autom4te.cache' - echo './autogen.sh' - echo './aclocal.m4' - echo '*/*.a[mc]' echo './_assets' echo './Utils/Font generation' # OSX diff --git a/autoconf/config.rpath b/autoconf/config.rpath deleted file mode 100644 index 3f1bef34a0..0000000000 --- a/autoconf/config.rpath +++ /dev/null @@ -1,571 +0,0 @@ -#! /bin/sh -# Output a system dependent set of variables, describing how to set the -# run time search path of shared libraries in an executable. -# -# Copyright 1996-2005 Free Software Foundation, Inc. -# Taken from GNU libtool, 2001 -# Originally by Gordon Matzigkeit , 1996 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# The first argument passed to this file is the canonical host specification, -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld -# should be set by the caller. -# -# The set of defined variables is at the end of this script. - -# Known limitations: -# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer -# than 256 bytes, otherwise the compiler driver will dump core. The only -# known workaround is to choose shorter directory names for the build -# directory and/or the installation directory. - -# All known linkers require a `.a' archive for static linking (except M$VC, -# which needs '.lib'). -libext=a -shrext=.so - -host="$1" -host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - -cc_basename=`echo "$CC" | sed -e 's%^.*/%%'` - -# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. - -wl= -if test "$GCC" = yes; then - wl='-Wl,' -else - case "$host_os" in - aix*) - wl='-Wl,' - ;; - darwin*) - case "$cc_basename" in - xlc*) - wl='-Wl,' - ;; - esac - ;; - mingw* | pw32* | os2*) - ;; - hpux9* | hpux10* | hpux11*) - wl='-Wl,' - ;; - irix5* | irix6* | nonstopux*) - wl='-Wl,' - ;; - newsos6) - ;; - linux*) - case $cc_basename in - icc* | ecc*) - wl='-Wl,' - ;; - pgcc | pgf77 | pgf90) - wl='-Wl,' - ;; - ccc*) - wl='-Wl,' - ;; - como) - wl='-lopt=' - ;; - esac - ;; - osf3* | osf4* | osf5*) - wl='-Wl,' - ;; - sco3.2v5*) - ;; - solaris*) - wl='-Wl,' - ;; - sunos4*) - wl='-Qoption ld ' - ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - wl='-Wl,' - ;; - sysv4*MP*) - ;; - unicos*) - wl='-Wl,' - ;; - uts4*) - ;; - esac -fi - -# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. - -hardcode_libdir_flag_spec= -hardcode_libdir_separator= -hardcode_direct=no -hardcode_minus_L=no - -case "$host_os" in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - openbsd*) - with_gnu_ld=no - ;; -esac - -ld_shlibs=yes -if test "$with_gnu_ld" = yes; then - case "$host_os" in - aix3* | aix4* | aix5*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no - fi - ;; - amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we cannot use - # them. - ld_shlibs=no - ;; - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - cygwin* | mingw* | pw32*) - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - netbsd*) - ;; - solaris* | sysv5*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - sunos4*) - hardcode_direct=yes - ;; - linux*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - esac - if test "$ld_shlibs" = yes; then - # Unlike libtool, we use -rpath here, not --rpath, since the documented - # option of GNU ld is called -rpath, not --rpath. - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - fi -else - case "$host_os" in - aix3*) - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - else - aix_use_runtimelinking=no - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - esac - fi - hardcode_direct=yes - hardcode_libdir_separator=':' - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - hardcode_direct=yes - else - # We have old collect2 - hardcode_direct=unsupported - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - esac - fi - # Begin _LT_AC_SYS_LIBPATH_AIX. - echo 'int main () { return 0; }' > conftest.c - ${CC} ${LDFLAGS} conftest.c -o conftest - aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` - if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` - fi - if test -z "$aix_libpath"; then - aix_libpath="/usr/lib:/lib" - fi - rm -f conftest.c conftest - # End _LT_AC_SYS_LIBPATH_AIX. - if test "$aix_use_runtimelinking" = yes; then - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - else - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - fi - fi - ;; - amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # see comment about different semantics on the GNU ld section - ld_shlibs=no - ;; - bsdi[45]*) - ;; - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - libext=lib - ;; - darwin* | rhapsody*) - hardcode_direct=no - if test "$GCC" = yes ; then - : - else - case "$cc_basename" in - xlc*) - ;; - *) - ld_shlibs=no - ;; - esac - fi - ;; - dgux*) - hardcode_libdir_flag_spec='-L$libdir' - ;; - freebsd1*) - ld_shlibs=no - ;; - freebsd2.2*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - freebsd2*) - hardcode_direct=yes - hardcode_minus_L=yes - ;; - freebsd* | kfreebsd*-gnu | dragonfly*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - hpux9*) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - hpux10* | hpux11*) - if test "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=no - ;; - ia64*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=no - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - *) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - esac - fi - ;; - irix5* | irix6* | nonstopux*) - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - netbsd*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - newsos6) - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - openbsd*) - hardcode_direct=yes - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - else - case "$host_os" in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - ;; - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - osf3*) - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - osf4* | osf5*) - if test "$GCC" = yes; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - # Both cc and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - hardcode_libdir_separator=: - ;; - sco3.2v5*) - ;; - solaris*) - hardcode_libdir_flag_spec='-R$libdir' - ;; - sunos4*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - ;; - sysv4) - case $host_vendor in - sni) - hardcode_direct=yes # is this really true??? - ;; - siemens) - hardcode_direct=no - ;; - motorola) - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - ;; - sysv4.3*) - ;; - sysv4*MP*) - if test -d /usr/nec; then - ld_shlibs=yes - fi - ;; - sysv4.2uw2*) - hardcode_direct=yes - hardcode_minus_L=no - ;; - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) - ;; - sysv5*) - hardcode_libdir_flag_spec= - ;; - uts4*) - hardcode_libdir_flag_spec='-L$libdir' - ;; - *) - ld_shlibs=no - ;; - esac -fi - -# Check dynamic linker characteristics -# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. -libname_spec='lib$name' -case "$host_os" in - aix3*) - ;; - aix4* | aix5*) - ;; - amigaos*) - ;; - beos*) - ;; - bsdi[45]*) - ;; - cygwin* | mingw* | pw32*) - shrext=.dll - ;; - darwin* | rhapsody*) - shrext=.dylib - ;; - dgux*) - ;; - freebsd1*) - ;; - kfreebsd*-gnu) - ;; - freebsd*) - ;; - gnu*) - ;; - hpux9* | hpux10* | hpux11*) - case "$host_cpu" in - ia64*) - shrext=.so - ;; - hppa*64*) - shrext=.sl - ;; - *) - shrext=.sl - ;; - esac - ;; - irix5* | irix6* | nonstopux*) - case "$host_os" in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;; - *) libsuff= shlibsuff= ;; - esac - ;; - esac - ;; - linux*oldld* | linux*aout* | linux*coff*) - ;; - linux*) - ;; - knetbsd*-gnu) - ;; - netbsd*) - ;; - newsos6) - ;; - nto-qnx*) - ;; - openbsd*) - ;; - os2*) - libname_spec='$name' - shrext=.dll - ;; - osf3* | osf4* | osf5*) - ;; - sco3.2v5*) - ;; - solaris*) - ;; - sunos4*) - ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - ;; - sysv4*MP*) - ;; - uts4*) - ;; -esac - -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' -escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` -shlibext=`echo "$shrext" | sed -e 's,^\.,,'` -escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` - -LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' < -dnl Christopher Lansdown -dnl Jaroslav Kysela -dnl Last modification: $Id: alsa.m4 25506 2007-03-13 10:20:57Z stevecheckoway $ -dnl AM_PATH_ALSA([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for libasound, and define ALSA_CFLAGS and ALSA_LIBS as appropriate. -dnl enables arguments --with-alsa-prefix= -dnl --with-alsa-enc-prefix= -dnl -AC_DEFUN([AM_PATH_ALSA], -[dnl Save the original CFLAGS, LDFLAGS, and LIBS -alsa_save_CFLAGS="$CFLAGS" -alsa_save_LDFLAGS="$LDFLAGS" -alsa_save_LIBS="$LIBS" -alsa_found=yes - -dnl -dnl Get the cflags and libraries for alsa -dnl -AC_ARG_WITH(alsa-prefix, -[ --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)], -[alsa_prefix="$withval"], [alsa_prefix=""]) - -AC_ARG_WITH(alsa-inc-prefix, -[ --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional)], -[alsa_inc_prefix="$withval"], [alsa_inc_prefix=""]) - -dnl Add any special include directories -AC_MSG_CHECKING(for ALSA CFLAGS) -if test "$alsa_inc_prefix" != "" ; then - ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix" - CFLAGS="$CFLAGS -I$alsa_inc_prefix" -fi -AC_MSG_RESULT($ALSA_CFLAGS) - -dnl add any special lib dirs -AC_MSG_CHECKING(for ALSA LDFLAGS) -if test "$alsa_prefix" != "" ; then - ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" - LDFLAGS="$LDFLAGS $ALSA_LIBS" -fi - -dnl add the alsa library -ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread" -ALSA_LIBS=`echo $ALSA_LIBS | sed 's/-lm//'` -ALSA_LIBS=`echo $ALSA_LIBS | sed 's/-ldl//'` -ALSA_LIBS=`echo $ALSA_LIBS | sed 's/-lpthread//'` -ALSA_LIBS=`echo $ALSA_LIBS | sed 's/ / /g'` -LIBS="$ALSA_LIBS $LIBS" -AC_MSG_RESULT($ALSA_LIBS) - -dnl Check for a working version of libasound that is of the right version. -min_alsa_version=ifelse([$1], ,0.1.1,$1) -AC_MSG_CHECKING(for libasound headers version >= $min_alsa_version) -no_alsa="" - alsa_min_major_version=`echo $min_alsa_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - alsa_min_minor_version=`echo $min_alsa_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - alsa_min_micro_version=`echo $min_alsa_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - -AC_LANG_PUSH([C]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include -]], [[ -/* ensure backward compatibility */ -#if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR) -#define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR -#endif -#if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR) -#define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR -#endif -#if !defined(SND_LIB_SUBMINOR) && defined(SOUNDLIB_VERSION_SUBMINOR) -#define SND_LIB_SUBMINOR SOUNDLIB_VERSION_SUBMINOR -#endif - -# if(SND_LIB_MAJOR > $alsa_min_major_version) - exit(0); -# else -# if(SND_LIB_MAJOR < $alsa_min_major_version) -# error not present -# endif - -# if(SND_LIB_MINOR > $alsa_min_minor_version) - exit(0); -# else -# if(SND_LIB_MINOR < $alsa_min_minor_version) -# error not present -# endif - -# if(SND_LIB_SUBMINOR < $alsa_min_micro_version) -# error not present -# endif -# endif -# endif -exit(0); -]])],[AC_MSG_RESULT(found.)],[AC_MSG_RESULT(not present.) - ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libasound not found.)]) - alsa_found=no -]) -AC_LANG_POP([]) - -dnl Now that we know that we have the right version, let's see if we have the library and not just the headers. -AC_CHECK_LIB([asound], [snd_ctl_open],, - [ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)]) - alsa_found=no] -) - -if test "x$alsa_found" = "xyes" ; then - ifelse([$2], , :, [$2]) -# No, this defeats the prupose of ALSA_LIBS. -# LIBS=`echo $LIBS | sed 's/-lasound//g'` -# LIBS=`echo $LIBS | sed 's/ //'` -# LIBS="-lasound $LIBS" -fi - -if test "x$alsa_found" = "xno" ; then - ifelse([$3], , :, [$3]) - ALSA_CFLAGS="" - ALSA_LIBS="" -fi - -CFLAGS="$alsa_save_CFLAGS" -LDFLAGS="$alsa_save_LDFLAGS" -LIBS="$alsa_save_LIBS" - -dnl That should be it. Now just export out symbols: -AC_SUBST(ALSA_CFLAGS) -AC_SUBST(ALSA_LIBS) -]) - diff --git a/autoconf/m4/audio.m4 b/autoconf/m4/audio.m4 deleted file mode 100644 index 18c4fb4731..0000000000 --- a/autoconf/m4/audio.m4 +++ /dev/null @@ -1,81 +0,0 @@ -AC_DEFUN([SM_AUDIO], [ - -AC_REQUIRE([SM_STATIC]) -AC_ARG_WITH(vorbis, AS_HELP_STRING([--without-vorbis],[Disable Vorbis support]), with_vorbis=$withval, with_vorbis=yes) - -# This is used to force the integer decoder, on systems that prefer it. -AC_ARG_WITH(integer-vorbis, AS_HELP_STRING([--with-integer-vorbis],[Integer vorbis decoding only]), with_int_vorbis=$withval, with_int_vorbis=no) -AC_ARG_WITH(static-vorbis, AS_HELP_STRING([--with-static-vorbis],[Statically link vorbis libraries]), with_static_vorbis=$withval, with_static_vorbis=no) - -if test "$with_static_vorbis" = "yes"; then - LIB_PRE=$START_STATIC - LIB_POST=$END_STATIC -fi - -have_vorbis=no -if test "$with_vorbis" = "yes" -a "$with_int_vorbis" = "no"; then - AC_CHECK_LIB(ogg, ogg_stream_init, have_libogg=yes, have_libogg=no) - AC_CHECK_LIB(vorbis, vorbis_comment_add, have_libvorbis=yes, have_libvorbis=no, [-logg]) - AC_CHECK_LIB(vorbisfile, ov_open, have_libvorbisfile=yes, have_libvorbisfile=no, [-lvorbis -logg]) - if test "$have_libvorbis" = "yes" -a "$have_libogg" = "yes" -a "$have_libvorbisfile" = "yes"; then - have_vorbis=yes - AUDIO_LIBS="$AUDIO_LIBS $LIB_PRE -lvorbisfile -lvorbis -logg $LIB_POST" - else - echo Not all vorbis libraries found. - fi -fi - -# Search for the integer decoder if specified, or if Vorbis is enabled and we failed -# above. -if test "$with_vorbis" = "yes" -a "$have_vorbis" = "no"; then - AC_CHECK_LIB(ivorbisfile, ov_open, have_libivorbisfile=yes, have_libivorbisfile=no) - if test "$have_libivorbisfile" = "yes"; then - have_vorbis=yes - AUDIO_LIBS="$AUDIO_LIBS $LIB_PRE -livorbisfile $LIB_POST" - AC_DEFINE(INTEGER_VORBIS, 1, [Integer Vorbis decoding]) - fi -fi - -if test "$have_vorbis" = "no"; then - if test "$with_vorbis" = "yes"; then - AC_MSG_ERROR( - [A working installation of Ogg Vorbis could not be found. Vorbis -support is strongly recommended. If you really want to compile without it, pass -the "--without-vorbis" flag to configure.]) - fi - - AC_DEFINE(NO_VORBIS_SUPPORT, 1, [Vorbis support not available]) -fi - -LIB_PRE= -LIB_POST= - -AM_CONDITIONAL(HAVE_VORBIS, test "$have_vorbis" = "yes" ) - - -AC_ARG_WITH(mp3, AS_HELP_STRING([--without-mp3],[Disable MP3 support]), with_mp3=$withval, with_mp3=yes) -if test "$with_mp3" = "yes"; then - AC_CHECK_LIB(mad, mad_synth_init, have_mad=yes, have_mad=no) -else - have_mad=no -fi - -if test "$have_mad" = "no"; then - # Require MP3 by default, so people don't compile without MP3 support - # by accident and then come asking us why files won't load. - if test "$with_mp3" = "yes"; then - AC_MSG_ERROR( - [A working installation of MAD could not be found, which is -required for MP3 support. If you really want to compile without MP3 support, -pass the "--without-mp3" flag to configure.]) - fi - AC_DEFINE(NO_MP3_SUPPORT, 1, [MP3 support not available]) -else - AUDIO_LIBS="$AUDIO_LIBS -lmad" -fi - -AC_SUBST(AUDIO_LIBS) - -AM_CONDITIONAL(HAVE_MP3, test "$have_mad" = "yes" ) - -]) diff --git a/autoconf/m4/ax_check_lib_using_header.m4 b/autoconf/m4/ax_check_lib_using_header.m4 deleted file mode 100644 index 4fc0ebb485..0000000000 --- a/autoconf/m4/ax_check_lib_using_header.m4 +++ /dev/null @@ -1,24 +0,0 @@ -dnl AX_CHECK_LIB_USING_HEADER(lib, function, header, [action-if-found], [action-if-not-found], [other-libraries]) -dnl As AC_CHECK_LIB except "function" must be a fully valid function call and "header" the header file in which that function is defined. The benefit is that this can find functions whose symbols have been decorated, e.g. a lot of MinGW stuff. - -AC_DEFUN([AX_CHECK_LIB_USING_HEADER], -[ -dnl # On Windows OpenGL functions' library symbols don't match their function names. So we have to do it the hard way. - - AC_MSG_CHECKING(for $2 in $1 using $3) - - AC_LANG_PUSH(C) - - LIBS_SAVE=$LIBS - LIBS="$LIBS -l$1 $6" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([#include <$3>], [$2])], - [AC_MSG_RESULT(yes) - $4], - [AC_MSG_RESULT(no) - $5] - ) - LIBS=$LIBS_SAVE - - AC_LANG_POP(C) -]) \ No newline at end of file diff --git a/autoconf/m4/backtrace.m4 b/autoconf/m4/backtrace.m4 deleted file mode 100644 index a051589060..0000000000 --- a/autoconf/m4/backtrace.m4 +++ /dev/null @@ -1,122 +0,0 @@ -# See if we have a working backtrace_symbols. -AC_DEFUN([SM_FUNC_BACKTRACE_SYMBOLS], -[ - AC_MSG_CHECKING(for working backtrace_symbols()) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - int main() - { - void *BacktracePointer=main; - return backtrace_symbols (&BacktracePointer, 1) == 0? 1:0; - } - ]])],[have_backtrace_symbols=yes],[have_backtrace_symbols=no],[have_backtrace_symbols=no - ]) - AC_MSG_RESULT($have_backtrace_symbols) -]) - -AC_DEFUN([SM_FUNC_CXA_DEMANGLE], -[ - # Check for abi::__cxa_demangle (gcc 3.1+) - AC_MSG_CHECKING(for working cxa_demangle) - AC_LANG_PUSH(C++) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - #include - - int main() - { - struct foo { } fum; - int status; - char *realname = abi::__cxa_demangle(typeid(fum).name(), 0, 0, &status); - free( realname ); - return 0; - } - ]])],[have_cxa_demangle=yes],[have_cxa_demangle=no],[have_cxa_demangle=no - ]) - AC_LANG_POP(C++) - AC_MSG_RESULT($have_cxa_demangle) - if test "$have_cxa_demangle" = "yes"; then - AC_DEFINE(HAVE_CXA_DEMANGLE, 1, [abi::__cxa_demangle available]) - fi -]) - -# To support backtraces in the crash handler, we need two things: a call to -# get backtrace pointers, and a way to convert them to symbols. -AC_DEFUN([SM_CHECK_CRASH_HANDLER], -[ - # See if we have a custom backtrace(): - case $host in - # RedHat kindly changes the standard "pc-linux-gnu" to "redhat-linux-gnu", - # soley for the purpose of breaking lots of scripts. Ugh. - *86-*-linux* | x86_64-*-linux* ) - AC_DEFINE([BACKTRACE_METHOD_X86_LINUX],[1],[Define backtrace type]) - AC_DEFINE([BACKTRACE_METHOD_TEXT],["x86 custom backtrace"],[Define backtrace type]) - have_backtrace=yes - ;; - powerpc-*-linux* ) - AC_DEFINE([BACKTRACE_METHOD_PPC_LINUX],[1],[Define backtrace type]) - AC_DEFINE([BACKTRACE_METHOD_TEXT],["ppc custom backtrace"],[Define backtrace type]) - have_backtrace=yes - ;; - esac - - # Do we have a libdl with dladdr? - AC_SEARCH_LIBS(dladdr, [dl], - [AC_DEFINE([BACKTRACE_LOOKUP_METHOD_DLADDR],[1],[Define symbol lookup type]) - AC_DEFINE([BACKTRACE_LOOKUP_METHOD_TEXT],["dladdr"],[Define backtrace type]) - have_symbol_lookup=yes]) - - if test "$have_symbol_lookup" != "yes"; then - SM_FUNC_BACKTRACE_SYMBOLS - - if test "$have_backtrace_symbols" = "yes"; then - AC_DEFINE([BACKTRACE_LOOKUP_METHOD_BACKTRACE_SYMBOLS],[1],[Define symbol lookup type]) - AC_DEFINE([BACKTRACE_LOOKUP_METHOD_TEXT],["backtrace_symbols"],[Define backtrace type]) - have_symbol_lookup=yes - fi - fi - - - AC_MSG_CHECKING(for crash handler components) - if test "$have_backtrace" = "yes" -a "$have_symbol_lookup" = "yes"; then - use_crash_handler=yes - AC_DEFINE([CRASH_HANDLER],1,[Define if using crash handler]) - AC_MSG_RESULT(ok) - else - AC_MSG_RESULT(incomplete; crash handler will not be used) - fi - - if test "$use_crash_handler" = "yes"; then - # All current symbol lookup methods need this flag. - LDFLAGS="$LDFLAGS -rdynamic" - - SM_FUNC_CXA_DEMANGLE - if test "$have_cxa_demangle" = "yes"; then - have_demangle=yes - AC_DEFINE([BACKTRACE_DEMANGLE_METHOD_TEXT],["cxa_demangle"],[Define demangle type]) - fi - - if test "$have_demangle" != "yes"; then - # Check for libiberty. - AC_CHECK_HEADER(libiberty.h, have_iberty_header=yes, have_iberty_header=no) - AC_SEARCH_LIBS(cplus_demangle, [iberty], have_iberty_lib=yes, have_iberty_lib=no) - - if test $have_iberty_lib = "yes" -a $have_iberty_header = "yes"; then - AC_DEFINE(HAVE_LIBIBERTY, 1, [Liberty available]) - have_demangle=yes - AC_DEFINE([BACKTRACE_DEMANGLE_METHOD_TEXT],["libiberty"],[Define demangle type]) - fi - fi - - if test "$have_demangle" != "yes"; then - echo - echo "*** Backtrace support has been detected, but libiberty is not installed." - echo "*** Libiberty will make crash reports for developers much easier to read," - echo "*** and is strongly recommended." - echo - AC_DEFINE([BACKTRACE_DEMANGLE_METHOD_TEXT],["none"],[Define demangle type]) - fi - fi -]) - diff --git a/autoconf/m4/bzip.m4 b/autoconf/m4/bzip.m4 deleted file mode 100644 index b3dbd20b5b..0000000000 --- a/autoconf/m4/bzip.m4 +++ /dev/null @@ -1,31 +0,0 @@ -AC_DEFUN([SM_BZIP], -[ - AC_REQUIRE([SM_STATIC]) - - AX_CHECK_LIB_USING_HEADER(bz2, - 'BZ2_bzCompressInit((bz_stream*) NULL, 0, 0, 0)', - bzlib.h, have_bzip=yes, have_bzip=no) - - AC_CHECK_HEADER(bzlib.h, have_bzip_header=yes, have_bzip_header=no) - AC_ARG_WITH(static-bzip, AS_HELP_STRING([--with-static-bzip],[Statically link bzip]), with_static_bzip=$withval, with_static_bzip=no) - - if test "$with_static_bzip" = "yes"; then - LIB_PRE=$START_STATIC - LIB_POST=$END_STATIC - fi - - if test "$have_bzip_header" = "no"; then - have_bzip=no - fi - - if test "$have_bzip" = "no"; then - echo "*** bzip is required to build StepMania; please make sure" - echo "*** that libbz2 is installed to continue the installation process." - exit 0; - fi - - LIBS="$LIBS $LIB_PRE -lbz2 $LIB_POST" - - LIB_PRE= - LIB_POST= -]) diff --git a/autoconf/m4/gtk-2.0.m4 b/autoconf/m4/gtk-2.0.m4 deleted file mode 100644 index 78050c26f7..0000000000 --- a/autoconf/m4/gtk-2.0.m4 +++ /dev/null @@ -1,194 +0,0 @@ -# Configure paths for GTK+ -# Owen Taylor 1997-2001 - -dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, -dnl pass to pkg-config -dnl -AC_DEFUN([AM_PATH_GTK_2_0], -[dnl -dnl Get the cflags and libraries from pkg-config -dnl -AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], - , enable_gtktest=yes) - - pkg_config_args=gtk+-2.0 - for module in . $4 - do - case "$module" in - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - esac - done - - no_gtk="" - - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - - if test x$PKG_CONFIG != xno ; then - if pkg-config --atleast-pkgconfig-version 0.7 ; then - : - else - echo *** pkg-config too old; version 0.7 or better required. - no_gtk=yes - PKG_CONFIG=no - fi - else - no_gtk=yes - fi - - min_gtk_version=ifelse([$1], ,2.0.0,$1) - AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) - - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" - enable_gtktest=no - fi - - if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then - : - else - no_gtk=yes - fi - fi - - if test x"$no_gtk" = x ; then - GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` - GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` - gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" -dnl -dnl Now check if the installed GTK+ is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) -dnl - rm -f conf.gtktest - AC_RUN_IFELSE([AC_LANG_SOURCE([[ -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtktest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -]])],[],[no_gtk=yes],[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://pkgconfig.sourceforge.net" - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK+ test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -#include -#include -]], [[ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ]])],[ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK+ or finding the wrong" - echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],[ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - rm -f conf.gtktest -]) diff --git a/autoconf/m4/iconv.m4 b/autoconf/m4/iconv.m4 deleted file mode 100644 index 9ac9bde816..0000000000 --- a/autoconf/m4/iconv.m4 +++ /dev/null @@ -1,99 +0,0 @@ -# iconv.m4 serial AM4 (gettext-0.11.3) -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], -[ - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([iconv]) -]) - -AC_DEFUN([AM_ICONV_LINK], -[ - dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and - dnl those with the standalone portable GNU libiconv installed). - - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV - dnl accordingly. - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) - - dnl Add $INCICONV to CPPFLAGS before performing the following checks, - dnl because if the user has installed libiconv and not disabled its use - dnl via --without-libiconv-prefix, he wants to use it. The first - dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed. - am_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) - - AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include -#include ]], [[iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);]])],[am_cv_func_iconv=yes],[]) - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include -#include ]], [[iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);]])],[am_cv_lib_iconv=yes - am_cv_func_iconv=yes],[]) - LIBS="$am_save_LIBS" - fi - ]) - if test "$am_cv_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) - fi - if test "$am_cv_lib_iconv" = yes; then - AC_MSG_CHECKING([how to link with libiconv]) - AC_MSG_RESULT([$LIBICONV]) - else - dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV - dnl either. - CPPFLAGS="$am_save_CPPFLAGS" - LIBICONV= - LTLIBICONV= - fi - AC_SUBST(LIBICONV) - AC_SUBST(LTLIBICONV) -]) - -AC_DEFUN([AM_ICONV], -[ - AM_ICONV_LINK - if test "$am_cv_func_iconv" = yes; then - AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL(am_cv_proto_iconv, [ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include -#include -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif -]], [[]])],[am_cv_proto_iconv_arg1=""],[am_cv_proto_iconv_arg1="const"]) - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) - am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([$]{ac_t:- - }[$]am_cv_proto_iconv) - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, - [Define as const if the declaration of iconv() needs const.]) - fi -]) diff --git a/autoconf/m4/lib-ld.m4 b/autoconf/m4/lib-ld.m4 deleted file mode 100644 index 96c4e2c339..0000000000 --- a/autoconf/m4/lib-ld.m4 +++ /dev/null @@ -1,110 +0,0 @@ -# lib-ld.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. - -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. -AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(acl_cv_path_LD, -[if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; - *) - test "$with_gnu_ld" != yes && break ;; - esac - fi - done - IFS="$ac_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$acl_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT($LD) -else - AC_MSG_RESULT(no) -fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_LIB_PROG_LD_GNU -]) diff --git a/autoconf/m4/lib-link.m4 b/autoconf/m4/lib-link.m4 deleted file mode 100644 index 92929193f1..0000000000 --- a/autoconf/m4/lib-link.m4 +++ /dev/null @@ -1,630 +0,0 @@ -# lib-link.m4 serial 8 (gettext-0.15) -dnl Copyright (C) 2001-2006 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_PREREQ(2.50) - -dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and -dnl augments the CPPFLAGS variable. -AC_DEFUN([AC_LIB_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - ac_cv_lib[]Name[]_libs="$LIB[]NAME" - ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" - ac_cv_lib[]Name[]_cppflags="$INC[]NAME" - ]) - LIB[]NAME="$ac_cv_lib[]Name[]_libs" - LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" - INC[]NAME="$ac_cv_lib[]Name[]_cppflags" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the - dnl results of this search when this library appears as a dependency. - HAVE_LIB[]NAME=yes - undefine([Name]) - undefine([NAME]) -]) - -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) -dnl searches for libname and the libraries corresponding to explicit and -dnl implicit dependencies, together with the specified include files and -dnl the ability to compile and link the specified testcode. If found, it -dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and -dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and -dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs -dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. -AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - - dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - - dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, - dnl because if the user has installed lib[]Name and not disabled its use - dnl via --without-lib[]Name-prefix, he wants to use it. - ac_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ - ac_save_LIBS="$LIBS" - LIBS="$LIBS $LIB[]NAME" - AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) - LIBS="$ac_save_LIBS" - ]) - if test "$ac_cv_lib[]Name" = yes; then - HAVE_LIB[]NAME=yes - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) - AC_MSG_CHECKING([how to link with lib[]$1]) - AC_MSG_RESULT([$LIB[]NAME]) - else - HAVE_LIB[]NAME=no - dnl If $LIB[]NAME didn't lead to a usable library, we don't need - dnl $INC[]NAME either. - CPPFLAGS="$ac_save_CPPFLAGS" - LIB[]NAME= - LTLIB[]NAME= - fi - AC_SUBST([HAVE_LIB]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - undefine([Name]) - undefine([NAME]) -]) - -dnl Determine the platform dependent parameters needed to use rpath: -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, -dnl hardcode_direct, hardcode_minus_L. -AC_DEFUN([AC_LIB_RPATH], -[ - dnl Tell automake >= 1.10 to complain if config.rpath is missing. - m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) - AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS - AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh - . ./conftest.sh - rm -f ./conftest.sh - acl_cv_rpath=done - ]) - wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" - dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE(rpath, - [ --disable-rpath do not hardcode runtime library paths], - :, enable_rpath=yes) -]) - -dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. -AC_DEFUN([AC_LIB_LINKFLAGS_BODY], -[ - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib$1-prefix], -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib - --without-lib$1-prefix don't search for lib$1 in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/$acl_libdirstem" - fi - fi -]) - dnl Search the library and its dependencies in $additional_libdir and - dnl $LDFLAGS. Using breadth-first-seach. - LIB[]NAME= - LTLIB[]NAME= - INC[]NAME= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='$1 $2' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - dnl See if it was already located by an earlier AC_LIB_LINKFLAGS - dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" - else - dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined - dnl that this library doesn't exist. So just drop it. - : - fi - else - dnl Search the library lib$name in $additional_libdir and $LDFLAGS - dnl and the already constructed $LIBNAME/$LTLIBNAME. - found_dir= - found_la= - found_so= - found_a= - if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then - found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - dnl Found the library. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - dnl Linking with a shared library. We attempt to hardcode its - dnl directory into the executable's runpath, unless it's the - dnl standard /usr/lib. - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then - dnl No hardcoding is needed. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - dnl The hardcoding into $LIBNAME is system dependent. - if test "$hardcode_direct" = yes; then - dnl Using DIR/libNAME.so during linking hardcodes DIR into the - dnl resulting binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - dnl Rely on "-L$found_dir". - dnl But don't add it if it's already contained in the LDFLAGS - dnl or the already constructed $LIBNAME - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" - fi - if test "$hardcode_minus_L" != no; then - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH - dnl here, because this doesn't fit in flags passed to the - dnl compiler. So give up. No hardcoding. This affects only - dnl very old systems. - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - dnl Linking with a static library. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" - else - dnl We shouldn't come here, but anyway it's good to have a - dnl fallback. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" - fi - fi - dnl Assume the include files are nearby. - additional_includedir= - case "$found_dir" in - */$acl_libdirstem | */$acl_libdirstem/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - dnl Potentially add $additional_includedir to $INCNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's /usr/local/include and we are using GCC on Linux, - dnl 3. if it's already present in $CPPFLAGS or the already - dnl constructed $INCNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INC[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $INCNAME. - INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - dnl Look for dependencies. - if test -n "$found_la"; then - dnl Read the .la file. It defines the variables - dnl dlname, library_names, old_library, dependency_libs, current, - dnl age, revision, installed, dlopen, dlpreopen, libdir. - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - dnl We use only dependency_libs. - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's /usr/local/lib and we are using GCC on Linux, - dnl 3. if it's already present in $LDFLAGS or the already - dnl constructed $LIBNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LIBNAME. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LTLIBNAME. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - dnl Handle this in the next round. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - dnl Handle this in the next round. Throw away the .la's - dnl directory; it is already contained in a preceding -L - dnl option. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - dnl Most likely an immediate library name. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" - ;; - esac - done - fi - else - dnl Didn't find the library; assume it is in the system directories - dnl known to the linker and runtime loader. (All the system - dnl directories known to the linker should also be known to the - dnl runtime loader, otherwise the system is severely misconfigured.) - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user must - dnl pass all path elements in one option. We can arrange that for a - dnl single library, but not when more than one $LIBNAMEs are used. - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" - done - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - else - dnl The -rpath options are cumulative. - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - dnl When using libtool, the option that works for both libraries and - dnl executables is -R. The -R options are cumulative. - for found_dir in $ltrpathdirs; do - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" - done - fi -]) - -dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, -dnl unless already present in VAR. -dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes -dnl contains two or three consecutive elements that belong together. -AC_DEFUN([AC_LIB_APPENDTOVAR], -[ - for element in [$2]; do - haveit= - for x in $[$1]; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - [$1]="${[$1]}${[$1]:+ }$element" - fi - done -]) - -dnl For those cases where a variable contains several -L and -l options -dnl referring to unknown libraries and directories, this macro determines the -dnl necessary additional linker options for the runtime path. -dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL]) -dnl sets LDADDVAR to linker options needed together with LIBSVALUE. -dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed, -dnl otherwise linking without libtool is assumed. -AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], -[ - AC_REQUIRE([AC_LIB_RPATH]) - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - $1= - if test "$enable_rpath" != no; then - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode directories into the resulting - dnl binary. - rpathdirs= - next= - for opt in $2; do - if test -n "$next"; then - dir="$next" - dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem"; then - rpathdirs="$rpathdirs $dir" - fi - next= - else - case $opt in - -L) next=yes ;; - -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` - dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem"; then - rpathdirs="$rpathdirs $dir" - fi - next= ;; - *) next= ;; - esac - fi - done - if test "X$rpathdirs" != "X"; then - if test -n ""$3""; then - dnl libtool is used for linking. Use -R options. - for dir in $rpathdirs; do - $1="${$1}${$1:+ }-R$dir" - done - else - dnl The linker is used for linking directly. - if test -n "$hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user - dnl must pass all path elements in one option. - alldirs= - for dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$dir" - done - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - $1="$flag" - else - dnl The -rpath options are cumulative. - for dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$dir" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - $1="${$1}${$1:+ }$flag" - done - fi - fi - fi - fi - fi - AC_SUBST([$1]) -]) diff --git a/autoconf/m4/lib-prefix.m4 b/autoconf/m4/lib-prefix.m4 deleted file mode 100644 index a8684e17e3..0000000000 --- a/autoconf/m4/lib-prefix.m4 +++ /dev/null @@ -1,185 +0,0 @@ -# lib-prefix.m4 serial 5 (gettext-0.15) -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and -dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't -dnl require excessive bracketing. -ifdef([AC_HELP_STRING], -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], -[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) - -dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed -dnl to access previously installed libraries. The basic assumption is that -dnl a user will want packages to use other packages he previously installed -dnl with the same --prefix option. -dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate -dnl libraries, but is otherwise very convenient. -AC_DEFUN([AC_LIB_PREFIX], -[ - AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib-prefix], -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib - --without-lib-prefix don't search for libraries in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/$acl_libdirstem" - fi - fi -]) - if test $use_additional = yes; then - dnl Potentially add $additional_includedir to $CPPFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's already present in $CPPFLAGS, - dnl 3. if it's /usr/local/include and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - for x in $CPPFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $CPPFLAGS. - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" - fi - fi - fi - fi - dnl Potentially add $additional_libdir to $LDFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's already present in $LDFLAGS, - dnl 3. if it's /usr/local/lib and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then - haveit= - for x in $LDFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LDFLAGS. - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" - fi - fi - fi - fi - fi -]) - -dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, -dnl acl_final_exec_prefix, containing the values to which $prefix and -dnl $exec_prefix will expand at the end of the configure script. -AC_DEFUN([AC_LIB_PREPARE_PREFIX], -[ - dnl Unfortunately, prefix and exec_prefix get only finally determined - dnl at the end of configure. - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" - fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the -dnl variables prefix and exec_prefix bound to the values they will have -dnl at the end of the configure script. -AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], -[ - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - $1 - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing -dnl the basename of the libdir, either "lib" or "lib64". -AC_DEFUN([AC_LIB_PREPARE_MULTILIB], -[ - dnl There is no formal standard regarding lib and lib64. The current - dnl practice is that on a system supporting 32-bit and 64-bit instruction - dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit - dnl libraries go under $prefix/lib. We determine the compiler's default - dnl mode by looking at the compiler's library search path. If at least - dnl of its elements ends in /lib64 or points to a directory whose absolute - dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the - dnl default, namely "lib". - acl_libdirstem=lib - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi -]) diff --git a/autoconf/m4/opengl.m4 b/autoconf/m4/opengl.m4 deleted file mode 100644 index d9da087811..0000000000 --- a/autoconf/m4/opengl.m4 +++ /dev/null @@ -1,49 +0,0 @@ - -AC_DEFUN([SM_OPENGL], -[ - AC_LANG_PUSH(C) - - AC_CHECK_HEADER("GL/gl.h", , - AC_MSG_ERROR("OpenGL headers not found."), [$GL_INCLUDES]) - - GL_LIBS="" - - AX_CHECK_LIB_USING_HEADER(GL, glBegin(GL_POINTS), GL/gl.h, [GL_LIBS="-lGL"]) - - if test "$GL_LIBS" = ""; then - AX_CHECK_LIB_USING_HEADER(opengl32, glBegin(GL_POINTS), GL/gl.h, [GL_LIBS="-lopengl32"]) - fi - - if test "$GL_LIBS" = ""; then - AC_MSG_ERROR("No usable OpenGL library found.") - fi - - AX_CHECK_LIB_USING_HEADER(GLU, gluGetString(GLU_VERSION), GL/glu.h, [GLU_LIBS="-lGLU"]) - - if test "$GLU_LIBS" = ""; then - AX_CHECK_LIB_USING_HEADER(glu32, gluGetString(GLU_VERSION), GL/glu.h, [GLU_LIBS="-lglu32"]) - fi - - if test "$GLU_LIBS" = ""; then - AC_MSG_ERROR("No usable GLU library found.") - fi - - AX_CHECK_LIB_USING_HEADER(GLEW, glewInit(), GL/glew.h, [GLEW_LIBS="$LIBS -lGLEW"]) - - if test "$GLEW_LIBS" = ""; then - AX_CHECK_LIB_USING_HEADER(glew32, glewInit(), GL/glew.h, [GLEW_LIBS="$LIBS -lglew32"], , [$GL_LIBS]) - fi - - if test "$GLEW_LIBS" = ""; then - AC_DEFINE([GLEW_STATIC], [], [Tell GLEW it is a static library.]) - AX_CHECK_LIB_USING_HEADER(glew32, glewInit(), GL/glew.h, [GLEW_LIBS="$LIBS -lglew32"], , [$GL_LIBS]) - fi - - if test "$GLEW_LIBS" = ""; then - AC_MSG_ERROR("No usable version of GLEW found.") - fi - - AC_CHECK_DECL(GLEW_VERSION_2_1, , AC_MSG_ERROR("GLEW 1.3.5 or newer is required."), [#include ]) - - GL_LIBS="$GL_LIBS $GLU_LIBS $GLEW_LIBS" -]) \ No newline at end of file diff --git a/autoconf/m4/static-link.m4 b/autoconf/m4/static-link.m4 deleted file mode 100644 index fe5c65cb08..0000000000 --- a/autoconf/m4/static-link.m4 +++ /dev/null @@ -1,19 +0,0 @@ -# public domain - -AC_DEFUN([SM_STATIC], [ - OLD_LDFLAGS=$LDFLAGS - - START_STATIC="-Wl,-static" - END_STATIC="-Wl,-dy" - - LDFLAGS="$LDFLAGS $START_STATIC $END_STATIC" - AC_MSG_CHECKING(for selective static linking) - AC_TRY_LINK([], [], [AC_MSG_RESULT([$START_STATIC ... $END_STATIC])], [ - START_STATIC="" - END_STATIC="" - AC_MSG_RESULT(no) - ]) - - LDFLAGS=$OLD_LDFLAGS -]) - diff --git a/autoconf/m4/tls.m4 b/autoconf/m4/tls.m4 deleted file mode 100644 index 58719ed3db..0000000000 --- a/autoconf/m4/tls.m4 +++ /dev/null @@ -1,15 +0,0 @@ -# See if we have working TLS. We only check to see if it compiles, and that -# the resulting program actually runs, not whether the resulting TLS variables -# work properly; that check is done at runtime, since we can run binaries -# compiled with __thread on systems without TLS. -AC_DEFUN([SM_TLS], -[ - AC_MSG_CHECKING(for TLS) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ static __thread int val; int main() { return 0; } ]])],[have_tls=yes],[have_tls=no],[have_tls=no ]) - AC_MSG_RESULT($have_tls) - if test "$have_tls" = "yes"; then - AC_DEFINE([HAVE_TLS],[1],[Define if the compiler supports __thread]) - AC_DEFINE([thread_local],[__thread],[Define to the compiler TLS keyword]) - fi -]) - diff --git a/autoconf/m4/video.m4 b/autoconf/m4/video.m4 deleted file mode 100644 index b48fba1e2a..0000000000 --- a/autoconf/m4/video.m4 +++ /dev/null @@ -1,126 +0,0 @@ -AC_DEFUN([SM_VIDEO], [ - -AC_REQUIRE([SM_STATIC]) - -AC_ARG_WITH(ffmpeg, AS_HELP_STRING([--without-ffmpeg],[Disable ffmpeg support]), with_ffmpeg=$withval, with_ffmpeg=yes) -AC_ARG_WITH(ffmpeg-rpath, AS_HELP_STRING([--with-ffmpeg-rpath],[Specify RPATH for ffmpeg]), ffmpeg_rpath=$withval, ffmpeg_rpath=no) -AC_ARG_WITH(static-ffmpeg, AS_HELP_STRING([--with-static-ffmpeg],[Statically link ffmpeg libraries]), with_static_ffmpeg=$withval, with_static_ffmpeg=no) -AM_CONDITIONAL(STATIC_FFMPEG, test "$with_static_ffmpeg" = "yes") -AC_ARG_WITH(system-ffmpeg, AS_HELP_STRING([--with-system-ffmpeg], [Use system instead of bundled ffmpeg (UNSUPPORTED)]), system_ffmpeg=yes, system_ffmpeg=no) -AM_CONDITIONAL(SYSTEM_FFMPEG, test "$system_ffmpeg" = "yes") -AM_CONDITIONAL(WITHOUT_FFMPEG, test "$with_ffmpeg" != "yes") - -VIDEO_CFLAGS= -VIDEO_LIBS= - -if test "$with_static_ffmpeg" = "yes"; then - LIB_PRE=$START_STATIC - LIB_POST=$END_STATIC -fi - -have_ffmpeg=no -if test "$with_ffmpeg" = "yes"; then - if test "$system_ffmpeg" = "yes"; then - if pkg-config --libs libavcodec &> /dev/null; then AVCODEC_LIBS="`pkg-config --libs libavcodec`"; else AVCODEC_LIBS="-lavutil"; fi - if pkg-config --libs libavformat &> /dev/null; then AVFORMAT_LIBS="`pkg-config --libs libavformat`"; else AVFORMAT_LIBS="-lavcodec -lavutil"; fi - if pkg-config --libs libswscale &> /dev/null; then SWSCALE_LIBS="`pkg-config --libs libswscale`"; else SWSCALE_LIBS="-lavutil"; fi - if test "$with_static_ffmpeg" = "yes" -o "$with_static_ffmpeg" = "no"; then - AC_CHECK_LIB(avutil, av_free, have_libavutil=yes, have_libavutil=no) - AC_CHECK_LIB(avcodec, avcodec_register_all, have_libavcodec=yes, have_libavcodec=no, [$AVCODEC_LIBS]) - AC_CHECK_LIB(avformat, av_guess_format, have_libavformat=yes, have_libavformat=no, [$AVFORMAT_LIBS]) - AC_CHECK_LIB(swscale, sws_scale, have_libswscale=yes, have_libswscale=no, [$SWSCALE_LIBS]) - if test "$have_libavutil" = "yes" -a "$have_libavformat" = "yes" -a "$have_libavcodec" = "yes" -a "$have_libswscale" = "yes"; then - have_ffmpeg=yes - VIDEO_LIBS="$LIB_PRE -lswscale -lavformat -lswscale -lavcodec -lavutil $LIB_POST $VIDEO_LIBS" - fi - else - if test "$(echo $with_static_ffmpeg | cut -c 1)" != "/"; then - with_static_ffmpeg="$(/bin/pwd)/$with_static_ffmpeg" - fi - - ffmpeg_save_CFLAGS="$CFLAGS" - ffmpeg_save_CXXFLAGS="$CXXFLAGS" - ffmpeg_save_LIBS="$LIBS" - - FFMPEG_CFLAGS="-I$with_static_ffmpeg/include" - - FFMPEG_LIBS="$with_static_ffmpeg/lib/libavutil.a $FFMPEG_LIBS" - FFMPEG_LIBS="$with_static_ffmpeg/lib/libavcodec.a $FFMPEG_LIBS" - FFMPEG_LIBS="$with_static_ffmpeg/lib/libavformat.a $FFMPEG_LIBS" - FFMPEG_LIBS="$with_static_ffmpeg/lib/libswscale.a $FFMPEG_LIBS" - - CFLAGS="$FFMPEG_CFLAGS $CFLAGS" - CXXFLAGS="$FFMPEG_CFLAGS $CXXFLAGS" - LIBS="$FFMPEG_LIBS -lpthread $LIBS" - - AC_CHECK_FUNC([av_free], have_libavutil=yes, have_libavutil=no) - AC_CHECK_FUNC([avcodec_register_all], have_libavcodec=yes, have_libavcodec=no, [$AVCODEC_LIBS]) - AC_CHECK_FUNC([av_guess_format], have_libavformat=yes, have_libavformat=no, [$AVFORMAT_LIBS]) - AC_CHECK_FUNC([sws_scale], have_libswscale=yes, have_libswscale=no, [$SWSCALE_LIBS]) - - if test "$have_libavutil" = "yes" -a "$have_libavformat" = "yes" -a "$have_libavcodec" = "yes" -a "$have_libswscale" = "yes"; then - have_ffmpeg=yes - VIDEO_CFLAGS="$FFMPEG_CFLAGS $VIDEO_CFLAGS" - VIDEO_LIBS="$FFMPEG_LIBS $VIDEO_LIBS" - fi - - CFLAGS="$ffmpeg_save_CFLAGS" - CXXFLAGS="$ffmpeg_save_CXXFLAGS" - LIBS="$ffmpeg_save_LIBS" - fi - else -dnl System FFMpeg -dnl HACK: $prefix is set to NONE if not user specified - if test "$prefix" = "NONE"; then - our_installdir="/opt" - else - our_installdir="$prefix" - fi -dnl We might as well throw in GPL stuff as we're bound to GPL by libmad anyway. - FFMPEG_CONFFLAGS="--shlibdir=$our_installdir/stepmania-$VERSION --enable-gpl --disable-programs --disable-doc --disable-avdevice --disable-swresample --disable-postproc --disable-avfilter" - if test "$host_os" = "mingw32"; then - FFMPEG_CONFFLAGS="$FFMPEG_CONFFLAGS --arch=x86" - fi - if test "$enable_lto" = "yes"; then - FFMPEG_CONFFLAGS="$FFMPEG_CONFFLAGS --enable-lto" - fi - if test "$with_static_ffmpeg" = "yes"; then - FFMPEG_CONFFLAGS="$FFMPEG_CONFFLAGS --disable-shared --enable-static" - else - FFMPEG_CONFFLAGS="$FFMPEG_CONFFLAGS --disable-static --enable-shared" - fi -dnl Run ffmpeg ./configure -dnl It's NOT autoconf-based, so AC_CONFIG_SUBDIRS does not work. - cd bundle/ffmpeg - AC_MSG_NOTICE([Configuring ffmpeg. This is quiet and takes a bit. Be patient.]) - ./configure $FFMPEG_CONFFLAGS - if test $? != 0; then - AC_MSG_ERROR([ffmpeg configuration failed.]) - fi - cd ../.. - CFLAGS="$CFLAGS -I$PWD/bundle/ffmpeg" - CXXFLAGS="$CXXFLAGS -I$PWD/bundle/ffmpeg" -dnl Make the binary find our bundled libs - if test "$ffmpeg_rpath" = "no"; then - LDFLAGS="$LDFLAGS -Wl,-rpath=. -Wl,-rpath=bundle/ffmpeg/libavutil,-rpath=bundle/ffmpeg/libavformat,-rpath=bundle/ffmpeg/libavcodec,-rpath=bundle/ffmpeg/libswscale" - else - LDFLAGS="$LDFLAGS -Wl,-rpath=$ffmpeg_rpath" - fi -dnl Classic autoconf. This CANNOT be broken across multiple lines. - VIDEO_LIBS="-L$PWD/bundle/ffmpeg/libavformat -lavformat -L$PWD/bundle/ffmpeg/libavcodec -lavcodec -L$PWD/bundle/ffmpeg/libswscale -lswscale -L$PWD/bundle/ffmpeg/libavutil -lavutil" - have_ffmpeg=yes - fi -fi - -LIB_PRE= -LIB_POST= - -AM_CONDITIONAL(HAVE_FFMPEG, test "$have_ffmpeg" = "yes") -if test "$have_ffmpeg" = "yes"; then - AC_DEFINE(HAVE_FFMPEG, 1, [FFMpeg is available]) -fi - -AC_SUBST(VIDEO_CFLAGS) -AC_SUBST(VIDEO_LIBS) - -]) diff --git a/autoconf/m4/windows.m4 b/autoconf/m4/windows.m4 deleted file mode 100644 index c6bb0fdef0..0000000000 --- a/autoconf/m4/windows.m4 +++ /dev/null @@ -1,32 +0,0 @@ -AC_DEFUN([SM_WINDOWS], -[ -dnl We are a GUI program... - LDFLAGS="$LDFLAGS -mwindows" - -dnl Windows-specific libs. It'd be difficult and of little value to test for these. - LIBS="$LIBS -lole32 -lDsound -lwinmm -ldxguid -lDinput8 -lHid -lDbghelp -lWs2_32 -lVersion -lSetupapi" - - AM_CPPFLAGS="-I$WINSDK_PATH/Include $AM_CPPFLAGS" - AM_LDFLAGS="-I$WINSDK_PATH/Lib $AM_LDFLAGS" - AC_CHECK_HEADER(windows.h, , AC_MSG_ERROR(Windows SDK not found.)) - AC_CHECK_DECL(PBS_MARQUEE, , [AC_MSG_ERROR(w32api headers too old. This is usually caused by trying to use old (official) MinGW instead of MinGW-W64.)], [#include - #include ]) - - AC_CHECK_DECL(DXGetErrorString, - , - use_dxerr9=yes, - [#include - #include ]) - - if test "$use_dxerr9" = "yes"; then - LIBS="$LIBS -ldxerr9" - AC_DEFINE([USE_DXERR9], [], [Use old dxerr9.]) - AC_CHECK_DECL(DXGetErrorString9, - , - AC_MSG_ERROR("Couldn't find DXGetErrorString in dxerr.h or DXGetErrorString9 in dxerr9.h."), - [#include - #include ]) - else - LIBS="$LIBS -ldxerr" - fi -]) \ No newline at end of file diff --git a/autoconf/m4/x11.m4 b/autoconf/m4/x11.m4 deleted file mode 100644 index 095142bfa2..0000000000 --- a/autoconf/m4/x11.m4 +++ /dev/null @@ -1,82 +0,0 @@ -AC_DEFUN([SM_X11], -[ - AC_PATH_X - - XCFLAGS= - XLIBS= - - if test "$no_x" != "yes"; then - if test -n "$x_includes"; then - XCFLAGS="-I$x_includes" - fi - - if test -n "$x_libraries"; then - XLIBS="-L$x_libraries" - fi - - XLIBS+="-lX11" - - if test -n "$x_includes"; then - # See if we can compile X applications without using $XCFLAGS. - AC_MSG_CHECKING(if $XCFLAGS is really necessary) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[]])],[XCFLAGS= - AC_MSG_RESULT(no)],[AC_MSG_RESULT(yes)]) - fi - - # Check for libXtst. - AC_CHECK_LIB(Xtst, XTestQueryExtension, - XLIBS="$XLIBS -lXtst" - [AC_DEFINE(HAVE_LIBXTST, 1, [libXtst available])], - , - [$XLIBS]) - AC_DEFINE(HAVE_X11, 1, [X11 libraries present]) - fi - - # Check for Xrandr - AC_CHECK_LIB(Xrandr, XRRQueryVersion, - have_xrandr=yes, - have_xrandr=no, - [$XLIBS]) - AC_CHECK_HEADER(X11/extensions/Xrandr.h, have_xrandr_header=yes, have_xrandr_header=no, [#include ]) - - if test "$have_xrandr_header" = "no"; then - have_xrandr=no - fi - - # Check for Xxf86vm - AC_CHECK_LIB(Xxf86vm, XF86VidModeSwitchToMode, - have_xf86vm=yes, - have_xf86vm=no, - [$XLIBS]) - AC_CHECK_HEADER(X11/extensions/xf86vmode.h, have_xf86vm_header=yes, have_xf86vm_header=no, [#include ]) - - if test "$have_xf86vm_header" = "no"; then - have_xf86vm=no - fi - - no_modeset=yes - if test "$have_xrandr" = "yes"; then - XLIBS="$XLIBS -lXrandr" - AC_DEFINE(HAVE_XRANDR, 1, [Xrandr is available]) - no_modeset=no - fi - - if test "$have_xf86vm" = "yes"; then - XLIBS="$XLIBS -lXxf86vm" - AC_DEFINE(HAVE_XF86VIDMODE, 1, [XF86VidMode is available]) - no_modeset=no - fi - - if test "$no_modeset" = "yes"; then - if test "$unix" = "yes"; then - AC_MSG_ERROR("Couldn't find X11 libraries.") - else - no_x=yes - fi - fi - - AM_CONDITIONAL(HAVE_X11, test "$no_x" != "yes") - - AC_SUBST(XCFLAGS) - AC_SUBST(XLIBS) -]) diff --git a/autoconf/m4/zlib.m4 b/autoconf/m4/zlib.m4 deleted file mode 100644 index d91891043d..0000000000 --- a/autoconf/m4/zlib.m4 +++ /dev/null @@ -1,28 +0,0 @@ -AC_DEFUN([SM_ZLIB], -[ - AC_REQUIRE([SM_STATIC]) - AC_CHECK_LIB(z, inflate, have_libz=yes, have_libz=no) - AC_CHECK_HEADER(zlib.h, have_libz_header=yes, have_libz_header=no) - AC_ARG_WITH(static-zlib, AS_HELP_STRING([--with-static-zlib],[Statically link zlib]), with_static_zlib=$withval, with_static_zlib=no) - - if test "$with_static_zlib" = "yes"; then - LIB_PRE=$START_STATIC - LIB_POST=$END_STATIC - fi - - if test "$have_libz_header" = "no"; then - have_libz=no - fi - - if test "$have_libz" = "no"; then - echo "*** zlib is required to build StepMania; please make sure" - echo "*** that zlib is installed to continue the installation process." - exit 0; - fi - - LIBS="$LIBS $LIB_PRE -lz $LIB_POST" - - LIB_PRE= - LIB_POST= -]) - diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index cadaefe14d..0000000000 --- a/autogen.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh -# Run this to generate configure, the initial makefiles, etc. -# -# Source (non-SVN) distributions should come with a "configure" script -# already generated--people simply compiling the program shouldn't -# need autoconf and friends installed. -# -# SVN only contains the source files: Makefile.am, configure.ac, and -# so on. - - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -PKG_NAME="stepmania" - -AUTOHEADER=autoheader -ACLOCAL_OPTIONS="-I autoconf/m4/" -AUTOMAKE_OPTIONS=-a - -AUTOCONF=autoconf - -(test -f $srcdir/configure.ac \ - && test -d $srcdir/src) || { - echo -n "**Error**: Directory \"$srcdir\" does not look like the" - echo " top-level $PKG_NAME directory" - - exit 1 -} - -DIE=0 - -($AUTOCONF --version) > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`autoconf' installed to compile $PKG_NAME." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/autoconf/" - DIE=1 -} - -# Try automake-1.7 and up. -if automake-1.11 --version > /dev/null 2>&1; then - ACLOCAL=aclocal-1.11 - AUTOMAKE=automake-1.11 -elif automake-1.10 --version > /dev/null 2>&1; then - ACLOCAL=aclocal-1.10 - AUTOMAKE=automake-1.10 -elif automake-1.9 --version > /dev/null 2>&1; then - ACLOCAL=aclocal-1.9 - AUTOMAKE=automake-1.9 -elif automake-1.8 --version > /dev/null 2>&1; then - ACLOCAL=aclocal-1.8 - AUTOMAKE=automake-1.8 -elif automake-1.7 --version > /dev/null 2>&1; then - ACLOCAL=aclocal-1.7 - AUTOMAKE=automake-1.7 -fi - -# If none of those were found, check if "automake" exists, and check the version. -if test -z "$AUTOMAKE" && automake --version > /dev/null 2>&1; then - version=`automake --version 2>/dev/null|head -1|sed -e 's/.* \([0-9]\+\.[0-9]\+\).*$/\1/'` - - IFS=. - set $version - if test -z "$version"; then - echo "\`automake' appears to be installed, but the version string could not" - echo "be parsed. Proceeding anyway ..." - elif test $1 -lt 1 -o $2 -lt 7; then - echo "\`automake' appears to be installed, but is not recent enough. Automake" - echo "1.7 or newer is required." - exit 1 - fi - unset IFS - ACLOCAL=aclocal - AUTOMAKE=automake -fi - -if test -z "$AUTOMAKE"; then - echo - echo "**Error**: You must have \`automake' installed to compile $PKG_NAME." - DIE=1 - NO_AUTOMAKE=yes -fi - - -# if no automake, don't bother testing for aclocal -test -n "$NO_AUTOMAKE" || ($ACLOCAL --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: Missing \`aclocal'. The version of \`automake'" - echo "installed doesn't appear recent enough." - DIE=1 -} - -if test "$DIE" -eq 1; then - exit 1 -fi - -$ACLOCAL $ACLOCAL_OPTIONS -$AUTOCONF -$AUTOHEADER -$AUTOMAKE $AUTOMAKE_OPTIONS diff --git a/configure.ac b/configure.ac deleted file mode 100644 index e0a66a8d72..0000000000 --- a/configure.ac +++ /dev/null @@ -1,409 +0,0 @@ -AC_PREREQ(2.59) -AC_INIT(StepMania, 5.0, [https://github.com/stepmania/stepmania], StepMania, [http://stepmania.com]) -AC_CONFIG_SRCDIR([src/StepMania.cpp]) -AC_CONFIG_AUX_DIR(autoconf) -AC_CANONICAL_TARGET -AC_PREFIX_DEFAULT(/opt) - -AM_INIT_AUTOMAKE([no-define]) -AC_CONFIG_HEADERS([src/config.h]) -AM_MAINTAINER_MODE - -# We don't want PROG_CC/CXX default settings, but don't ignore explicit settings. -test -z "$CFLAGS" && DEFAULT_CFLAGS=yes -test -z "$CXXFLAGS" && DEFAULT_CXXFLAGS=yes -test -z "$LDFLAGS" && DEFAULT_LDFLAGS=yes - -AC_PROG_CC -AC_PROG_CXX -AC_PROG_RANLIB -AM_PROG_CC_C_O - -test "$DEFAULT_CFLAGS" = "yes" && CFLAGS="-Wall -W -Wno-unused-parameter -Wno-switch" -test "$DEFAULT_CXXFLAGS" = "yes" && CXXFLAGS="-Wall -W -Wno-unused-parameter -Wno-switch" -test "$DEFAULT_LDFLAGS" = "yes" && LDFLAGS="" - -# If on Windows, grab the prebuilts -if test "$host_os" = "mingw32"; then - CPPFLAGS="$CPPFLAGS -I$PWD/extern/for_mingw/include" - LDFLAGS="$LDFLAGS -L$PWD/extern/for_mingw/lib" - # HACK: The prebuilts are 32bit only. Force the issue. - CFLAGS="$CFLAGS -m32" - CXXFLAGS="$CXXFLAGS -m32" - RESFLAGS="$RESFLAGS --target=pe-i386 -I$PWD/src/archutils/Win32/mingw" -fi - -AM_CONDITIONAL(WITH_TTY, test "$with_tty" = "yes") -AC_ARG_WITH(linux-tty, AS_HELP_STRING([--with-linux-tty], [Enable Linux TTY input]), with_tty=yes, with_tty=no) - -compile=release -AC_ARG_WITH(debug, AS_HELP_STRING([--with-debug],[Enable debug mode]), with_debug=$withval, with_debug=no) -AC_ARG_WITH(fast-compile, AS_HELP_STRING([--with-fast-compile],[Enable fast compile]), with_fast_compile=$withval, with_fast_compile=no) -if test "$with_debug" = "yes"; then - compile=debug -fi -if test "$with_fast_compile" = "yes"; then - compile=fast -fi - -case $compile in - release) - test "$DEFAULT_CFLAGS" = "yes" && CFLAGS="$CFLAGS -O3" - test "$DEFAULT_CXXFLAGS" = "yes" && CXXFLAGS="$CXXFLAGS -O3" - ;; - debug) - test "$DEFAULT_CFLAGS" = "yes" && CFLAGS="$CFLAGS -g" - test "$DEFAULT_CXXFLAGS" = "yes" && CXXFLAGS="$CXXFLAGS -g" - ;; - fast) - test "$DEFAULT_CFLAGS" = "yes" && CFLAGS="$CFLAGS -O2 -fno-inline" - test "$DEFAULT_CXXFLAGS" = "yes" && CXXFLAGS="$CXXFLAGS -O2 -fno-inline" - ;; -esac - -AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto], [Enable LTO]), enable_lto=$enableval, enable_lto=no) -if test x$enable_lto = xyes; then - if test "$CXX" != "g++"; then - AC_MSG_ERROR([g++ compiler is needed to use lto (if you have it installed, pass CXX=g++ to ./configure)]) - fi - gxx_version="`g++ -dumpversion`" - gxx_version_major=$(echo $gxx_version | cut -d'.' -f1) - gxx_version_minor=$(echo $gxx_version | cut -d'.' -f2) - if test [ "$gxx_version_major" -lt "4" ] || test [ "$gxx_version_minor" -lt "5" ]; then - AC_MSG_ERROR([Your g++ version is too old and doesn't support lto]) - fi - CFLAGS="$CFLAGS -O0 -flto" - CXXFLAGS="$CXXFLAGS -O0 -flto" - LDFLAGS="$LDFLAGS -flto" - case $compile in - release) - LDFLAGS="$LDFLAGS -O3" - ;; - debug) - LDFLAGS="$LDFLAGS -g" - ;; - fast) - LDFLAGS="$LDFLAGS -O2 -fno-inline" - ;; - esac - if test [ "$gxx_version_minor" -ge "8" ]; then - CFLAGS="$CFLAGS -fno-fat-lto-objects" - CXXFLAGS="$CXXFLAGS -fno-fat-lto-objects" - fi -fi - -dnl Do this early as it has its own whole configure script to run with its own errors. -SM_VIDEO - -# Some (broken?) versions of gcc treat char as unsigned, check for that. -AC_LANG_PUSH([C]) -AC_MSG_CHECKING([for gcc option to use signed chars]) -AC_RUN_IFELSE([AC_LANG_SOURCE([[int main(){return (char)-1==-1?0:1;}]])], - [sc_option=],[sc_option=-fsigned-char]) -AC_MSG_RESULT([${sc_option-none}]) -CFLAGS="$CFLAGS $sc_option" -CXXFLAGS="$CXXFLAGS $sc_option" -AC_LANG_POP([C]) - -AC_CHECK_HEADERS([sys/param.h]) - -if test x$with_debug = xyes; then - AC_DEFINE([DEBUG], 1, [Special debugging logic]) - AC_LANG_PUSH([C++]) - AC_CHECK_HEADER([debug/debug.h],[ - AC_DEFINE([_GLIBCXX_DEBUG],1,[STL debug]) - AC_DEFINE([_GLIBCXX_DEBUG_PEDANTIC],1,[STL pedantic debug])]) - AC_LANG_POP([C++]) -fi - -# Define UNIX for all Unix-like systems. Don't define it for cross-compiling to -# non-Unix-like systems. (-DUNIX selects the archutils and ArchHooks to use; if -# your platform doesn't use the Unix ones, you probably don't want to define UNIX.) -case $host_os in -*linux*) - AC_DEFINE(LINUX, 1, [Linux]) - AC_DEFINE(UNIX, 1, [Unix]) - linux=yes - unix=yes - ;; - -*bsd*) - AC_CHECK_DECL(BSD,,AC_DEFINE(BSD, 1, [BSD]),[ -#if HAVE_SYS_PARAM_H -#include -#endif]) - AC_DEFINE(UNIX, 1, [Unix]) - bsd=yes - unix=yes - ;; -*mingw*) - AC_DEFINE(WINDOWS, 1, [Windows]) - windows=yes - ;; -*) - AC_DEFINE(UNIX, 1, [Unix]) - unix=yes - ;; -esac -if test "$windows" = "yes"; then - SM_WINDOWS -fi -if test "$linux" = "yes"; then - AC_DEFINE(LUA_USE_LINUX, 1, [Linux for Lua]) -fi -AM_CONDITIONAL(UNIX, test "$unix" = "yes" ) -AM_CONDITIONAL(LINUX, test "$linux" = "yes" ) -AM_CONDITIONAL(BSD, test "$bsd" = "yes" ) -AM_CONDITIONAL(WINDOWS, test "$windows" = "yes" ) - -# Define macros for individual CPU types, for a few bits of inline assembly. -# This is for major, compatible CPU classes--"CPU_X86" includes P2, P3, P4, -# AMD, etc. If you need CPU-specific assembly, check at runtime--don't create -# separate binaries for each CPU if the binaries themselves are otherwise -# compatible. -case $host_cpu in -i?86*) - AC_DEFINE(CPU_X86, 1, [x86]) - ;; -x86_64*) - AC_DEFINE(CPU_X86_64, 1, [x86-64]) - ;; -powerpc*) - AC_DEFINE(CPU_PPC, 1, [PPC]) - have_parallel_port=no - ;; -esac -AM_CONDITIONAL(HAVE_PARALLEL_PORT, test "${have_parallel_port-yes}" = "yes") - -# Minimaid support flag -AC_ARG_WITH(minimaid, AS_HELP_STRING([--with-minimaid],[Enable Minimaid support]), with_minimaid=$withval, with_minimaid=no) -AM_CONDITIONAL(HAVE_MINIMAID, test "$with_minimaid" = "yes") - -AC_C_BIGENDIAN( - AC_DEFINE(ENDIAN_BIG, 1, [Big endian]), - AC_DEFINE(ENDIAN_LITTLE, 1, [Little endian]), - AC_MSG_ERROR([Can't determine endianness]) ) - -# If we're compiling with the SSE2 build flag, add that flag to CFLAGS and CXXFLAGS. -# (Handwritten SSE/SSE2 code isn't in the binary, but GCC's heuristics optimize enough -# vector arithmetic in Rage that this produces a noticeable speedup on SSE2 processors.) - -AC_ARG_WITH(sse2, AC_HELP_STRING([--with-sse2], [Enable SSE2 optimization]), with_sse2=$withval, with_sse2=no) - -if test "$with_sse2" = "yes"; then - CFLAGS="$CFLAGS -msse2" - CXXFLAGS="$CXXFLAGS -msse2" -fi - -AC_ARG_WITH(prof, AS_HELP_STRING([--with-prof],[Enable profiling]), with_prof=$withval, with_prof=no) -if test "$with_prof" = "yes"; then - test "$DEFAULT_CFLAGS" = "yes" && CFLAGS="$CFLAGS -pg" - test "$DEFAULT_CXXFLAGS" = "yes" && CXXFLAGS="$CXXFLAGS -pg" - test "$DEFAULT_LDFLAGS" = "yes" && LDFLAGS="$LDFLAGS -pg" -fi - -dnl Usually in libc, but not always(?) -if test "$unix" = "yes"; then - AC_SEARCH_LIBS(clock_gettime, rt,, AC_ERROR([clock_gettime() not available?])) -fi - -SM_OPENGL -SM_X11 -GL_CFLAGS="$GL_CFLAGS $XCFLAGS" -GL_LIBS="$GL_LIBS $XLIBS" - -AC_SUBST(GL_CFLAGS) -AC_SUBST(GL_LIBS) - -have_libpng=yes -SM_STATIC -AC_CHECK_LIB(png, png_create_read_struct, [x=y], have_libpng=no, [-lz -lm]) # x=y to stop autoconf from messing with LIBS -AC_CHECK_HEADER(png.h, , have_libpng=no) -AC_ARG_WITH(static-png, AS_HELP_STRING([--with-static-png],[Statically link libpng]), with_static_png=$withval, with_static_png=no) -if test "$with_static_png" = "yes"; then - LIB_PRE=$START_STATIC - LIB_POST=$END_STATIC -fi -if test "$have_libpng" = "no"; then - echo - echo "*** libpng is required to build StepMania; please make sure that" - echo "*** it is installed to continue the build process." - exit 1 -fi - -LIBS="$LIBS $LIB_PRE -lpng -lz -lm $LIB_POST" -LIB_PRE= -LIB_POST= - -AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[Disable JPEG support]), with_jpeg=$withval, with_jpeg=yes) -AC_ARG_WITH(static-jpeg, AS_HELP_STRING([--with-static-jpeg],[Statically link libjpeg]), with_static_jpeg=$withval, with_static_jpeg=no) - -if test "$with_static_png" = "yes"; then - LIB_PRE=$START_STATIC - LIB_POST=$END_STATIC -fi -if test "$with_jpeg" = "yes"; then - have_libjpeg=yes - AC_CHECK_LIB(jpeg, jpeg_read_scanlines, [x=y], have_libjpeg=no) # x=y to stop autoconf from messing with LIBS - AC_CHECK_HEADER(jpeglib.h, , have_libjpeg=no) - - if test "$have_libjpeg" = "no"; then - # Require JPEG by default, so people don't compile without it - # by accident and then come asking us why files won't load. - AC_MSG_ERROR( -[libjpeg is required to build StepMania; please make sure that it is installed -to continue the build process. If you really want to compile without JPEG -support, pass the "--without-jpeg" flag to configure.]) - fi - have_libjpeg= - - LIBS="$LIBS $LIB_PRE -ljpeg $LIB_POST" -else - AC_DEFINE(NO_JPEG_SUPPORT, 1, [JPEG support not available]) -fi -LIB_PRE= -LIB_POST= - -AC_ARG_WITH(network, AS_HELP_STRING([--without-network],[Disable networking]), with_network=$withval, with_network=yes) -if test "$with_network" = "no"; then - AC_DEFINE(WITHOUT_NETWORKING, 1, [Networking support not available]) -fi -AM_CONDITIONAL(WITHOUT_NETWORKING, test "$with_network" = "no") - -AC_ARG_WITH(gles2, AS_HELP_STRING([--without-gles2],[Disable OpenGL ES 2.0]), with_gles2=$withval, with_gles2=yes) -if test "$with_gles2" = "no"; then - AC_DEFINE(WITHOUT_GLES2, 1, [OpenGL ES 2.0 support not available]) -fi -AM_CONDITIONAL(WITHOUT_GLES2, test "$with_gles2" = "no") - -AM_ICONV -# HACK: The iconv check can pass erroneously on mingw64 under some conditions I'm not really sure of. -if test "$windows" = "yes"; then - LIBS="$LIBS -liconv" -else - LIBS="$LIBS $LIBICONV" -fi - -SM_ZLIB -SM_BZIP -SM_AUDIO -dnl SM_VIDEO -SM_TLS - -SM_CHECK_CRASH_HANDLER - -AM_PATH_ALSA(0.9.0,AC_DEFINE([HAVE_ALSA],1,[Define presence of ALSA]),alsa=false) - -AC_ARG_ENABLE(gtk2, AS_HELP_STRING([--disable-gtk2],[Disable GTK support]), enable_gtk2=$enableval, enable_gtk2=yes) - -if test x$enable_gtk2 = xyes; then - AM_PATH_GTK_2_0(2.0.0,AC_DEFINE([HAVE_GTK],1,[Define presence of GTK]),enable_gtk2=no) -fi - -AC_CHECK_HEADER(sys/soundcard.h, [AC_DEFINE(HAVE_OSS, 1, [OSS support available])]) -AC_CHECK_DECL(OSS_GETVERSION, AC_DEFINE([HAVE_OSS_GETVERSION],1,[OSS_GETVERSION is defined]), , [#include ]) -AC_ARG_ENABLE(force-oss, AS_HELP_STRING([--enable-force-oss],[Force OSS]), force_oss=$enableval, force_oss=no) -AC_CHECK_HEADER(stdint.h, , [AC_DEFINE(MISSING_STDINT_H, 1, [stdint.h is missing])]) -AC_CHECK_HEADERS([inttypes.h endian.h machine/endian.h alloca.h]) - -have_pulse=no -AC_CHECK_LIB(pulse, pa_stream_new, have_pulse=yes) -if test x$have_pulse = xyes; then - AC_DEFINE(HAVE_PULSE, 1, [pulseaudio support available]) - LIBS="$LIBS -lpulse" -fi - -dnl Search for JACK unless --without-jack or --with-jack=no is given; require it for --with-jack -AC_ARG_WITH([jack], [AS_HELP_STRING([--without-jack], [Disable JACK sound driver])]) -AS_IF([test "x$with_jack" != "xno"], [ - AC_SEARCH_LIBS([jack_client_open], [jack], [have_jack=yes], [ - AS_IF([test "x$with_jack" != x], [ - AC_MSG_ERROR([--with-jack was specified but JACK was not found]) - ]) - ]) -]) - -AC_MSG_CHECKING(if cstdlib breaks llabs) -AC_LANG_PUSH(C++) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - #include - using namespace std;]], [[llabs(1)]])],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(yes) - AC_DEFINE([NEED_CSTDLIB_WORKAROUND], 1, [cstdlib breaks llabs]) - ]) -AC_LANG_POP(C++) - -# TODO: This should have a --with option to force it on -if test "$windows" != "yes"; then -AC_CHECK_LIB( pthread, pthread_create, [have_pthread=yes; AC_DEFINE([HAVE_LIBPTHREAD],1,[libpthread is available])], have_pthread=no) -AC_CHECK_LIB( pthread, pthread_mutex_timedlock, AC_DEFINE([HAVE_PTHREAD_MUTEX_TIMEDLOCK],1,[pthreads has pthread_mutex_timedlock()]) ) -AC_CHECK_LIB( pthread, pthread_cond_timedwait, AC_DEFINE([HAVE_PTHREAD_COND_TIMEDWAIT],1,[pthreads has pthread_cond_timedwait()]) ) -fi - -# XXX: This isn't always being included when it is needed. Just force it in. -if test "$have_pthread" = "yes"; then - LIBS="$LIBS -lpthread" -fi - -AM_CONDITIONAL(HAVE_PTHREAD, test "$have_pthread" = "yes") - -# Always: -AC_DEFINE(_GNU_SOURCE, 1, [Use GNU extensions]) -AC_DEFINE(__STDC_FORMAT_MACROS, 1, [Use PRId64 and similar]) -AC_DEFINE(USE_GITVERSION, 1, [We are generating gitversion.h]) - -AM_CONDITIONAL(HAVE_ALSA, test x$alsa != xfalse ) -AM_CONDITIONAL(HAVE_GTK, test "$enable_gtk2" != "no" ) -AM_CONDITIONAL(HAVE_JACK, test x$have_jack = xyes) -AM_CONDITIONAL(HAVE_OSS, test x$ac_cv_header_sys_soundcard_h = xyes ) -AM_CONDITIONAL(HAVE_PULSE, test x$have_pulse = xyes) -AM_CONDITIONAL(USE_CRASH_HANDLER, test "$use_crash_handler" = "yes" ) - -if test x$force_oss = xyes && test x$ac_cv_header_sys_soundcard_h = xyes; then - AC_DEFINE([FORCE_OSS], 1, [Force OSS Usage]) -fi - -AC_CHECK_DECL(powf, , AC_DEFINE([NEED_POWF],1,[Need powf]), [#include ]) -AC_CHECK_DECL(sqrtf, , AC_DEFINE([NEED_SQRTF],1,[Need sqrtf]), [#include ]) -AC_CHECK_DECL(sinf, , AC_DEFINE([NEED_SINF],1,[Need sinf]), [#include ]) -AC_CHECK_DECL(tanf, , AC_DEFINE([NEED_COSF],1,[Need tanf]), [#include ]) -AC_CHECK_DECL(cosf, , AC_DEFINE([NEED_TANF],1,[Need cosf]), [#include ]) -AC_CHECK_DECL(acosf, , AC_DEFINE([NEED_ACOSF],1,[Need acosf]), [#include ]) -AC_CHECK_DECL(roundf, , AC_DEFINE([NEED_ROUNDF],1,[Need roundf]), [#include ]) -AC_CHECK_DECL(truncf, , AC_DEFINE([NEED_TRUNCF],1,[Need truncf]), [#include ]) -AC_CHECK_DECL(strtof, , AC_DEFINE([NEED_STRTOF],1,[Need strtof]), [#include ]) - -# This doesn't work on glibc math functions: -# AC_CHECK_FUNCS([sqrtf sinf tanf cosf acosf roundf truncf]) - -AC_CHECK_DECLS([SIGPWR, SIGUSR1],,,[#include ]) - -AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests],[Build test programs]), enable_tests=$enableval, enable_tests=no) -AM_CONDITIONAL(BUILD_TESTS, test "$enable_tests" = "yes" ) - -AC_ARG_ENABLE(lua-binaries, AS_HELP_STRING([--enable-lua-binaries],[Build lua and luac]), enable_lua_binaries=$enableval, enable_lua_binaries=no) -AM_CONDITIONAL(BUILD_LUA_BINARIES, test "$enable_lua_binaries" = "yes" ) - -AC_SUBST(RESFLAGS) - -dnl Add these after all tests are done as they don't exist just yet. -LIBS="$LIBS $FFMPEG_LIBS" - -# Selection between bundled pcre and system pcre -AC_ARG_WITH(system-pcre, AS_HELP_STRING([--with-system-pcre],[Disable building of bundled libpcre]), with_system_pcre=$withval, with_system_pcre=no) -AM_CONDITIONAL(USE_SYSTEM_PCRE, test "$with_system_pcre" == "yes") - -if test "$with_system_pcre" == "yes"; then - have_libpcre=yes - AC_CHECK_HEADER(pcre.h, , have_libpcre=no) - if test "$have_libpcre" = "no"; then - AC_MSG_ERROR([If you want to use system libpcre, please make sure that it is installed. Otherwise please configure with --without-system-pcre.]) - else - AC_DEFINE([USE_SYSTEM_PCRE], 1, [Build with system libpcre]) - LIBS="$LIBS -lpcre" - fi -fi - -AC_CONFIG_FILES(Makefile) -AC_CONFIG_FILES(bundle/Makefile) -AC_CONFIG_FILES(src/Makefile) -AC_OUTPUT diff --git a/src/CMakeData-gtk.cmake b/src/CMakeData-gtk.cmake index 3483157727..bcd6431a48 100644 --- a/src/CMakeData-gtk.cmake +++ b/src/CMakeData-gtk.cmake @@ -19,8 +19,6 @@ target_include_directories("LoadingWindowGtk" PRIVATE "${SM_SRC_DIR}" target_link_libraries("LoadingWindowGtk" ${GTK3_LIBRARIES}) -target_compile_definitions("LoadingWindowGtk" PRIVATE CMAKE_POWERED) - list(APPEND SMDATA_LINK_LIB "LoadingWindowGtk") list(APPEND SMDATA_ARCH_LOADING_HPP "arch/LoadingWindow/LoadingWindow_Gtk.h") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 66f052ef00..6b32e80070 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -121,8 +121,6 @@ if(WITH_NO_ROLC_TOMCRYPT) sm_add_compile_definition("${SM_EXE_NAME}" LTC_NO_ROLC) endif() -sm_add_compile_definition("${SM_EXE_NAME}" CMAKE_POWERED) - if(NOT WITH_NETWORKING) sm_add_compile_definition("${SM_EXE_NAME}" WITHOUT_NETWORKING) endif() diff --git a/src/CMakeProject-texture.cmake b/src/CMakeProject-texture.cmake index f286adc6df..2385b5c484 100644 --- a/src/CMakeProject-texture.cmake +++ b/src/CMakeProject-texture.cmake @@ -41,8 +41,6 @@ if(NOT WITH_STATIC_LINKING) sm_add_compile_definition("TextureFontGenerator" _AFXDLL) endif() -sm_add_compile_definition("TextureFontGenerator" CMAKE_POWERED) - list(APPEND TEXTURE_LINK_LIB "zlib" "png") target_link_libraries("TextureFontGenerator" ${TEXTURE_LINK_LIB}) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 41715f8206..0000000000 --- a/src/Makefile.am +++ /dev/null @@ -1,845 +0,0 @@ -AUTOMAKE_OPTIONS = subdir-objects - -# Windows resource files -# Using $^ here makes it add .dirstamp garbage as well. So just the first file please. -.rc.o: - windres $(RESFLAGS) $< $@ - -## Do not install stepmania in the traditional way. -noinst_PROGRAMS = stepmania -TESTS = -tests: $(TESTS) -if BUILD_TESTS - noinst_PROGRAMS += $(TESTS) -endif - -AM_LDFLAGS = -AM_CXXFLAGS = -AM_CFLAGS = -noinst_LIBRARIES = -EXTRA_DIST = - -AM_CXXFLAGS += -fno-exceptions - -# Relax inlining; the default of 600 takes way too long to compile and -# generates enormous output. -AM_CXXFLAGS += -finline-limit=300 - -AM_CXXFLAGS += $(GL_CFLAGS) - -.PHONY: ver.cpp - -ver.cpp: - if test -e ver.cpp; then \ - build=`sed -rs 's/.*version_num = ([[:digit:]]+);/\1/;2q;d' ver.cpp`; \ - build=`expr $$build + 1`; \ - else \ - build=0; \ - fi; \ - echo "#include \"ver.h\"" > ver.cpp; \ - echo "const unsigned long version_num = $$build;" >> ver.cpp -# Header inclusion necessary to get linker symbols right - echo "const char *const version_time = \"`date +"%X %Z (UTC%:z)"`\";" >> ver.cpp - echo "const char *const version_date = \"`date +"%Y%m%d"`\";" >> ver.cpp - if git rev-parse --short HEAD; then \ - echo "const char *const product_version = \"5.0-git-`git rev-parse --short HEAD`\";" >> ver.cpp; \ - else \ - echo "const char *const product_version = \"5.0-UNKNOWN\";" >> ver.cpp; \ - fi - -PNG = \ -../extern/libpng/png.c ../extern/libpng/.png.h \ -../extern/libpng/pngconf.h ../extern/libpng/pngdebug.h \ -../extern/libpng/pngerror.c ../extern/libpng/pngget.c \ -../extern/libpng/pnginfo.h ../extern/libpng/scripts/pnglibconf.h \ -../extern/libpng/pngmem.c ../extern/libpng/pngpread.c \ -../extern/libpng/pngpriv.h ../extern/libpng/pngread.c \ -../extern/libpng/pngrio.c ../extern/libpng/pngrtran.c \ -../extern/libpng/pngrutil.c ../extern/libpng/pngset.c \ -../extern/libpng/pngstruct.h ../extern/libpng/pngtrans.c \ -../extern/libpng/pngwio.c ../extern/libpng/pngwrite.c \ -../extern/libpng/pngwtran.c ../extern/libpng/pngwutil.c - -Screens = \ -Screen.cpp Screen.h ScreenAttract.cpp ScreenAttract.h \ -ScreenBookkeeping.cpp ScreenBookkeeping.h \ -ScreenContinue.cpp ScreenContinue.h \ -ScreenDebugOverlay.cpp ScreenDebugOverlay.h \ -ScreenDemonstration.cpp ScreenDemonstration.h ScreenDimensions.h \ -ScreenEdit.cpp ScreenEdit.h \ -ScreenEditMenu.cpp ScreenEditMenu.h ScreenEnding.cpp ScreenEnding.h \ -ScreenEvaluation.cpp ScreenEvaluation.h \ -ScreenExit.cpp ScreenExit.h ScreenNetEvaluation.cpp ScreenNetEvaluation.h \ -ScreenNetSelectMusic.cpp ScreenNetSelectMusic.h ScreenNetSelectBase.cpp ScreenNetSelectBase.h ScreenNetRoom.cpp ScreenNetRoom.h \ -ScreenGameplay.cpp ScreenGameplay.h \ -ScreenGameplayLesson.cpp ScreenGameplayLesson.h \ -ScreenGameplayNormal.cpp ScreenGameplayNormal.h \ -ScreenGameplayShared.cpp ScreenGameplayShared.h \ -ScreenGameplaySyncMachine.cpp ScreenGameplaySyncMachine.h \ -ScreenHighScores.cpp ScreenHighScores.h \ -ScreenHowToPlay.cpp ScreenHowToPlay.h \ -ScreenInstallOverlay.cpp ScreenInstallOverlay.h \ -ScreenInstructions.cpp ScreenInstructions.h \ -ScreenJukebox.cpp ScreenJukebox.h \ -ScreenMapControllers.cpp ScreenMapControllers.h \ -ScreenMessage.cpp ScreenMessage.h ScreenMiniMenu.cpp ScreenMiniMenu.h \ -ScreenNameEntry.cpp ScreenNameEntry.h ScreenNameEntryTraditional.cpp ScreenNameEntryTraditional.h \ -ScreenOptions.cpp ScreenOptions.h \ -ScreenOptionsCourseOverview.cpp ScreenOptionsCourseOverview.h \ -ScreenOptionsEditCourse.cpp ScreenOptionsEditCourse.h \ -ScreenOptionsEditProfile.cpp ScreenOptionsEditProfile.h \ -ScreenOptionsExportPackage.cpp ScreenOptionsExportPackage.h \ -ScreenOptionsManageCourses.cpp ScreenOptionsManageCourses.h \ -ScreenOptionsManageEditSteps.cpp ScreenOptionsManageEditSteps.h \ -ScreenOptionsManageProfiles.cpp ScreenOptionsManageProfiles.h \ -ScreenOptionsMaster.cpp ScreenOptionsMaster.h \ -ScreenOptionsMasterPrefs.cpp ScreenOptionsMasterPrefs.h \ -ScreenOptionsToggleSongs.cpp ScreenOptionsToggleSongs.h \ -ScreenPackages.cpp ScreenPackages.h \ -ScreenNetworkOptions.h ScreenNetworkOptions.cpp \ -ScreenPlayerOptions.cpp ScreenPlayerOptions.h \ -ScreenProfileLoad.cpp ScreenProfileLoad.h \ -ScreenProfileSave.cpp ScreenProfileSave.h \ -ScreenPrompt.cpp ScreenPrompt.h ScreenRanking.cpp ScreenRanking.h \ -ScreenReloadSongs.cpp ScreenReloadSongs.h \ -ScreenSandbox.cpp ScreenSandbox.h \ -ScreenSaveSync.cpp ScreenSaveSync.h \ -ScreenServiceAction.cpp ScreenServiceAction.h \ -ScreenStatsOverlay.cpp ScreenStatsOverlay.h \ -ScreenSelect.cpp ScreenSelect.h ScreenSelectCharacter.cpp ScreenSelectCharacter.h \ -ScreenSelectLanguage.cpp ScreenSelectLanguage.h \ -ScreenSelectMaster.cpp ScreenSelectMaster.h \ -ScreenSelectMusic.cpp ScreenSelectMusic.h \ -ScreenSelectProfile.cpp ScreenSelectProfile.h \ -ScreenSyncOverlay.cpp ScreenSyncOverlay.h \ -ScreenSystemLayer.cpp ScreenSystemLayer.h ScreenSetTime.cpp ScreenSetTime.h \ -ScreenSongOptions.cpp ScreenSongOptions.h \ -ScreenSplash.cpp ScreenSplash.h \ -ScreenTestInput.cpp ScreenTestInput.h \ -ScreenTestLights.cpp ScreenTestLights.h ScreenTestSound.cpp ScreenTestSound.h ScreenTextEntry.cpp ScreenTextEntry.h \ -ScreenTitleMenu.cpp ScreenTitleMenu.h \ -ScreenUnlockBrowse.cpp ScreenUnlockBrowse.h \ -ScreenUnlockCelebrate.cpp ScreenUnlockCelebrate.h \ -ScreenUnlockStatus.cpp ScreenUnlockStatus.h \ -ScreenWithMenuElements.cpp ScreenWithMenuElements.h - -if !WITHOUT_NETWORKING - Screens += ScreenSMOnlineLogin.cpp ScreenSMOnlineLogin.h -endif - -DataStructures = \ -Attack.cpp Attack.h AutoKeysounds.cpp AutoKeysounds.h \ -AdjustSync.cpp AdjustSync.h \ -BackgroundUtil.cpp BackgroundUtil.h \ -ImageCache.cpp ImageCache.h \ -Character.cpp Character.h \ -CodeDetector.cpp CodeDetector.h \ -CodeSet.cpp CodeSet.h \ -Command.cpp Command.h \ -CommonMetrics.cpp CommonMetrics.h \ -Course.cpp Course.h \ -CourseLoaderCRS.cpp CourseLoaderCRS.h \ -CourseUtil.cpp CourseUtil.h \ -CourseWriterCRS.cpp CourseWriterCRS.h \ -CreateZip.cpp CreateZip.h \ -CryptHelpers.cpp CryptHelpers.h \ -DateTime.cpp DateTime.h \ -Difficulty.cpp Difficulty.h \ -DisplaySpec.h \ -EnumHelper.cpp EnumHelper.h \ -FileDownload.cpp FileDownload.h \ -Font.cpp Font.h \ -FontCharAliases.cpp FontCharAliases.h \ -FontCharmaps.cpp FontCharmaps.h Game.cpp Game.h GameCommand.cpp GameCommand.h \ -GameplayAssist.cpp GameplayAssist.h \ -GameConstantsAndTypes.cpp GameConstantsAndTypes.h \ -GamePreferences.cpp GamePreferences.h \ -GameInput.cpp GameInput.h Grade.cpp Grade.h \ -HighScore.cpp HighScore.h \ -InputEventPlus.h \ -Inventory.cpp Inventory.h \ -JsonUtil.cpp JsonUtil.h \ -LocalizedString.cpp LocalizedString.h \ -LuaReference.cpp LuaReference.h \ -LuaExpressionTransform.cpp LuaExpressionTransform.h \ -LyricsLoader.cpp LyricsLoader.h \ -ModsGroup.cpp ModsGroup.h \ -NoteData.cpp NoteData.h NoteDataUtil.cpp NoteDataUtil.h NoteDataWithScoring.cpp NoteDataWithScoring.h \ -NoteTypes.cpp NoteTypes.h NotesLoader.cpp NotesLoader.h \ -NotesLoaderBMS.cpp NotesLoaderBMS.h NotesLoaderDWI.cpp NotesLoaderDWI.h \ -NotesLoaderJson.cpp NotesLoaderJson.h NotesLoaderKSF.cpp NotesLoaderKSF.h \ -NotesLoaderSM.cpp NotesLoaderSM.h \ -NotesLoaderSSC.cpp NotesLoaderSSC.h NotesLoaderSMA.cpp NotesLoaderSMA.h \ -NotesWriterDWI.cpp NotesWriterDWI.h \ -NotesWriterJson.cpp NotesWriterJson.h \ -NotesWriterSM.cpp NotesWriterSM.h NotesWriterSSC.cpp NotesWriterSSC.h \ -OptionRowHandler.cpp OptionRowHandler.h OptionsList.cpp OptionsList.h \ -PlayerAI.cpp PlayerAI.h PlayerNumber.cpp PlayerNumber.h PlayerOptions.cpp PlayerOptions.h \ -PlayerStageStats.cpp PlayerStageStats.h \ -PlayerState.cpp PlayerState.h Preference.cpp Preference.h Profile.cpp Profile.h \ -RandomSample.cpp RandomSample.h RadarValues.cpp RadarValues.h \ -SampleHistory.cpp SampleHistory.h \ -ScreenDimensions.h ScreenDimensions.cpp \ -ScoreKeeper.h ScoreKeeper.cpp \ -ScoreKeeperNormal.cpp ScoreKeeperNormal.h \ -ScoreKeeperRave.cpp ScoreKeeperRave.h \ -ScoreKeeperShared.cpp ScoreKeeperShared.h \ -Song.cpp Song.h SongCacheIndex.cpp SongCacheIndex.h \ -SongOptions.cpp SongOptions.h SongUtil.cpp SongUtil.h StageStats.cpp StageStats.h Steps.cpp Steps.h \ -SoundEffectControl.cpp SoundEffectControl.h \ -StepsUtil.cpp StepsUtil.h Style.cpp Style.h StyleUtil.cpp StyleUtil.h \ -SubscriptionManager.h \ -TimingData.cpp TimingData.h TimingSegments.cpp TimingSegments.h \ -ThemeMetric.h \ -Trail.cpp Trail.h TrailUtil.cpp TrailUtil.h TitleSubstitution.cpp TitleSubstitution.h \ -Tween.cpp Tween.h - -if !WITHOUT_NETWORKING - DataStructures += RoomWheel.cpp RoomWheel.h -endif - -FileTypes = IniFile.cpp IniFile.h \ -MsdFile.cpp MsdFile.h \ -XmlFile.cpp XmlFile.h \ -XmlToLua.cpp XmlToLua.h \ -XmlFileUtil.cpp XmlFileUtil.h - -StepMania = CommandLineActions.h CommandLineActions.cpp \ -StdString.h \ -StepMania.cpp StepMania.h \ -GameLoop.cpp GameLoop.h \ -global.cpp global.h \ -SpecialFiles.cpp SpecialFiles.h \ -ProductInfo.h - -ArchHooks = arch/ArchHooks/ArchHooks.cpp arch/ArchHooks/ArchHooks.h \ - arch/ArchHooks/ArchHooksUtil.cpp - -ArchUtils = - -Dialog = arch/Dialog/Dialog.cpp arch/Dialog/Dialog.h arch/Dialog/DialogDriver.h arch/Dialog/DialogDriver.cpp - -InputHandler = arch/InputHandler/InputHandler.cpp arch/InputHandler/InputHandler.h - -Lights = arch/Lights/LightsDriver.cpp arch/Lights/LightsDriver.h - -MemoryCard = arch/MemoryCard/MemoryCardDriver.cpp arch/MemoryCard/MemoryCardDriver.h - -MovieTexture = arch/MovieTexture/MovieTexture.cpp arch/MovieTexture/MovieTexture.h - -LoadingWindow = arch/LoadingWindow/LoadingWindow.cpp arch/LoadingWindow/LoadingWindow.h - -LowLevelWindow = arch/LowLevelWindow/LowLevelWindow.cpp arch/LowLevelWindow/LowLevelWindow.h - -Sound = arch/Sound/RageSoundDriver.h arch/Sound/RageSoundDriver.cpp \ - arch/Sound/RageSoundDriver_Generic_Software.cpp - -Threads = arch/Threads/Threads.h - -# =================================== -# (Potentially) multiplatform drivers -# =================================== -InputHandler += arch/InputHandler/InputHandler_MonkeyKeyboard.cpp arch/InputHandler/InputHandler_MonkeyKeyboard.h \ - arch/InputHandler/InputHandler_SextetStream.cpp arch/InputHandler/InputHandler_SextetStream.h - -Lights += arch/Lights/LightsDriver_Export.cpp arch/Lights/LightsDriver_Export.h \ - arch/Lights/LightsDriver_SystemMessage.cpp arch/Lights/LightsDriver_SystemMessage.h \ - arch/Lights/LightsDriver_SextetStream.cpp arch/Lights/LightsDriver_SextetStream.h \ - arch/Lights/SextetUtils.h - -LoadingWindow += arch/LoadingWindow/LoadingWindow_Null.h - -MemoryCard += arch/MemoryCard/MemoryCardDriver_Null.h - -MovieTexture += arch/MovieTexture/MovieTexture_Generic.cpp arch/MovieTexture/MovieTexture_Generic.h \ - arch/MovieTexture/MovieTexture_Null.cpp arch/MovieTexture/MovieTexture_Null.h - -Sound += arch/Sound/RageSoundDriver_Null.cpp arch/Sound/RageSoundDriver_Null.h - -if HAVE_FFMPEG - MovieTexture += arch/MovieTexture/MovieTexture_FFMpeg.cpp arch/MovieTexture/MovieTexture_FFMpeg.h -endif - -if HAVE_GTK - # XXX We need a GTK DialogDriver for Linux - LoadingWindow += arch/LoadingWindow/LoadingWindow_Gtk.cpp arch/LoadingWindow/LoadingWindow_Gtk.h \ - arch/LoadingWindow/LoadingWindow_GtkModule.h -endif - -if HAVE_JACK - Sound += arch/Sound/RageSoundDriver_JACK.cpp arch/Sound/RageSoundDriver_JACK.h -endif - -if HAVE_OSS - Sound += arch/Sound/RageSoundDriver_OSS.cpp arch/Sound/RageSoundDriver_OSS.h -endif - -if HAVE_PULSE - Sound += arch/Sound/RageSoundDriver_PulseAudio.cpp arch/Sound/RageSoundDriver_PulseAudio.h -endif - -# Yes, really. MinGW provides pthread. -if HAVE_PTHREAD - Threads += arch/Threads/Threads_Pthreads.cpp arch/Threads/Threads_Pthreads.h \ - archutils/Common/PthreadHelpers.cpp archutils/Common/PthreadHelpers.h -endif - -if HAVE_X11 -# InputHandler_X11 depends on LowLevelWindow_X11 - InputHandler += arch/InputHandler/InputHandler_X11.cpp arch/InputHandler/InputHandler_X11.h - LowLevelWindow += arch/LowLevelWindow/LowLevelWindow_X11.cpp arch/LowLevelWindow/LowLevelWindow_X11.h - ArchUtils += archutils/Unix/X11Helper.cpp archutils/Unix/X11Helper.h -endif - -# ========================= -# Platform-specific drivers -# ========================= -if UNIX - ArchHooks += arch/ArchHooks/ArchHooks_Unix.cpp arch/ArchHooks/ArchHooks_Unix.h - -if LINUX - InputHandler += arch/InputHandler/LinuxInputManager.cpp arch/InputHandler/LinuxInputManager.h \ - arch/InputHandler/InputHandler_Linux_Joystick.cpp arch/InputHandler/InputHandler_Linux_Joystick.h \ - arch/InputHandler/InputHandler_Linux_Event.cpp arch/InputHandler/InputHandler_Linux_Event.h \ - arch/InputHandler/InputHandler_Linux_PIUIO.cpp arch/InputHandler/InputHandler_Linux_PIUIO.h - - Lights += arch/Lights/LightsDriver_LinuxWeedTech.cpp arch/Lights/LightsDriver_LinuxWeedTech.h \ - arch/Lights/LightsDriver_Linux_PIUIO.cpp arch/Lights/LightsDriver_Linux_PIUIO.h \ - arch/Lights/LightsDriver_Linux_PIUIO_Leds.cpp arch/Lights/LightsDriver_Linux_PIUIO_Leds.h - - MemoryCard += arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp arch/MemoryCard/MemoryCardDriverThreaded_Linux.h - -if HAVE_ALSA - Sound += arch/Sound/ALSA9Dynamic.cpp arch/Sound/ALSA9Dynamic.h \ - arch/Sound/ALSA9Functions.h \ - arch/Sound/ALSA9Helpers.cpp arch/Sound/ALSA9Helpers.h \ - arch/Sound/RageSoundDriver_ALSA9_Software.cpp arch/Sound/RageSoundDriver_ALSA9_Software.h - - # Add this to AM_CXXFLAGS, not stepmania_CXXFLAGS: that'll cause multiple copies of - # several sources to be built. We link to this at runtime, so don't add ALSA_LDFLAGS. - AM_CXXFLAGS += $(ALSA_CFLAGS) -endif - -if HAVE_PARALLEL_PORT - Lights += arch/Lights/LightsDriver_LinuxParallel.cpp arch/Lights/LightsDriver_LinuxParallel.h -endif - -if WITH_TTY - InputHandler += arch/InputHandler/InputHandler_Linux_tty.cpp arch/InputHandler/InputHandler_Linux_tty.h \ - arch/InputHandler/InputHandler_Linux_tty_keys.h -endif -endif - - ArchUtils += archutils/Unix/AssertionHandler.cpp archutils/Unix/AssertionHandler.h \ - archutils/Unix/arch_setup.h \ - archutils/Unix/GetSysInfo.cpp archutils/Unix/GetSysInfo.h \ - archutils/Unix/SignalHandler.cpp archutils/Unix/SignalHandler.h \ - archutils/Unix/RunningUnderValgrind.cpp archutils/Unix/RunningUnderValgrind.h \ - archutils/Unix/EmergencyShutdown.cpp archutils/Unix/EmergencyShutdown.h \ - archutils/Unix/StackCheck.cpp archutils/Unix/SpecialDirs.cpp archutils/Unix/SpecialDirs.h \ - archutils/Common/gcc_byte_swaps.h - -if USE_CRASH_HANDLER - ArchUtils += archutils/Unix/Backtrace.cpp archutils/Unix/Backtrace.h \ - archutils/Unix/BacktraceNames.cpp archutils/Unix/BacktraceNames.h \ - archutils/Unix/CrashHandler.cpp archutils/Unix/CrashHandler.h \ - archutils/Unix/CrashHandlerChild.cpp archutils/Unix/CrashHandlerInternal.h \ - archutils/Unix/CrashHandlerInternal.cpp -endif -endif -# ========================================= -if WINDOWS - ArchHooks += arch/ArchHooks/ArchHooks_Win32.cpp arch/ArchHooks/ArchHooks_Win32.h \ - arch/ArchHooks/ArchHooks_Win32Static.cpp - - ArchUtils += archutils/Win32/arch_time.cpp \ - archutils/Win32/AppInstance.cpp archutils/Win32/AppInstance.h \ - archutils/Win32/Crash.cpp archutils/Win32/Crash.h \ - archutils/Win32/CrashHandlerChild.cpp \ - archutils/Win32/CrashHandlerInternal.h \ - archutils/Win32/CrashHandlerNetworking.cpp archutils/Win32/CrashHandlerNetworking.h \ - archutils/Win32/DebugInfoHunt.cpp archutils/Win32/DebugInfoHunt.h \ - archutils/Win32/DialogUtil.cpp archutils/Win32/DialogUtil.h \ - archutils/Win32/DirectXHelpers.cpp archutils/Win32/DirectXHelpers.h \ - archutils/Win32/ErrorStrings.cpp archutils/Win32/ErrorStrings.h \ - archutils/Win32/GetFileInformation.cpp archutils/Win32/GetFileInformation.h \ - archutils/Win32/GoToURL.cpp archutils/Win32/GoToURL.h \ - archutils/Win32/GraphicsWindow.cpp archutils/Win32/GraphicsWindow.h \ - archutils/Win32/MessageWindow.cpp archutils/Win32/MessageWindow.h \ - archutils/Win32/RegistryAccess.cpp archutils/Win32/RegistryAccess.h \ - archutils/Win32/RestartProgram.cpp archutils/Win32/RestartProgram.h \ - archutils/Win32/SpecialDirs.cpp archutils/Win32/SpecialDirs.h \ - archutils/Win32/USB.cpp archutils/Win32/USB.h \ - archutils/Win32/VideoDriverInfo.cpp archutils/Win32/VideoDriverInfo.h \ - archutils/Win32/WindowIcon.cpp archutils/Win32/WindowIcon.h \ - archutils/Win32/WindowsDialogBox.cpp archutils/Win32/WindowsDialogBox.h \ - archutils/Win32/WindowsResources.rc archutils/Win32/WindowsResources.h - - Dialog += arch/Dialog/DialogDriver_Win32.cpp arch/Dialog/DialogDriver_Win32.h - - LoadingWindow += arch/LoadingWindow/LoadingWindow_Win32.cpp arch/LoadingWindow/LoadingWindow_Win32.h - - LowLevelWindow += arch/LowLevelWindow/LowLevelWindow_Win32.cpp arch/LowLevelWindow/LowLevelWindow_Win32.h - - MemoryCard += arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp arch/MemoryCard/MemoryCardDriverThreaded_Windows.h - - # XXX We may want to ditch DirectShow in favor of using ffmpeg on all platforms. - # FIXME BROKEN - # MovieTexture += arch/MovieTexture/MovieTexture_DShow.cpp arch/MovieTexture/MovieTexture_DShow.h \ - # arch/MovieTexture/MovieTexture_DShowHelper.cpp arch/MovieTexture/MovieTexture_DShowHelper.h - - # XXX: Do we want to detect DirectX SDK and selectively enable DirectX drivers? - InputHandler += arch/InputHandler/InputHandler_DirectInput.cpp arc/InputHandler/InputHandler_DirectInput.h \ - arch/InputHandler/InputHandler_DirectInputHelper.cpp arch/InputHandler/InputHandler_DirectInputHelper.h \ - arch/InputHandler/InputHandler_Win32_MIDI.cpp arch/InputHandler/InputHandler_Win32_MIDI.h \ - arch/InputHandler/InputHandler_Win32_Para.cpp arch/InputHandler/InputHandler_Win32_Para.h \ - arch/InputHandler/InputHandler_Win32_Pump.cpp arch/InputHandler/InputHandler_Win32_Pump.h \ - arch/InputHandler/InputHandler_Win32_RTIO.cpp arch/InputHandler/InputHandler_Win32_RTIO.h - - Lights += arch/Lights/LightsDriver_Win32Serial.cpp arch/Lights/LightsDriver_Win32Serial.h - - Sound += arch/Sound/RageSoundDriver_DSound_Software.cpp arch/Sound/RageSoundDriver_DSound_Software.h \ - arch/Sound/DSoundHelpers.cpp arch/Sound/DSoundHelpers.h \ - arch/Sound/RageSoundDriver_WaveOut.cpp arch/Sound/RageSoundDriver_WaveOut.h -# FIXME: BROKEN -# arch/Sound/RageSoundDriver_WDMKS.cpp arch/Sound/RageSoundDriver_WDMKS.h - -if HAVE_PARALLEL_PORT - Lights += arch/Lights/LightsDriver_Win32Parallel.cpp arch/Lights/LightsDriver_Win32Parallel.h -endif - -if HAVE_MINIMAID - Lights += arch/Lights/LightsDriver_Win32Minimaid.cpp arch/Lights/LightsDriver_Win32Minimaid.h -endif - -if !HAVE_PTHREAD - Threads += arch/Threads/Threads_Win32.cpp arch/Threads/Threads_Win32.h -endif -endif - -Arch = $(LoadingWindow) $(Sound) $(ArchHooks) $(InputHandler) $(MovieTexture) \ - $(Lights) $(MemoryCard) $(LowLevelWindow) $(ArchUtils) $(Dialog) $(Threads) \ - arch/arch_default.h arch/RageDriver.cpp arch/RageDriver.h - -RageSoundFileReaders = RageSoundReader_WAV.cpp RageSoundReader_WAV.h - -if HAVE_VORBIS - RageSoundFileReaders += RageSoundReader_Vorbisfile.cpp RageSoundReader_Vorbisfile.h -endif - -if HAVE_MP3 - RageSoundFileReaders += RageSoundReader_MP3.cpp RageSoundReader_MP3.h -endif - -ActorsInGameplayAndMenus = \ -BGAnimation.cpp BGAnimation.h BGAnimationLayer.cpp BGAnimationLayer.h Banner.cpp Banner.h \ -DifficultyIcon.cpp DifficultyIcon.h \ -MeterDisplay.cpp MeterDisplay.h StreamDisplay.cpp StreamDisplay.h \ -Transition.cpp Transition.h - -ActorsInMenus = \ -ActiveAttackList.cpp ActiveAttackList.h BPMDisplay.cpp BPMDisplay.h ComboGraph.cpp ComboGraph.h \ -CourseContentsList.cpp CourseContentsList.h \ -StepsDisplay.cpp StepsDisplay.h \ -DifficultyList.cpp DifficultyList.h \ -DualScrollBar.cpp DualScrollBar.h \ -EditMenu.cpp EditMenu.h FadingBanner.cpp FadingBanner.h \ -GradeDisplay.cpp GradeDisplay.h GraphDisplay.cpp GraphDisplay.h \ -GrooveRadar.cpp GrooveRadar.h HelpDisplay.cpp HelpDisplay.h \ -MemoryCardDisplay.cpp MemoryCardDisplay.h \ -MenuTimer.cpp MenuTimer.h \ -ModIcon.cpp ModIcon.h ModIconRow.cpp ModIconRow.h \ -MusicWheel.cpp MusicWheel.h \ -MusicWheelItem.cpp MusicWheelItem.h \ -OptionRow.cpp OptionRow.h OptionsCursor.cpp OptionsCursor.h \ -PaneDisplay.cpp PaneDisplay.h ScrollBar.cpp ScrollBar.h \ -SnapDisplay.cpp SnapDisplay.h \ -TextBanner.cpp TextBanner.h WheelBase.cpp WheelBase.h WheelItemBase.cpp WheelItemBase.h \ -WheelNotifyIcon.cpp WheelNotifyIcon.h \ -WorkoutGraph.cpp WorkoutGraph.h - -if !WITHOUT_NETWORKING - ActorsInMenus += RoomInfoDisplay.cpp RoomInfoDisplay.h -endif - -ActorsInGameplay = \ -ArrowEffects.cpp ArrowEffects.h AttackDisplay.cpp AttackDisplay.h \ -Background.cpp Background.h BeginnerHelper.cpp BeginnerHelper.h CombinedLifeMeter.h CombinedLifeMeterTug.cpp CombinedLifeMeterTug.h \ -DancingCharacters.cpp DancingCharacters.h Foreground.cpp Foreground.h \ -GhostArrowRow.cpp GhostArrowRow.h HoldJudgment.cpp HoldJudgment.h \ -LifeMeter.cpp LifeMeter.h \ -LifeMeterBar.cpp LifeMeterBar.h \ -LifeMeterBattery.cpp LifeMeterBattery.h LifeMeterTime.cpp LifeMeterTime.h \ -LyricDisplay.cpp LyricDisplay.h NoteDisplay.cpp NoteDisplay.h NoteField.cpp NoteField.h \ -PercentageDisplay.cpp PercentageDisplay.h Player.cpp Player.h \ -ReceptorArrow.cpp ReceptorArrow.h ReceptorArrowRow.cpp ReceptorArrowRow.h \ -ScoreDisplay.cpp ScoreDisplay.h \ -ScoreDisplayAliveTime.cpp ScoreDisplayAliveTime.h \ -ScoreDisplayBattle.cpp ScoreDisplayBattle.h \ -ScoreDisplayCalories.cpp ScoreDisplayCalories.h \ -ScoreDisplayLifeTime.cpp ScoreDisplayLifeTime.h \ -ScoreDisplayNormal.cpp ScoreDisplayNormal.h ScoreDisplayOni.cpp ScoreDisplayOni.h \ -ScoreDisplayPercentage.cpp ScoreDisplayPercentage.h ScoreDisplayRave.cpp ScoreDisplayRave.h \ -SongPosition.cpp SongPosition.h - -Rage = -all_test_SOURCES = -if !USE_SYSTEM_PCRE -Rage += ../extern/pcre/get.c ../extern/pcre/internal.h ../extern/pcre/maketables.c ../extern/pcre/pcre.c ../extern/pcre/pcre.h ../extern/pcre/study.c -all_test_SOURCES += ../extern/pcre/get.c ../extern/pcre/internal.h ../extern/pcre/maketables.c ../extern/pcre/pcre.c ../extern/pcre/pcre.h ../extern/pcre/study.c -EXTRA_DIST += ../extern/pcre/chartables.c -endif - -Lua = ../extern/lua-5.1/src/lapi.c ../extern/lua-5.1/src/lauxlib.c ../extern/lua-5.1/src/lbaselib.c ../extern/lua-5.1/src/lcode.c ../extern/lua-5.1/src/ldblib.c \ -../extern/lua-5.1/src/ldebug.c ../extern/lua-5.1/src/ldo.c ../extern/lua-5.1/src/ldump.c ../extern/lua-5.1/src/lfunc.c ../extern/lua-5.1/src/lgc.c ../extern/lua-5.1/src/linit.c \ -../extern/lua-5.1/src/liolib.c ../extern/lua-5.1/src/llex.c ../extern/lua-5.1/src/lmathlib.c ../extern/lua-5.1/src/lmem.c ../extern/lua-5.1/src/loadlib.c \ -../extern/lua-5.1/src/lobject.c ../extern/lua-5.1/src/lopcodes.c ../extern/lua-5.1/src/loslib.c ../extern/lua-5.1/src/lparser.c ../extern/lua-5.1/src/lstate.c \ -../extern/lua-5.1/src/lstring.c ../extern/lua-5.1/src/lstrlib.c ../extern/lua-5.1/src/ltable.c ../extern/lua-5.1/src/ltablib.c ../extern/lua-5.1/src/ltm.c \ -../extern/lua-5.1/src/lundump.c ../extern/lua-5.1/src/lvm.c ../extern/lua-5.1/src/lzio.c ../extern/lua-5.1/src/lapi.h ../extern/lua-5.1/src/lauxlib.h ../extern/lua-5.1/src/lcode.h \ -../extern/lua-5.1/src/ldebug.h ../extern/lua-5.1/src/ldo.h ../extern/lua-5.1/src/lfunc.h ../extern/lua-5.1/src/lgc.h ../extern/lua-5.1/src/llex.h ../extern/lua-5.1/src/llimits.h \ -../extern/lua-5.1/src/lmem.h ../extern/lua-5.1/src/lobject.h ../extern/lua-5.1/src/lopcodes.h ../extern/lua-5.1/src/lparser.h ../extern/lua-5.1/src/lstate.h \ -../extern/lua-5.1/src/lstring.h ../extern/lua-5.1/src/ltable.h ../extern/lua-5.1/src/ltm.h ../extern/lua-5.1/src/luaconf.h ../extern/lua-5.1/src/lua.h ../extern/lua-5.1/src/lualib.h \ -../extern/lua-5.1/src/lundump.h ../extern/lua-5.1/src/lvm.h ../extern/lua-5.1/src/lzio.h - -jsoncpp = ../extern/jsoncpp/jsoncpp.cpp - -RageFile = \ -RageFileBasic.cpp RageFileBasic.h \ -RageFile.cpp RageFile.h RageFileDriver.cpp RageFileDriver.h RageFileManager.cpp RageFileManager.h \ -RageFileManager_ReadAhead.cpp RageFileManager_ReadAhead.h \ -RageFileDriverDirect.cpp RageFileDriverDirect.h RageFileDriverDirectHelpers.cpp RageFileDriverDirectHelpers.h \ -RageFileDriverMemory.cpp RageFileDriverMemory.h RageFileDriverZip.cpp RageFileDriverZip.h \ -RageFileDriverDeflate.cpp RageFileDriverDeflate.h \ -RageFileDriverReadAhead.cpp RageFileDriverReadAhead.h \ -RageFileDriverSlice.cpp RageFileDriverSlice.h \ -RageFileDriverTimeout.cpp RageFileDriverTimeout.h - -Rage += $(Lua) $(jsoncpp) $(RageFile) $(RageSoundFileReaders) \ -CubicSpline.cpp CubicSpline.h \ -RageBitmapTexture.cpp RageBitmapTexture.h \ -RageDisplay.cpp RageDisplay.h \ -RageDisplay_OGL.cpp RageDisplay_OGL.h \ -RageDisplay_OGL_Helpers.cpp RageDisplay_OGL_Helpers.h glext.h \ -RageDisplay_Null.cpp RageDisplay_Null.h RageException.cpp RageException.h RageInput.cpp RageInput.h \ -RageInputDevice.cpp RageInputDevice.h RageLog.cpp RageLog.h RageMath.cpp RageMath.h \ -RageModelGeometry.cpp RageModelGeometry.h RageSound.cpp RageSound.h RageSoundManager.cpp RageSoundManager.h \ -RageSoundUtil.cpp RageSoundUtil.h RageSoundMixBuffer.cpp RageSoundMixBuffer.h \ -RageSoundPosMap.cpp RageSoundPosMap.h RageSoundReader.cpp RageSoundReader.h RageSoundReader_FileReader.cpp RageSoundReader_FileReader.h \ -RageSoundReader_Filter.h \ -RageSoundReader_ChannelSplit.cpp RageSoundReader_ChannelSplit.h \ -RageSoundReader_Extend.cpp RageSoundReader_Extend.h \ -RageSoundReader_Merge.cpp RageSoundReader_Merge.h \ -RageSoundReader_PitchChange.cpp RageSoundReader_PitchChange.h \ -RageSoundReader_PostBuffering.cpp RageSoundReader_PostBuffering.h \ -RageSoundReader_Pan.cpp RageSoundReader_Pan.h \ -RageSoundReader_Preload.cpp RageSoundReader_Preload.h \ -RageSoundReader_Resample_Good.cpp RageSoundReader_Resample_Good.h \ -RageSoundReader_SpeedChange.cpp RageSoundReader_SpeedChange.h \ -RageSoundReader_ThreadedBuffer.cpp RageSoundReader_ThreadedBuffer.h \ -RageSoundReader_Chain.cpp RageSoundReader_Chain.h \ -RageSurface.cpp RageSurface.h RageSurfaceUtils.cpp RageSurfaceUtils.h \ -RageSurfaceUtils_Dither.cpp RageSurfaceUtils_Dither.h \ -RageSurface_Save_JPEG.cpp RageSurface_Save_JPEG.h \ -RageSurfaceUtils_Palettize.cpp RageSurfaceUtils_Palettize.h \ -RageSurfaceUtils_Zoom.cpp RageSurfaceUtils_Zoom.h \ -RageSurface_Load.cpp RageSurface_Load.h RageSurface_Load_PNG.cpp RageSurface_Load_PNG.h \ -RageSurface_Load_JPEG.cpp RageSurface_Load_JPEG.h RageSurface_Load_GIF.cpp RageSurface_Load_GIF.h \ -RageSurface_Load_BMP.cpp RageSurface_Load_BMP.h \ -RageSurface_Load_XPM.cpp RageSurface_Load_XPM.h RageTexture.cpp RageTexture.h \ -RageTexturePreloader.cpp RageTexturePreloader.h \ -RageTextureRenderTarget.cpp RageTextureRenderTarget.h \ -RageSurface_Save_BMP.cpp RageSurface_Save_BMP.h \ -RageSurface_Save_PNG.cpp RageSurface_Save_PNG.h \ -RageTextureID.cpp RageTextureID.h RageTextureManager.cpp RageTextureManager.h RageThreads.cpp RageThreads.h \ -RageTimer.cpp RageTimer.h RageTypes.cpp RageTypes.h RageUtil.cpp RageUtil.h \ -RageUtil_CachedObject.cpp RageUtil_CachedObject.h \ -RageUtil_CharConversions.cpp RageUtil_CharConversions.h \ -RageUtil_BackgroundLoader.cpp RageUtil_BackgroundLoader.h RageUtil_FileDB.cpp RageUtil_FileDB.h RageUtil_CircularBuffer.h \ -RageUtil_AutoPtr.h \ -RageUtil_WorkerThread.cpp RageUtil_WorkerThread.h - -Actors = \ -Actor.cpp Actor.h ActorFrame.cpp ActorFrame.h \ -ActorFrameTexture.cpp ActorFrameTexture.h \ -ActorMultiTexture.cpp ActorMultiTexture.h \ -ActorMultiVertex.cpp ActorMultiVertex.h \ -ActorProxy.cpp ActorProxy.h \ -ActorScroller.cpp ActorScroller.h ActorUtil.cpp ActorUtil.h \ -ActorSound.cpp ActorSound.h \ -AutoActor.cpp AutoActor.h \ -BitmapText.cpp BitmapText.h Model.cpp Model.h \ -DynamicActorScroller.cpp DynamicActorScroller.h \ -ModelManager.cpp ModelManager.h ModelTypes.cpp ModelTypes.h \ -Quad.cpp Quad.h \ -RollingNumbers.cpp RollingNumbers.h Sprite.cpp Sprite.h - -GlobalSingletons = \ -AnnouncerManager.cpp AnnouncerManager.h \ -Bookkeeper.cpp Bookkeeper.h \ -CharacterManager.cpp CharacterManager.h \ -CryptManager.cpp CryptManager.h \ -FontManager.cpp FontManager.h GameSoundManager.cpp GameSoundManager.h \ -GameManager.cpp GameManager.h \ -GameState.cpp GameState.h \ -InputFilter.cpp InputFilter.h \ -InputMapper.cpp InputMapper.h InputQueue.cpp InputQueue.h \ -LuaBinding.cpp LuaBinding.h \ -LuaManager.cpp LuaManager.h LightsManager.cpp LightsManager.h \ -MemoryCardManager.cpp MemoryCardManager.h \ -MessageManager.cpp MessageManager.h NetworkSyncManager.cpp NetworkSyncManager.h \ -NetworkManager.cpp NetworkManager.h \ -NoteSkinManager.cpp NoteSkinManager.h \ -PrefsManager.cpp PrefsManager.h ProfileManager.cpp ProfileManager.h ScreenManager.cpp \ -ScreenManager.h SongManager.cpp SongManager.h \ -StatsManager.cpp StatsManager.h \ -ThemeManager.cpp ThemeManager.h \ -UnlockManager.cpp UnlockManager.h - -if !WITHOUT_NETWORKING - # Compile NetworkSyncManager even if networking is disabled; it'll stub itself. - GlobalSingletons += ezsockets.cpp ezsockets.h -endif - -libtommath_a_SOURCES = \ -libtommath/bncore.c libtommath/bn_mp_init.c libtommath/bn_mp_clear.c libtommath/bn_mp_exch.c libtommath/bn_mp_grow.c libtommath/bn_mp_shrink.c \ -libtommath/bn_mp_clamp.c libtommath/bn_mp_zero.c libtommath/bn_mp_set.c libtommath/bn_mp_set_int.c libtommath/bn_mp_init_size.c libtommath/bn_mp_copy.c \ -libtommath/bn_mp_init_copy.c libtommath/bn_mp_abs.c libtommath/bn_mp_neg.c libtommath/bn_mp_cmp_mag.c libtommath/bn_mp_cmp.c libtommath/bn_mp_cmp_d.c \ -libtommath/bn_mp_rshd.c libtommath/bn_mp_lshd.c libtommath/bn_mp_mod_2d.c libtommath/bn_mp_div_2d.c libtommath/bn_mp_mul_2d.c libtommath/bn_mp_div_2.c \ -libtommath/bn_mp_mul_2.c libtommath/bn_s_mp_add.c libtommath/bn_s_mp_sub.c libtommath/bn_fast_s_mp_mul_digs.c libtommath/bn_s_mp_mul_digs.c \ -libtommath/bn_fast_s_mp_mul_high_digs.c libtommath/bn_s_mp_mul_high_digs.c libtommath/bn_fast_s_mp_sqr.c libtommath/bn_s_mp_sqr.c \ -libtommath/bn_mp_add.c libtommath/bn_mp_sub.c libtommath/bn_mp_karatsuba_mul.c libtommath/bn_mp_mul.c libtommath/bn_mp_karatsuba_sqr.c \ -libtommath/bn_mp_sqr.c libtommath/bn_mp_div.c libtommath/bn_mp_mod.c libtommath/bn_mp_add_d.c libtommath/bn_mp_sub_d.c libtommath/bn_mp_mul_d.c \ -libtommath/bn_mp_div_d.c libtommath/bn_mp_mod_d.c libtommath/bn_mp_expt_d.c libtommath/bn_mp_addmod.c libtommath/bn_mp_submod.c \ -libtommath/bn_mp_mulmod.c libtommath/bn_mp_sqrmod.c libtommath/bn_mp_gcd.c libtommath/bn_mp_lcm.c libtommath/bn_fast_mp_invmod.c libtommath/bn_mp_invmod.c \ -libtommath/bn_mp_reduce.c libtommath/bn_mp_montgomery_setup.c libtommath/bn_fast_mp_montgomery_reduce.c libtommath/bn_mp_montgomery_reduce.c \ -libtommath/bn_mp_exptmod_fast.c libtommath/bn_mp_exptmod.c libtommath/bn_mp_2expt.c libtommath/bn_mp_n_root.c libtommath/bn_mp_jacobi.c libtommath/bn_reverse.c \ -libtommath/bn_mp_count_bits.c libtommath/bn_mp_read_unsigned_bin.c libtommath/bn_mp_read_signed_bin.c libtommath/bn_mp_to_unsigned_bin.c \ -libtommath/bn_mp_to_signed_bin.c libtommath/bn_mp_unsigned_bin_size.c libtommath/bn_mp_signed_bin_size.c \ -libtommath/bn_mp_xor.c libtommath/bn_mp_and.c libtommath/bn_mp_or.c libtommath/bn_mp_rand.c libtommath/bn_mp_montgomery_calc_normalization.c \ -libtommath/bn_mp_prime_is_divisible.c libtommath/bn_prime_tab.c libtommath/bn_mp_prime_fermat.c libtommath/bn_mp_prime_miller_rabin.c \ -libtommath/bn_mp_prime_is_prime.c libtommath/bn_mp_prime_next_prime.c libtommath/bn_mp_dr_reduce.c \ -libtommath/bn_mp_dr_is_modulus.c libtommath/bn_mp_dr_setup.c libtommath/bn_mp_reduce_setup.c \ -libtommath/bn_mp_toom_mul.c libtommath/bn_mp_toom_sqr.c libtommath/bn_mp_div_3.c libtommath/bn_s_mp_exptmod.c \ -libtommath/bn_mp_reduce_2k.c libtommath/bn_mp_reduce_is_2k.c libtommath/bn_mp_reduce_2k_setup.c \ -libtommath/bn_mp_reduce_2k_l.c libtommath/bn_mp_reduce_is_2k_l.c libtommath/bn_mp_reduce_2k_setup_l.c \ -libtommath/bn_mp_radix_smap.c libtommath/bn_mp_read_radix.c libtommath/bn_mp_toradix.c libtommath/bn_mp_radix_size.c \ -libtommath/bn_mp_fread.c libtommath/bn_mp_fwrite.c libtommath/bn_mp_cnt_lsb.c libtommath/bn_error.c \ -libtommath/bn_mp_init_multi.c libtommath/bn_mp_clear_multi.c libtommath/bn_mp_exteuclid.c libtommath/bn_mp_toradix_n.c \ -libtommath/bn_mp_prime_random_ex.c libtommath/bn_mp_get_int.c libtommath/bn_mp_sqrt.c libtommath/bn_mp_is_square.c libtommath/bn_mp_init_set.c \ -libtommath/bn_mp_init_set_int.c libtommath/bn_mp_invmod_slow.c libtommath/bn_mp_prime_rabin_miller_trials.c \ -libtommath/bn_mp_to_signed_bin_n.c libtommath/bn_mp_to_unsigned_bin_n.c \ -libtommath/tommath_class.h libtommath/tommath.h libtommath/tommath_superclass.h -EXTRA_DIST += libtommath/bn_prime_tab.c - -libtommath_a_CPPFLAGS = -I$(srcdir)/libtommath $(AM_CPPFLAGS) -noinst_LIBRARIES += libtommath.a - -libtomcrypt_a_SOURCES = \ -libtomcrypt/src/ciphers/aes/aes.c \ -libtomcrypt/src/hashes/md5.c libtomcrypt/src/hashes/sha1.c libtomcrypt/src/hashes/helper/hash_memory.c \ -libtomcrypt/src/math/fp/ltc_ecc_fp_mulmod.c libtomcrypt/src/math/ltm_desc.c libtomcrypt/src/math/multi.c \ -libtomcrypt/src/math/rand_prime.c libtomcrypt/src/misc/base64/base64_decode.c \ -libtomcrypt/src/misc/base64/base64_encode.c libtomcrypt/src/misc/burn_stack.c libtomcrypt/src/misc/crypt/crypt.c \ -libtomcrypt/src/misc/crypt/crypt_argchk.c libtomcrypt/src/misc/crypt/crypt_cipher_descriptor.c \ -libtomcrypt/src/misc/crypt/crypt_cipher_is_valid.c libtomcrypt/src/misc/crypt/crypt_find_cipher.c \ -libtomcrypt/src/misc/crypt/crypt_find_cipher_any.c libtomcrypt/src/misc/crypt/crypt_find_cipher_id.c \ -libtomcrypt/src/misc/crypt/crypt_find_hash.c libtomcrypt/src/misc/crypt/crypt_find_hash_any.c \ -libtomcrypt/src/misc/crypt/crypt_find_hash_id.c libtomcrypt/src/misc/crypt/crypt_find_hash_oid.c \ -libtomcrypt/src/misc/crypt/crypt_find_prng.c libtomcrypt/src/misc/crypt/crypt_fsa.c libtomcrypt/src/misc/crypt/crypt_hash_descriptor.c \ -libtomcrypt/src/misc/crypt/crypt_hash_is_valid.c libtomcrypt/src/misc/crypt/crypt_ltc_mp_descriptor.c \ -libtomcrypt/src/misc/crypt/crypt_prng_descriptor.c libtomcrypt/src/misc/crypt/crypt_prng_is_valid.c \ -libtomcrypt/src/misc/crypt/crypt_register_cipher.c libtomcrypt/src/misc/crypt/crypt_register_hash.c \ -libtomcrypt/src/misc/crypt/crypt_register_prng.c libtomcrypt/src/misc/crypt/crypt_unregister_cipher.c \ -libtomcrypt/src/misc/crypt/crypt_unregister_hash.c libtomcrypt/src/misc/crypt/crypt_unregister_prng.c \ -libtomcrypt/src/misc/error_to_string.c libtomcrypt/src/misc/pkcs5/pkcs_5_1.c libtomcrypt/src/misc/pkcs5/pkcs_5_2.c libtomcrypt/src/misc/zeromem.c \ -libtomcrypt/src/modes/cbc/cbc_decrypt.c libtomcrypt/src/modes/cbc/cbc_done.c libtomcrypt/src/modes/cbc/cbc_encrypt.c \ -libtomcrypt/src/modes/cbc/cbc_getiv.c libtomcrypt/src/modes/cbc/cbc_setiv.c libtomcrypt/src/modes/cbc/cbc_start.c \ -libtomcrypt/src/modes/cfb/cfb_decrypt.c libtomcrypt/src/modes/cfb/cfb_done.c libtomcrypt/src/modes/cfb/cfb_encrypt.c \ -libtomcrypt/src/modes/cfb/cfb_getiv.c libtomcrypt/src/modes/cfb/cfb_setiv.c libtomcrypt/src/modes/cfb/cfb_start.c \ -libtomcrypt/src/modes/ctr/ctr_decrypt.c libtomcrypt/src/modes/ctr/ctr_done.c libtomcrypt/src/modes/ctr/ctr_encrypt.c \ -libtomcrypt/src/modes/ctr/ctr_getiv.c libtomcrypt/src/modes/ctr/ctr_setiv.c libtomcrypt/src/modes/ctr/ctr_start.c libtomcrypt/src/modes/ctr/ctr_test.c \ -libtomcrypt/src/modes/ecb/ecb_decrypt.c libtomcrypt/src/modes/ecb/ecb_done.c libtomcrypt/src/modes/ecb/ecb_encrypt.c \ -libtomcrypt/src/modes/ecb/ecb_start.c \ -libtomcrypt/src/modes/ofb/ofb_decrypt.c libtomcrypt/src/modes/ofb/ofb_done.c \ -libtomcrypt/src/pk/asn1/der/bit/der_decode_bit_string.c \ -libtomcrypt/src/pk/asn1/der/bit/der_encode_bit_string.c libtomcrypt/src/pk/asn1/der/bit/der_length_bit_string.c \ -libtomcrypt/src/pk/asn1/der/boolean/der_decode_boolean.c libtomcrypt/src/pk/asn1/der/boolean/der_encode_boolean.c \ -libtomcrypt/src/pk/asn1/der/boolean/der_length_boolean.c libtomcrypt/src/pk/asn1/der/choice/der_decode_choice.c \ -libtomcrypt/src/pk/asn1/der/ia5/der_decode_ia5_string.c libtomcrypt/src/pk/asn1/der/ia5/der_encode_ia5_string.c \ -libtomcrypt/src/pk/asn1/der/ia5/der_length_ia5_string.c libtomcrypt/src/pk/asn1/der/integer/der_decode_integer.c \ -libtomcrypt/src/pk/asn1/der/integer/der_encode_integer.c libtomcrypt/src/pk/asn1/der/integer/der_length_integer.c \ -libtomcrypt/src/pk/asn1/der/object_identifier/der_decode_object_identifier.c \ -libtomcrypt/src/pk/asn1/der/object_identifier/der_encode_object_identifier.c \ -libtomcrypt/src/pk/asn1/der/object_identifier/der_length_object_identifier.c \ -libtomcrypt/src/pk/asn1/der/octet/der_decode_octet_string.c libtomcrypt/src/pk/asn1/der/octet/der_encode_octet_string.c \ -libtomcrypt/src/pk/asn1/der/octet/der_length_octet_string.c \ -libtomcrypt/src/pk/asn1/der/printable_string/der_decode_printable_string.c \ -libtomcrypt/src/pk/asn1/der/printable_string/der_encode_printable_string.c \ -libtomcrypt/src/pk/asn1/der/printable_string/der_length_printable_string.c \ -libtomcrypt/src/pk/asn1/der/sequence/der_decode_sequence_ex.c \ -libtomcrypt/src/pk/asn1/der/sequence/der_decode_sequence_flexi.c \ -libtomcrypt/src/pk/asn1/der/sequence/der_decode_sequence_multi.c \ -libtomcrypt/src/pk/asn1/der/sequence/der_encode_sequence_ex.c \ -libtomcrypt/src/pk/asn1/der/sequence/der_encode_sequence_multi.c libtomcrypt/src/pk/asn1/der/sequence/der_length_sequence.c \ -libtomcrypt/src/pk/asn1/der/sequence/der_sequence_free.c libtomcrypt/src/pk/asn1/der/set/der_encode_set.c \ -libtomcrypt/src/pk/asn1/der/set/der_encode_setof.c libtomcrypt/src/pk/asn1/der/short_integer/der_decode_short_integer.c \ -libtomcrypt/src/pk/asn1/der/short_integer/der_encode_short_integer.c \ -libtomcrypt/src/pk/asn1/der/short_integer/der_length_short_integer.c libtomcrypt/src/pk/asn1/der/utctime/der_decode_utctime.c \ -libtomcrypt/src/pk/asn1/der/utctime/der_encode_utctime.c libtomcrypt/src/pk/asn1/der/utctime/der_length_utctime.c \ -libtomcrypt/src/pk/asn1/der/utf8/der_decode_utf8_string.c libtomcrypt/src/pk/asn1/der/utf8/der_encode_utf8_string.c \ -libtomcrypt/src/pk/asn1/der/utf8/der_length_utf8_string.c libtomcrypt/src/pk/dsa/dsa_decrypt_key.c \ -libtomcrypt/src/pk/dsa/dsa_encrypt_key.c libtomcrypt/src/pk/dsa/dsa_export.c libtomcrypt/src/pk/dsa/dsa_free.c libtomcrypt/src/pk/dsa/dsa_import.c \ -libtomcrypt/src/pk/dsa/dsa_make_key.c libtomcrypt/src/pk/dsa/dsa_shared_secret.c libtomcrypt/src/pk/dsa/dsa_sign_hash.c \ -libtomcrypt/src/pk/dsa/dsa_verify_hash.c libtomcrypt/src/pk/dsa/dsa_verify_key.c \ -libtomcrypt/src/pk/pkcs1/pkcs_1_i2osp.c libtomcrypt/src/pk/pkcs1/pkcs_1_mgf1.c \ -libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_decode.c libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_encode.c libtomcrypt/src/pk/pkcs1/pkcs_1_os2ip.c \ -libtomcrypt/src/pk/pkcs1/pkcs_1_pss_decode.c libtomcrypt/src/pk/pkcs1/pkcs_1_pss_encode.c libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_decode.c \ -libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_encode.c libtomcrypt/src/pk/rsa/rsa_decrypt_key.c libtomcrypt/src/pk/rsa/rsa_encrypt_key.c \ -libtomcrypt/src/pk/rsa/rsa_export.c libtomcrypt/src/pk/rsa/rsa_exptmod.c libtomcrypt/src/pk/rsa/rsa_free.c libtomcrypt/src/pk/rsa/rsa_import.c \ -libtomcrypt/src/pk/rsa/rsa_make_key.c libtomcrypt/src/pk/rsa/rsa_sign_hash.c libtomcrypt/src/pk/rsa/rsa_verify_hash.c libtomcrypt/src/prngs/fortuna.c \ -libtomcrypt/src/prngs/rng_get_bytes.c libtomcrypt/src/prngs/rng_make_prng.c \ -libtomcrypt/src/prngs/sprng.c libtomcrypt/src/prngs/yarrow.c \ -libtomcrypt/src/headers/tomcrypt_argchk.h libtomcrypt/src/headers/tomcrypt_cfg.h libtomcrypt/src/headers/tomcrypt_cipher.h \ -libtomcrypt/src/headers/tomcrypt_custom.h libtomcrypt/src/headers/tomcrypt.h libtomcrypt/src/headers/tomcrypt_hash.h \ -libtomcrypt/src/headers/tomcrypt_mac.h libtomcrypt/src/headers/tomcrypt_macros.h libtomcrypt/src/headers/tomcrypt_math.h \ -libtomcrypt/src/headers/tomcrypt_misc.h libtomcrypt/src/headers/tomcrypt_pkcs.h libtomcrypt/src/headers/tomcrypt_pk.h \ -libtomcrypt/src/headers/tomcrypt_prng.h -EXTRA_DIST += libtomcrypt/src/ciphers/aes/aes_tab.c libtomcrypt/src/prngs/sober128tab.c - -libtomcrypt_a_CPPFLAGS = -I$(srcdir)/libtomcrypt/src/headers $(AM_CPPFLAGS) - -noinst_LIBRARIES += libtomcrypt.a - -main_CPPFLAGS = \ - $(VIDEO_CFLAGS) \ - -I$(top_srcdir)/extern/jsoncpp -#-I$(top_srcdir)/extern/glew-1.5.8/include - -main_SOURCES = $(Screens) \ - $(DataStructures) \ - $(FileTypes) \ - $(StepMania) \ - $(Arch) \ - $(ActorsInGameplayAndMenus) \ - $(ActorsInMenus) \ - $(ActorsInGameplay) \ - $(Rage) \ - $(Actors) \ - $(GlobalSingletons) - -if !WITHOUT_GLES2 - main_SOURCES += RageDisplay_GLES2.cpp RageDisplay_GLES2.h -endif - -main_SOURCES += Main.cpp - -main_LDADD = \ - $(VIDEO_LIBS) \ - $(AUDIO_LIBS) \ - $(GL_LIBS) \ - libtomcrypt.a libtommath.a - -nodist_stepmania_SOURCES = ver.cpp - -stepmania_CPPFLAGS = $(main_CPPFLAGS) -stepmania_SOURCES = $(main_SOURCES) -stepmania_LDADD = $(main_LDADD) - -if BUILD_LUA_BINARIES - noinst_PROGRAMS += lua luac - lua_SOURCES = $(Lua) ../extern/lua-5.1/src/lua.c - lua_LDADD = -lreadline - - luac_SOURCES = $(Lua) ../extern/lua-5.1/src/luac.c ../extern/lua-5.1/src/print.c - luac_LDADD = -endif - - -if HAVE_GTK - noinst_PROGRAMS += GtkModule.so - GtkModule_so_LDFLAGS = -rdynamic -shared - GtkModule_so_CPPFLAGS = $(GTK_CFLAGS) -fPIC - GtkModule_so_LDADD = $(GTK_LIBS) - GtkModule_so_SOURCES = arch/LoadingWindow/LoadingWindow_GtkModule.cpp -endif - -all_test_SOURCES += \ - $(ArchUtils) \ - $(RageFile) \ - $(Lua) \ - $(ArchHooks) \ - $(Threads) \ - $(Dialog) \ - tests/test_misc.cpp tests/test_misc.h \ - IniFile.cpp IniFile.h \ - XmlFile.cpp XmlFile.h \ - Command.cpp Command.h \ - DateTime.cpp DateTime.h \ - EnumHelper.cpp EnumHelper.h \ - PrefsManager.cpp PrefsManager.h \ - Preference.cpp Preference.h \ - LocalizedString.cpp LocalizedString.h \ - LuaBinding.cpp LuaBinding.h \ - LuaManager.cpp LuaManager.h \ - LuaReference.cpp LuaReference.h \ - SpecialFiles.cpp SpecialFiles.h \ - RageException.cpp \ - RageLog.cpp \ - RageThreads.cpp \ - RageTimer.cpp RageTimer.h \ - RageUtil.cpp \ - RageUtil_FileDB.cpp RageUtil_FileDB.h \ - global.cpp global.h \ - RageUtil_WorkerThread.cpp RageUtil_WorkerThread.h \ - MessageManager.cpp MessageManager.h - -TESTS += test_audio_readers -test_audio_readers_SOURCES = \ - $(RageSoundFileReaders) \ - $(all_test_SOURCES) \ - tests/test_audio_readers.cpp \ - RageSoundUtil.cpp RageSoundUtil.h RageSoundMixBuffer.cpp RageSoundMixBuffer.h \ - RageSoundReader.cpp RageSoundReader.h \ - RageSoundReader_FileReader.cpp RageSoundReader_FileReader.h \ - RageSoundReader_Pan.cpp RageSoundReader_Pan.h \ - RageSoundReader_Preload.cpp RageSoundReader_Preload.h \ - RageSoundReader_Resample_Good.cpp RageSoundReader_Resample_Good.h \ - RageSoundReader_Chain.cpp RageSoundReader_Chain.h - -test_audio_readers_LDADD = $(AUDIO_LIBS) - -TESTS += test_file_readers -test_file_readers_SOURCES = \ - $(all_test_SOURCES) \ - tests/test_file_readers.cpp - -TESTS += test_file_errors -test_file_errors_SOURCES = \ - $(all_test_SOURCES) \ - tests/test_file_errors.cpp \ - MsdFile.cpp MsdFile.h \ - CryptManager.cpp CryptManager.h - -test_file_errors_LDADD = \ - libtomcrypt.a libtommath.a - -TESTS += test_timing_data -test_timing_data_SOURCES = \ - $(all_test_SOURCES) \ - tests/test_timing_data.cpp \ - TimingData.cpp TimingData.h - -#TESTS += test_notedata -#test_notedata_SOURCES = \ -# $(all_test_SOURCES) \ -# tests/test_notedata.cpp \ -# NoteData.cpp NoteData.h NoteDataUtil.cpp NoteDataUtil.h \ -# NewNoteData.cpp NewNoteData.h \ -# NoteTypes.cpp NoteTypes.h \ -# TimingData.cpp TimingData.h -#NewNoteDataUtil.cpp NewNoteDataUtil.h - -TESTS += test_threads -test_threads_SOURCES = \ - $(all_test_SOURCES) \ - tests/test_threads.cpp diff --git a/src/NetworkSyncManager.cpp b/src/NetworkSyncManager.cpp index a8aeed3407..61dec6c609 100644 --- a/src/NetworkSyncManager.cpp +++ b/src/NetworkSyncManager.cpp @@ -944,129 +944,6 @@ void NetworkSyncManager::GetListOfLANServers( vector& AllServers AllServers = m_vAllLANServers; } -// Aldo: Please move this method to a new class, I didn't want to create new files because I don't know how to properly update the files for each platform. -// I preferred to misplace code rather than cause unneeded headaches to non-windows users, although it would be nice to have in the wiki which files to -// update when adding new files and how (Xcode/stepmania_xcode4.3.xcodeproj has a really crazy structure :/). -#if defined(CMAKE_POWERED) -unsigned long NetworkSyncManager::GetCurrentSMBuild( LoadingWindow* ld ) { return 0; } -#else -unsigned long NetworkSyncManager::GetCurrentSMBuild( LoadingWindow* ld ) -{ - // Aldo: Using my own host by now, upload update_check/check_sm5.php to an official URL and change the following constants accordingly: - const RString sHost = "aldo.mx"; - const unsigned short uPort = 80; - const RString sResource = "/stepmania/check_sm5.php"; - const RString sUserAgent = PRODUCT_ID; - const RString sReferer = "http://aldo.mx/stepmania/"; - - if( ld ) - { - ld->SetIndeterminate( true ); - ld->SetText("Checking for updates..."); - } - - unsigned long uCurrentSMBuild = 0; - bool bSuccess = false; - EzSockets* socket = new EzSockets(); - socket->create(); - socket->blocking = true; - - if( socket->connect(sHost, uPort) ) - { - RString sHTTPRequest = ssprintf( - "GET %s HTTP/1.1" "\r\n" - "Host: %s" "\r\n" - "User-Agent: %s" "\r\n" - "Cache-Control: no-cache" "\r\n" - "Referer: %s" "\r\n" - "X-SM-Build: %lu" "\r\n" - "\r\n", - sResource.c_str(), sHost.c_str(), - sUserAgent.c_str(), sReferer.c_str(), - 0 - ); - - socket->SendData(sHTTPRequest); - - // Aldo: EzSocket::pReadData() is a lower level function, I used it because I was having issues - // with EzSocket::ReadData() in 3.9, feel free to refactor this function, the low lever character - // manipulation might look scary to people not used to it. - char* cBuffer = new char[NETMAXBUFFERSIZE]; - // Reading the first NETMAXBUFFERSIZE bytes (usually 1024), should be enough to get the HTTP Header only - int iBytes = socket->pReadData(cBuffer); - if( iBytes ) - { - // \r\n\r\n = Separator from HTTP Header and Body - char* cBodyStart = strstr(cBuffer, "\r\n\r\n"); - if( cBodyStart != nullptr ) - { - // Get the HTTP Header only - int iHeaderLength = cBodyStart - cBuffer; - char* cHeader = new char[iHeaderLength+1]; - strncpy( cHeader, cBuffer, iHeaderLength ); - cHeader[iHeaderLength] = '\0'; // needed to make it a valid C String - - RString sHTTPHeader( cHeader ); - SAFE_DELETE( cHeader ); - Trim( sHTTPHeader ); - //LOG->Trace( sHTTPHeader.c_str() ); - - vector svResponse; - split( sHTTPHeader, "\r\n", svResponse ); - - // Check for 200 OK - if( svResponse[0].find("200") != RString::npos ) - { - // Iterate through every field until an X-SM-Build field is found - for( unsigned h=1; hconnect(sHost, uPort) ) - - socket->close(); - SAFE_DELETE( socket ); - - if( ld ) - { - ld->SetIndeterminate(false); - ld->SetTotalWork(100); - - if( bSuccess ) - { - ld->SetProgress(100); - ld->SetText("Checking for updates... OK"); - } - else - { - ld->SetProgress(0); - ld->SetText("Checking for updates... ERROR"); - } - } - - return uCurrentSMBuild; -} -#endif - static bool ConnectToServer( const RString &t ) { NSMAN->PostStartUp( t ); diff --git a/src/NetworkSyncManager.h b/src/NetworkSyncManager.h index 1563b744a5..7c0db6ca9c 100644 --- a/src/NetworkSyncManager.h +++ b/src/NetworkSyncManager.h @@ -189,10 +189,6 @@ public: void GetListOfLANServers( vector& AllServers ); - // Aldo: Please move this method to a new class, I didn't want to create new files because I don't know how to properly update the files for each platform. - // I preferred to misplace code rather than cause unneeded headaches to non-windows users, although it would be nice to have in the wiki which files to - // update when adding new files. - static unsigned long GetCurrentSMBuild( LoadingWindow* ld ); private: #if !defined(WITHOUT_NETWORKING) diff --git a/src/RageException.h b/src/RageException.h index 210b8bac49..d86ff39ce3 100644 --- a/src/RageException.h +++ b/src/RageException.h @@ -1,9 +1,7 @@ #ifndef RAGE_EXCEPTION_H #define RAGE_EXCEPTION_H -#if defined(CMAKE_POWERED) #include "config.hpp" -#endif /** * @brief Namespace for throwing fatal errors. diff --git a/src/StepMania.cpp b/src/StepMania.cpp index 2c59a5c6ba..df29d3d4ff 100644 --- a/src/StepMania.cpp +++ b/src/StepMania.cpp @@ -1085,44 +1085,6 @@ int sm_main(int argc, char* argv[]) CommandLineActions::Handle(pLoadingWindow); - // Aldo: Check for updates here! -#if 0 - if( /* PREFSMAN->m_bUpdateCheckEnable (do this later) */ 0 ) - { - // TODO - Aldo_MX: Use PREFSMAN->m_iUpdateCheckIntervalSeconds & PREFSMAN->m_iUpdateCheckLastCheckedSecond - unsigned long current_version = NetworkSyncManager::GetCurrentSMBuild( pLoadingWindow ); - if( current_version ) - { - if( current_version > version_num ) - { - switch( Dialog::YesNo( "A new version of " PRODUCT_ID " is available. Do you want to download it?", "UpdateCheck" ) ) - { - case Dialog::yes: - //PREFSMAN->SavePrefsToDisk(); - // TODO: GoToURL for Linux - if( !HOOKS->GoToURL( SM_DOWNLOAD_URL ) ) - { - Dialog::Error( "Please go to the following URL to download the latest version of " PRODUCT_ID ":\n\n" SM_DOWNLOAD_URL, "UpdateCheckConfirm" ); - } - ShutdownGame(); - return 0; - case Dialog::no: - break; - default: - FAIL_M("Invalid response to Yes/No dialog"); - } - } - else if( version_num < current_version ) - { - LOG->Info( "The current version is more recent than the public one, double check you downloaded it from " SM_DOWNLOAD_URL ); - } - } - else - { - LOG->Info( "Unable to check for updates. The server might be offline." ); - } - } -#endif if( GetCommandlineArgument("dopefish") ) GAMESTATE->m_bDopefish = true; diff --git a/src/Texture Font Generator/Utils.h b/src/Texture Font Generator/Utils.h index 0ca0bddfbf..405fbd4bc2 100644 --- a/src/Texture Font Generator/Utils.h +++ b/src/Texture Font Generator/Utils.h @@ -1,11 +1,7 @@ #ifndef UTILS_H #define UTILS_H -#if defined(CMAKE_POWERED) #include "config.hpp" -#elif defined(HAVE_CONFIG_H) -#include "config.h" -#endif #if !defined(HAVE_TRUNCF) inline float truncf( float f ) { return float(int(f)); }; diff --git a/src/global.h b/src/global.h index 2075ec9df1..cab3162190 100644 --- a/src/global.h +++ b/src/global.h @@ -1,11 +1,7 @@ #ifndef GLOBAL_H #define GLOBAL_H -#if defined(CMAKE_POWERED) #include "config.hpp" -#elif defined(HAVE_CONFIG_H) -#include "config.h" -#endif #if _MSC_VER >= 1000 #pragma once diff --git a/src/ver.h b/src/ver.h index 69c7aad7cc..f1a2951c2a 100644 --- a/src/ver.h +++ b/src/ver.h @@ -1,11 +1,7 @@ #ifndef STEPMANIA_VER_H #define STEPMANIA_VER_H -#if !defined(CMAKE_POWERED) && ( defined(_MSC_VER) || defined(__MACOSX__) ) -#define product_version "5.0-UNKNOWN" -#else extern char const * const product_version; -#endif // XXX: These names are misnomers. This is actually the BUILD number, time and date. // NOTE: In GNU toolchain these are defined in ver.cpp. In MSVC these are defined in archutils/Win32/verinc.c I think. Why? I don't know and I don't have MSVC. --root @@ -14,4 +10,4 @@ extern char const * const version_time; extern char const * const version_date; extern char const * const sm_version_git_hash; -#endif \ No newline at end of file +#endif