Commit 14d83e87 authored by Stephen Kitt's avatar Stephen Kitt

Imported Upstream version 3.2.6

parent 3f11d3ef
...@@ -6,9 +6,9 @@ PROJECT(mikmod C) ...@@ -6,9 +6,9 @@ PROJECT(mikmod C)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8) CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
LIST(APPEND CMAKE_MODULE_PATH "${mikmod_SOURCE_DIR}/cmake") LIST(APPEND CMAKE_MODULE_PATH "${mikmod_SOURCE_DIR}/cmake")
SET (VERSION "3.2.5") SET(VERSION "3.2.6")
STRING (REGEX MATCHALL "([0-9]+)" VERSION_DIGITS "${VERSION}") STRING(REGEX MATCHALL "([0-9]+)" VERSION_DIGITS "${VERSION}")
LIST(GET VERSION_DIGITS 0 CPACK_PACKAGE_VERSION_MAJOR) LIST(GET VERSION_DIGITS 0 CPACK_PACKAGE_VERSION_MAJOR)
LIST(GET VERSION_DIGITS 1 CPACK_PACKAGE_VERSION_MINOR) LIST(GET VERSION_DIGITS 1 CPACK_PACKAGE_VERSION_MINOR)
...@@ -18,13 +18,13 @@ LIST(GET VERSION_DIGITS 2 CPACK_PACKAGE_VERSION_PATCH) ...@@ -18,13 +18,13 @@ LIST(GET VERSION_DIGITS 2 CPACK_PACKAGE_VERSION_PATCH)
SET(CPACK_PACKAGE_NAME "mikmod") SET(CPACK_PACKAGE_NAME "mikmod")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MikMod - a module player") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MikMod - a module player")
SET(CPACK_PACKAGE_VENDOR "Shlomi Fish") SET(CPACK_PACKAGE_VENDOR "Shlomi Fish")
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_DESCRIPTION_SUMMARY} ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_DESCRIPTION_SUMMARY} ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
SET (base_with_ver "mikmod-[0-9]+\\\\.[0-9]+\\\\.[0-9]+") SET(base_with_ver "mikmod-[0-9]+\\\\.[0-9]+\\\\.[0-9]+")
SET(CPACK_SOURCE_IGNORE_FILES SET(CPACK_SOURCE_IGNORE_FILES
"/_CPack_Packages/" "/_CPack_Packages/"
"/CMakeFiles/" "/CMakeFiles/"
...@@ -56,6 +56,21 @@ INCLUDE(CheckCCompilerFlag) ...@@ -56,6 +56,21 @@ INCLUDE(CheckCCompilerFlag)
INCLUDE(CheckCSourceCompiles) INCLUDE(CheckCSourceCompiles)
include(mik_macros) include(mik_macros)
CHECK_MULTI_INCLUDE_FILES(
"ncurses.h" "curses.h" "ncurses/curses.h" "termios.h"
"fcntl.h" "fnmatch.h" "inttypes.h" "limits.h" "memory.h" "sched.h"
"sys/ioctl.h" "sys/param.h" "sys/wait.h" "sys/time.h" "sys/types.h"
"sys/stat.h" "stdint.h" "stdlib.h" "string.h" "strings.h" "unistd.h"
"pthread.h"
)
CHECK_SYMBOL_EXISTS(TIOCGWINSZ "sys/ioctl.h" GWINSZ_IN_SYS_IOCTL)
CHECK_SYMBOL_EXISTS(usleep unistd.h HAVE_USLEEP_PROTO)
IF (NOT HAVE_USLEEP_PROTO)
CHECK_SYMBOL_EXISTS(usleep "sys/unistd.h" HAVE_USLEEP_PROTO)
ENDIF()
SET(EXTRA_LIBS )
find_path(MIKMOD_INCLUDE_DIR mikmod.h) find_path(MIKMOD_INCLUDE_DIR mikmod.h)
find_library(MIKMOD_LIBRARIES mikmod) find_library(MIKMOD_LIBRARIES mikmod)
IF (MIKMOD_LIBRARIES STREQUAL "MIKMOD_LIBRARIES-NOTFOUND") IF (MIKMOD_LIBRARIES STREQUAL "MIKMOD_LIBRARIES-NOTFOUND")
...@@ -69,25 +84,66 @@ IF(UNIX OR APPLE) ...@@ -69,25 +84,66 @@ IF(UNIX OR APPLE)
IF(NOT CURSES_FOUND) IF(NOT CURSES_FOUND)
MESSAGE(FATAL_ERROR "Curses not found.") MESSAGE(FATAL_ERROR "Curses not found.")
ENDIF() ENDIF()
ENDIF()
CHECK_MULTI_INCLUDE_FILES( IF(HAVE_NCURSES_H)
"ncurses.h" SET(CURSES_HDR "ncurses.h")
"fcntl.h" "fnmatch.h" "inttypes.h" "limits.h" "memory.h" "sched.h" ELSEIF(HAVE_CURSES_H)
"sys/ioctl.h" "sys/wait.h" "sys/time.h" "sys/types.h" "sys/stat.h" SET(CURSES_HDR "curses.h")
"stdint.h" "stdlib.h" "string.h" "strings.h" "termios.h" "unistd.h" ELSEIF(HAVE_NCURSES_CURSES_H)
"pthread.h" SET(CURSES_HDR "ncurses/curses.h")
) ELSE()
MESSAGE(FATAL_ERROR "Neither ncurses.h nor curses.h found.")
ENDIF()
CHECK_SYMBOL_EXISTS(TIOCGWINSZ "sys/ioctl.h" GWINSZ_IN_SYS_IOCTL) SET(CMAKE_REQUIRED_LIBRARIES ${CURSES_LIBRARY})
CHECK_SYMBOL_EXISTS(usleep unistd.h HAVE_USLEEP_PROTO) CHECK_FUNCTION_EXISTS (resizeterm HAVE_NCURSES_RESIZETERM)
IF (NOT HAVE_USLEEP_PROTO) CHECK_C_SOURCE_COMPILES(
CHECK_SYMBOL_EXISTS(usleep "sys/unistd.h" HAVE_USLEEP_PROTO) "#include <${CURSES_HDR}>
int main(void) {
#ifdef ACS_ULCORNER
return ACS_ULCORNER;
#endif
return 0; }"
CURSES_LINKSOK
)
IF(CURSES_LINKSOK)
LIST (APPEND EXTRA_LIBS ${CURSES_LIBRARY})
ELSE()
find_library(TINFO_LIBRARY tinfo)
IF(TINFO_LIBRARY STREQUAL "TINFO_LIBRARY-NOTFOUND")
MESSAGE(FATAL_ERROR "libtinfo needed for ncurses, but not found.")
ELSE()
MESSAGE(STATUS "Found libtinfo: ${TINFO_LIBRARY}")
SET(CMAKE_REQUIRED_LIBRARIES ${CURSES_LIBRARY} ${TINFO_LIBRARY})
CHECK_C_SOURCE_COMPILES(
"#include <${CURSES_HDR}>
int main(void) {
#ifdef ACS_ULCORNER
return ACS_ULCORNER;
#endif
return 0; }"
TINFO_LINKSOK
)
IF(TINFO_LINKSOK)
LIST (APPEND EXTRA_LIBS ${CURSES_LIBRARY})
LIST (APPEND EXTRA_LIBS ${TINFO_LIBRARY})
ELSE()
MESSAGE(FATAL_ERROR "failed linking to ncurses library.")
ENDIF()
ENDIF()
ENDIF()
ENDIF() ENDIF()
IF (HAVE_PTHREAD_H) SET(HAVE_PTHREAD)
IF (NOT WIN32)
INCLUDE(FindThreads)
IF (CMAKE_USE_PTHREADS_INIT)
SET (HAVE_PTHREAD 1) SET (HAVE_PTHREAD 1)
ENDIF (HAVE_PTHREAD_H) IF (CMAKE_THREAD_LIBS_INIT)
LIST (APPEND EXTRA_LIBS ${CMAKE_THREAD_LIBS_INIT})
ENDIF()
ENDIF()
ENDIF()
CHECK_MULTI_FUNCTIONS_EXISTS( CHECK_MULTI_FUNCTIONS_EXISTS(
"getopt_long_only" "getopt_long_only"
...@@ -99,10 +155,6 @@ CHECK_MULTI_FUNCTIONS_EXISTS( ...@@ -99,10 +155,6 @@ CHECK_MULTI_FUNCTIONS_EXISTS(
vprintf vprintf
) )
IF (HAVE_USLEEP)
SET (HAVE_USLEEP_PROTO 1)
ENDIF (HAVE_USLEEP)
CHECK_C_SOURCE_COMPILES( CHECK_C_SOURCE_COMPILES(
"#include <sys/types.h> "#include <sys/types.h>
#include <signal.h> #include <signal.h>
...@@ -111,14 +163,11 @@ CHECK_C_SOURCE_COMPILES( ...@@ -111,14 +163,11 @@ CHECK_C_SOURCE_COMPILES(
) )
if(RETSIGTYPE_INT) if(RETSIGTYPE_INT)
set(RETSIGTYPE int) set(RETSIGTYPE int)
else(RETSIGTYPE_INT) else()
set(RETSIGTYPE void) set(RETSIGTYPE void)
endif(RETSIGTYPE_INT) endif()
MESSAGE(STATUS "Return type of signal handlers: ${RETSIGTYPE}") MESSAGE(STATUS "Return type of signal handlers: ${RETSIGTYPE}")
SET(CMAKE_REQUIRED_LIBRARIES "ncurses")
CHECK_FUNCTION_EXISTS (resizeterm HAVE_NCURSES_RESIZETERM)
SET(CMAKE_REQUIRED_INCLUDES ${MIKMOD_INCLUDE_DIR}) SET(CMAKE_REQUIRED_INCLUDES ${MIKMOD_INCLUDE_DIR})
SET(CMAKE_REQUIRED_LIBRARIES ${MIKMOD_LIBRARIES}) SET(CMAKE_REQUIRED_LIBRARIES ${MIKMOD_LIBRARIES})
CHECK_FUNCTION_EXISTS (MikMod_free HAVE_MIKMOD_FREE) CHECK_FUNCTION_EXISTS (MikMod_free HAVE_MIKMOD_FREE)
...@@ -148,13 +197,11 @@ ENDFOREACH(CFLAG_TO_CHECK) ...@@ -148,13 +197,11 @@ ENDFOREACH(CFLAG_TO_CHECK)
ADD_DEFINITIONS("-DHAVE_CONFIG_H") ADD_DEFINITIONS("-DHAVE_CONFIG_H")
SET (PACKAGE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/mikmod") SET (PACKAGE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/mikmod")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) configure_file(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
# So it can find the includes when building libavl.avl.h.
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR})
# So it can find config.h # So it can find config.h
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR})
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_BINARY_DIR})
install( install(
FILES FILES
...@@ -164,6 +211,3 @@ install( ...@@ -164,6 +211,3 @@ install(
) )
add_subdirectory(src) add_subdirectory(src)
add_subdirectory(dos)
add_subdirectory(os2)
add_subdirectory(win32)
Basic Installation INSTALL file for mikmod
================== =======================
These are generic installation instructions. COMPILE USING CMAKE :
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, a file
`config.cache' that saves the results of its tests to speed up
reconfiguring, and a file `config.log' containing compiler output
(useful mainly for debugging `configure').
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If at some point `config.cache'
contains results you don't want to keep, you may remove or edit it.
The file `configure.in' is used to create `configure' by a program
called `autoconf'. You only need `configure.in' if you want to change
it or regenerate `configure' using a newer version of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system. If you're
using `csh' on an old version of System V, you might need to type
`sh ./configure' instead to prevent `csh' from trying to execute
`configure' itself.
Running `configure' takes awhile. While running, it prints some
messages telling which features it is checking for.
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
the package.
4. Type `make install' to install the programs and any data files and
documentation.
5. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
also a `make maintainer-clean' target, but that is intended mainly
for the package's developers. If you use it, you may have to get
all sorts of other programs in order to regenerate files that came
with the distribution.
Compilers and Options
===================== =====================
Some systems require unusual options for compilation or linking that Mikmod versions 3.2.5 and newer support CMake. CMake version 2.8.x
the `configure' script does not know about. You can give `configure' or later is required. CMake homepage is at http://www.cmake.org/ .
initial values for variables by setting them in the environment. Using
a Bourne-compatible shell, you can do that on the command line like
this:
CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
Or on systems that have the `env' program, you can do it like this:
env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
Compiling For Multiple Architectures
====================================
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you must use a version of `make' that
supports the `VPATH' variable, such as GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
If you have to use a `make' that does not supports the `VPATH'
variable, you have to compile the package for one architecture at a time
in the source code directory. After you have installed the package for
one architecture, use `make distclean' before reconfiguring for another
architecture.
Installation Names
==================
By default, `make install' will install the package's files in
`/usr/local/bin', `/usr/local/man', etc. You can specify an
installation prefix other than `/usr/local' by giving `configure' the
option `--prefix=PATH'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
give `configure' the option `--exec-prefix=PATH', the package will use
PATH as the prefix for installing programs and libraries.
Documentation and other data files will still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=PATH' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
`README' should mention any `--enable-' and `--with-' options that the
package recognizes.
For packages that use the X Window System, `configure' can usually
find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Specifying the System Type
==========================
There may be some features `configure' can not figure out
automatically, but needs to determine by the type of host the package
will run on. Usually `configure' can figure that out, but if it prints
a message saying it can not guess the host type, give it the
`--host=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name with three fields:
CPU-COMPANY-SYSTEM
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
need to know the host type.
If you are building compiler tools for cross-compiling, you can also
use the `--target=TYPE' option to select the type of system they will
produce code for and the `--build=TYPE' option to select the type of
system on which you are compiling the package.
Sharing Defaults Run:
================ mkdir build
cd build
cmake-gui .. # For the GUI configuration applet
If you want to set default values for `configure' scripts to share, Or:
you can create a site shell script called `config.site' that gives mkdir build
default values for variables like `CC', `cache_file', and `prefix'. cd build
`configure' looks for `PREFIX/share/config.site' if it exists, then ccmake .. # For the Curses-based configuration applet
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
A warning: not all `configure' scripts look for a site script.
Operation Controls With a fallback to:
================== mkdir build
cd build
cmake .. # Non-interactive application.
`configure' recognizes the following options to control how it You need libmikmod compiled and installed on your system.
operates.
`--cache-file=FILE' For installing under windows, consult the CMake documentation for
Use and save the results of the tests in FILE instead of generating a Visual C, MinGW, etc. compatible makefile or project.
`./config.cache'. Set FILE to `/dev/null' to disable caching, for
debugging `configure'.
`--help'
Print a summary of the options to `configure', and exit.
`--quiet' COMPILE USING CONFIGURE / AUTOTOOLS :
`--silent' =====================================
`-q'
Do not print messages saying which checks are being made. To
suppress all normal output, redirect it to `/dev/null' (any error
messages will still be shown).
`--srcdir=DIR' In most systems just run:
Look for the package's source code in directory DIR. Usually $ ./configure
`configure' can determine that directory automatically. $ make
`--version' You need GNU make. On BSD or SysV systems, you may need to use gmake
Print the version of Autoconf used to generate the `configure' instead of make. Use ./configure --help to see configuration options.
script, and exit. You need libmikmod compiled and installed on your system. To install
mikmod, run "make install" as the superuser.
`configure' also accepts some other, not widely useful, options. To cross-compile, you will need to use the --host option of configury.
For example:
$ ./configure --host=powerpc-apple-darwin9 # for Mac OS X (powerpc)
$ ./configure --host=i686-pc-mingw32 # for Windows (win32)
$ ./configure --host=x86_64-w64-mingw32 # for Windows (win64)
We also provide standalone makefiles for Windows, Mac OS X, DJGPP (DOS)
which you can use for both compiling on the relevant native system, or
for cross-compiling.
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src dos os2 win32 SUBDIRS = src
pkgdata_DATA = mikmodrc pkgdata_DATA = mikmodrc
EXTRA_DIST = mikmod-3.2.5.lsm \ EXTRA_DIST = mikmod.lsm mikmod.cfg $(pkgdata_DATA) \
convert_playlist mikmod.cfg $(pkgdata_DATA) \ dos os2 macosx win32 \
config.h.cmake CMakeLists.txt cmake config.h.cmake CMakeLists.txt cmake
...@@ -265,10 +265,10 @@ top_builddir = @top_builddir@ ...@@ -265,10 +265,10 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src dos os2 win32 SUBDIRS = src
pkgdata_DATA = mikmodrc pkgdata_DATA = mikmodrc
EXTRA_DIST = mikmod-3.2.5.lsm \ EXTRA_DIST = mikmod.lsm mikmod.cfg $(pkgdata_DATA) \
convert_playlist mikmod.cfg $(pkgdata_DATA) \ dos os2 macosx win32 \
config.h.cmake CMakeLists.txt cmake config.h.cmake CMakeLists.txt cmake
all: config.h all: config.h
......
Summary of changes between MikMod 3.2.4 and MikMod 3.2.5 (): Summary of changes between MikMod 3.2.5 and MikMod 3.2.6:
================================================================== ==================================================================
MikMod 3.2.4 was released on 10-Jan-2014. MikMod 3.2.6 was released on 31-Aug-2014.
- Fix curses linkage on some setups. (add -ltinfo if necessary.)
- Windows version now relies on %USERPROFILE% instead of %HOME%
for its config and playlist.
- The dos version doesn't check %HOME% anymore and simply uses C:
for its config and playlist.
- Support for AmigaOS and its variants like MorphOS, AROS. (thanks
to Szilard Biro for lots of help.)
- Build system configuration and packaging simplifications, tidy-ups.
- Configury: fix link tests for older binutils.
- Cmake updates and improvements. Several makefile clean-ups.
- Several portability tweaks.
- Fix some OS/2 bit rot. (for nostalgia...)
- Removed ancient convert_playlist script which used to supposed
to convert pre-ancient mikmod playlists. Documentation updates.
Summary of changes between MikMod 3.2.4 and MikMod 3.2.5:
==================================================================
MikMod 3.2.5 was released on 10-Jan-2014.
- New CMake build system. - New CMake build system.
- Small autotols updates. - Small autotols updates.
...@@ -11,7 +32,7 @@ MikMod 3.2.4 was released on 10-Jan-2014. ...@@ -11,7 +32,7 @@ MikMod 3.2.4 was released on 10-Jan-2014.
- Several code clean-ups. - Several code clean-ups.
Summary of changes between MikMod 3.2.3 and MikMod 3.2.4 (): Summary of changes between MikMod 3.2.3 and MikMod 3.2.4:
================================================================== ==================================================================
MikMod 3.2.4 was released on 14/Oct/2013. MikMod 3.2.4 was released on 14/Oct/2013.
...@@ -25,7 +46,7 @@ This is a minor bug fix/maintenance release. ...@@ -25,7 +46,7 @@ This is a minor bug fix/maintenance release.
- Fixed some compiler warnings, minor cleanups. - Fixed some compiler warnings, minor cleanups.
Summary of changes between MikMod 3.2.2 and MikMod 3.2.3 (): Summary of changes between MikMod 3.2.2 and MikMod 3.2.3:
================================================================== ==================================================================
MikMod 3.2.3 was released on 05/Oct/2013. MikMod 3.2.3 was released on 05/Oct/2013.
......
Hello folks ! Hello folks !
This is MikMod, version 3.2.5, a module player for Unix. This is MikMod, version 3.2.6, a module player for Unix.
As usual with each new version, there's a lot of bugfixes and improvements. As usual with each new version, there's a lot of bugfixes and improvements.
Check out the file 'NEWS' for more information. Check out the file 'NEWS' for more information.
...@@ -75,9 +75,8 @@ customize your $HOME/.mikmodrc, either from the configuration panel or by ...@@ -75,9 +75,8 @@ customize your $HOME/.mikmodrc, either from the configuration panel or by
editing the file, so you won't need to supply the same options to MikMod all editing the file, so you won't need to supply the same options to MikMod all
the time. the time.
Once you're in the player, if you haven't choosed terse mode (a la Once you're in the player, pressing the H key will give you an help screen with
MikMod 2), pressing the H key will give you an help screen with the list the list of the keys you can use. I hope it's understandable.
of the keys you can use. I hope it's understandable.
If you're playing MikMod in quiet mode (with the -q/-quiet switch), you can If you're playing MikMod in quiet mode (with the -q/-quiet switch), you can
tell MikMod to jump to the next/previous song by sending the MikMod process tell MikMod to jump to the next/previous song by sending the MikMod process
...@@ -108,14 +107,6 @@ This feature also works when MikMod is in interactive mode (with the ...@@ -108,14 +107,6 @@ This feature also works when MikMod is in interactive mode (with the
curses interface), but is less useful then, since you have full player curses interface), but is less useful then, since you have full player
control... control...
If you used the playlist features of the previous MikMod versions, your
old playlist won't work anymore since the playlist format has changed.
Now the playlist files must have an .mpl extension. To convert your old
playlists into the new format, use the
'convert_playlist' awk script:
./convert_playlist < my_old_playlist > my_new_playlist.mpl
>> Y2K COMPLIANCE >> Y2K COMPLIANCE
----------------- -----------------
......
...@@ -416,18 +416,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], ...@@ -416,18 +416,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
]) ])
# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
# Free Software Foundation, Inc.
#
# 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.
# serial 8
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# Do all the work for Automake. -*- Autoconf -*- # Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
......
#! /bin/sh #! /bin/sh
# Attempt to guess a canonical system name. # Attempt to guess a canonical system name.
# Copyright 1992-2013 Free Software Foundation, Inc. # Copyright 1992-2014 Free Software Foundation, Inc.
timestamp='2013-11-29' timestamp='2014-03-23'
# This file is free software; you can redistribute it and/or modify it # This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by # under the terms of the GNU General Public License as published by
...@@ -50,7 +50,7 @@ version="\ ...@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp) GNU config.guess ($timestamp)
Originally written by Per Bothner. Originally written by Per Bothner.
Copyright 1992-2013 Free Software Foundation, Inc. Copyright 1992-2014 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
...@@ -149,7 +149,7 @@ Linux|GNU|GNU/*) ...@@ -149,7 +149,7 @@ Linux|GNU|GNU/*)
LIBC=gnu LIBC=gnu
#endif #endif
EOF EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
;; ;;
esac esac
...@@ -826,7 +826,7 @@ EOF ...@@ -826,7 +826,7 @@ EOF
*:MINGW*:*) *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32 echo ${UNAME_MACHINE}-pc-mingw32
exit ;; exit ;;
i*:MSYS*:*) *:MSYS*:*)
echo ${UNAME_MACHINE}-pc-msys echo ${UNAME_MACHINE}-pc-msys
exit ;; exit ;;
i*:windows32*:*) i*:windows32*:*)
...@@ -969,10 +969,10 @@ EOF ...@@ -969,10 +969,10 @@ EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;; ;;
or1k:Linux:*:*) openrisc*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC} echo or1k-unknown-linux-${LIBC}
exit ;; exit ;;
or32:Linux:*:*) or32:Linux:*:* | or1k*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC} echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;; exit ;;
padre:Linux:*:*) padre:Linux:*:*)
...@@ -1371,154 +1371,6 @@ EOF ...@@ -1371,154 +1371,6 @@ EOF
exit ;; exit ;;
esac esac
eval $set_cc_for_build
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
# include <sys/types.h>
# include <sys/utsname.h>
#endif
main ()
{
#if defined (sony)
#if defined (MIPSEB)
/* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
I don't know.... */
printf ("mips-sony-bsd\n"); exit (0);
#else
#include <sys/param.h>
printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4
"4"
#else
""
#endif
); exit (0);
#endif
#endif
#if defined (__arm) && defined (__acorn) && defined (__unix)
printf ("arm-acorn-riscix\n"); exit (0);
#endif
#if defined (hp300) && !defined (hpux)
printf ("m68k-hp-bsd\n"); exit (0);
#endif
#if defined (NeXT)
#if !defined (__ARCHITECTURE__)
#define __ARCHITECTURE__ "m68k"
#endif
int version;
version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
if (version < 4)
printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
else
printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
exit (0);
#endif
#if defined (MULTIMAX) || defined (n16)
#if defined (UMAXV)