Commit 13dd01a3 authored by Stephen Kitt's avatar Stephen Kitt

New upstream version 3.2.8

parent 02603b61
......@@ -6,7 +6,7 @@ PROJECT(mikmod C)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
LIST(APPEND CMAKE_MODULE_PATH "${mikmod_SOURCE_DIR}/cmake")
SET(VERSION "3.2.7")
SET(VERSION "3.2.8")
STRING(REGEX MATCHALL "([0-9]+)" VERSION_DIGITS "${VERSION}")
......
Summary of changes between MikMod 3.2.7 and MikMod 3.2.8:
==================================================================
MikMod 3.2.8 was released on June 14, 2017.
- Fixed several warnings from clang static analyzer.
- Fixed a misleading indentation warning from gcc6.
- A few minor OS/2 fixes.
- Support for building the Windows version using Open Watcom compiler.
- Other minor fix/tidy-ups.
Summary of changes between MikMod 3.2.6 and MikMod 3.2.7:
==================================================================
......
Hello folks !
This is MikMod, version 3.2.7, a module player for Unix.
This is MikMod, version 3.2.8, a module player for Unix.
As usual with each new version, there's a lot of bug fixes and improvements.
Check out the file 'NEWS' for more information.
......
This diff is collapsed.
#! /bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2015 Free Software Foundation, Inc.
# Copyright 1992-2017 Free Software Foundation, Inc.
timestamp='2015-08-20'
timestamp='2017-01-01'
# 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
......@@ -33,7 +33,7 @@ timestamp='2015-08-20'
# Otherwise, we print the canonical config type on stdout and succeed.
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
......@@ -53,8 +53,7 @@ timestamp='2015-08-20'
me=`echo "$0" | sed -e 's,.*/,,'`
usage="\
Usage: $0 [OPTION] CPU-MFR-OPSYS
$0 [OPTION] ALIAS
Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
Canonicalize a configuration name.
......@@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright 1992-2015 Free Software Foundation, Inc.
Copyright 1992-2017 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -118,7 +117,7 @@ case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
kopensolaris*-gnu* | \
kopensolaris*-gnu* | cloudabi*-eabi* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
......@@ -302,6 +301,7 @@ case $basic_machine in
| open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pru \
| pyramid \
| riscv32 | riscv64 \
| rl78 | rx \
......@@ -429,6 +429,7 @@ case $basic_machine in
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pru-* \
| pyramid-* \
| riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
......@@ -521,7 +522,7 @@ case $basic_machine in
basic_machine=i386-pc
os=-aros
;;
asmjs)
asmjs)
basic_machine=asmjs-unknown
;;
aux)
......@@ -644,6 +645,14 @@ case $basic_machine in
basic_machine=m68k-bull
os=-sysv3
;;
e500v[12])
basic_machine=powerpc-unknown
os=$os"spe"
;;
e500v[12]-*)
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
os=$os"spe"
;;
ebmon29k)
basic_machine=a29k-amd
os=-ebmon
......@@ -1023,7 +1032,7 @@ case $basic_machine in
ppc-* | ppcbe-*)
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
ppcle | powerpclittle)
basic_machine=powerpcle-unknown
;;
ppcle-* | powerpclittle-*)
......@@ -1033,7 +1042,7 @@ case $basic_machine in
;;
ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
ppc64le | powerpc64little)
basic_machine=powerpc64le-unknown
;;
ppc64le-* | powerpc64little-*)
......@@ -1383,14 +1392,14 @@ case $os in
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
| -bitrig* | -openbsd* | -solidbsd* \
| -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
......@@ -1399,7 +1408,8 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
| -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
......@@ -1531,6 +1541,8 @@ case $os in
;;
-nacl*)
;;
-ios)
;;
-none)
;;
*)
......@@ -1626,6 +1638,9 @@ case $basic_machine in
sparc-* | *-sun)
os=-sunos4.1.1
;;
pru-*)
os=-elf
;;
*-be)
os=-beos
;;
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for mikmod 3.2.7.
# Generated by GNU Autoconf 2.69 for mikmod 3.2.8.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
......@@ -589,8 +589,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='mikmod'
PACKAGE_TARNAME='mikmod'
PACKAGE_VERSION='3.2.7'
PACKAGE_STRING='mikmod 3.2.7'
PACKAGE_VERSION='3.2.8'
PACKAGE_STRING='mikmod 3.2.8'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
......@@ -1294,7 +1294,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures mikmod 3.2.7 to adapt to many kinds of systems.
\`configure' configures mikmod 3.2.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1364,7 +1364,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of mikmod 3.2.7:";;
short | recursive ) echo "Configuration of mikmod 3.2.8:";;
esac
cat <<\_ACEOF
......@@ -1461,7 +1461,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
mikmod configure 3.2.7
mikmod configure 3.2.8
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -1896,7 +1896,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by mikmod $as_me 3.2.7, which was
It was created by mikmod $as_me 3.2.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2720,7 +2720,7 @@ fi
# Define the identity of the package.
PACKAGE='mikmod'
VERSION='3.2.7'
VERSION='3.2.8'
cat >>confdefs.h <<_ACEOF
......@@ -6479,7 +6479,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by mikmod $as_me 3.2.7, which was
This file was extended by mikmod $as_me 3.2.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -6545,7 +6545,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
mikmod config.status 3.2.7
mikmod config.status 3.2.8
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
......@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.59])
AC_INIT([mikmod],[3.2.7])
AC_INIT([mikmod],[3.2.8])
AC_CONFIG_AUX_DIR([autotools])
AM_INIT_AUTOMAKE([1.7 foreign])
AC_CONFIG_SRCDIR([src/mikmod.c])
......
Hello folks !
This is MikMod, version 3.2.7, a module player for DOS.
This is MikMod, version 3.2.8, a module player for DOS.
Comments & feedback are welcome.
......
#
# -= MikMod 3.2.7 =-
# -= MikMod 3.2.8 =-
# configuration file
#
......
Begin3
Title: MikMod module player
Version: 3.2.7
Version: 3.2.8
Entered-date: no date yet
Description: MikMod is a full-featured GPL module player based on the libmikmod
Description: sound library.
......
#
# -= MikMod 3.2.7 =-
# -= MikMod 3.2.8 =-
# configuration file
#
......
# Makefile for OS/2 using Watcom compiler.
# Makefile for OS/2 using Open Watcom compiler.
#
# wmake -f Makefile.wat
#
# to statically link to mikmod:
# wmake -f Makefile.wat target=static
!ifndef target
target = dynamic
!endif
CC=wcc386
!ifndef __UNIX__
INCLUDES=-I..\os2 -I..\src
CPPFLAGS=-DHAVE_FCNTL_H -DHAVE_LIMITS_H -DHAVE_SYS_IOCTL_H -DHAVE_SYS_TIME_H -DHAVE_STRERROR -DHAVE_SNPRINTF
# for an exe using mikmod.dll: link to mikmod.lib
# for a statically linked exe: link to mikmod_static.lib which, in turn, requires mmpm2.lib
!else
INCLUDES=-I../os2 -I../src
!endif
CPPFLAGS=-DHAVE_FCNTL_H -DHAVE_LIMITS_H -DHAVE_SYS_IOCTL_H -DHAVE_SYS_TIME_H -DHAVE_STRERROR -DHAVE_SNPRINTF -DHAVE_MKSTEMP
!ifneq target static
LIBS=mikmod.lib
#LIBS=mikmod_static.lib mmpm2.lib
CFLAGS = -bt=os2 -bm -fp5 -fpi87 -mf -oeatxh -w4 -zp8 -ei
!else
CPPFLAGS+= -DMIKMOD_STATIC
LIBS=mikmod_static.lib mmpm2.lib
!endif
CFLAGS = -bt=os2 -bm -fp5 -fpi87 -mf -oeatxh -w4 -zp8 -ei -zq
# -5s : Pentium stack calling conventions.
# -5r : Pentium register calling conventions.
CFLAGS+= -5s
......@@ -29,66 +44,19 @@ all: $(AOUT)
$(AOUT): $(OBJ) $(EXTRA_OBJ)
wlink N $(AOUT) SYS OS2V2 LIBR {$(LIBS)} F {$(OBJ)} F {$(EXTRA_OBJ)}
clean:
FOR %F IN ( $(AOUT) $(OBJ) $(EXTRA_OBJ) ) DO IF EXIST %F ERASE %F
display.obj: ../src\display.c ..\src\display.h ..\src\player.h ..\src\mconfig.h &
..\src\rcfile.h ..\src\mlist.h ..\src\mutilities.h ..\src\mwindow.h &
..\src\mconfedit.h ..\src\mmenu.h ..\src\keys.h ..\src\mplayer.h &
..\src\mlistedit.h
$(COMPILE) -fo=$^@ ..\src\display.c
marchive.obj: ..\src\marchive.c ..\src\mfnmatch.h ..\src\mlist.h ..\src\marchive.h &
..\src\mconfig.h ..\src\rcfile.h ..\src\mutilities.h ..\src\display.h
$(COMPILE) -fo=$^@ ..\src\marchive.c
mconfedit.obj: ..\src\mconfedit.c ..\src\rcfile.h ..\src\mconfig.h ..\src\mconfedit.h &
..\src\mmenu.h ..\src\mwindow.h ..\src\mlist.h ..\src\mdialog.h &
..\src\mwidget.h ..\src\mutilities.h
$(COMPILE) -fo=$^@ ..\src\mconfedit.c
mconfig.obj: ..\src\mconfig.c ..\src\player.h ..\src\mconfig.h ..\src\rcfile.h &
..\src\mwindow.h ..\src\mlist.h ..\src\mutilities.h
$(COMPILE) -fo=$^@ ..\src\mconfig.c
mdialog.obj: ..\src\mdialog.c ..\src\mwidget.h ..\src\mwindow.h ..\src\mconfig.h &
..\src\rcfile.h ..\src\mdialog.h ..\src\display.h ..\src\mutilities.h
$(COMPILE) -fo=$^@ ..\src\mdialog.c
mikmod.obj: ..\src\mikmod.c ..\src\mgetopt.h ..\src\player.h ..\src\mutilities.h &
..\src\display.h ..\src\rcfile.h ..\src\mconfig.h ..\src\mlist.h &
..\src\mlistedit.h ..\src\mmenu.h ..\src\mwindow.h ..\src\marchive.h &
..\src\mdialog.h ..\src\mwidget.h ..\src\mplayer.h ..\src\keys.h
$(COMPILE) -fo=$^@ ..\src\mikmod.c
mlist.obj: ..\src\mlist.c ..\src\mfnmatch.h ..\src\mlist.h ..\src\marchive.h &
..\src\mutilities.h
$(COMPILE) -fo=$^@ ..\src\mlist.c
mlistedit.obj: ..\src\mlistedit.c ..\src\mlistedit.h ..\src\mmenu.h ..\src\mwindow.h &
..\src\mconfig.h ..\src\rcfile.h ..\src\mlist.h ..\src\player.h &
..\src\mdialog.h ..\src\mwidget.h ..\src\mconfedit.h ..\src\marchive.h &
..\src\keys.h ..\src\display.h ..\src\mutilities.h
$(COMPILE) -fo=$^@ ..\src\mlistedit.c
mmenu.obj: ..\src\mmenu.c ..\src\display.h ..\src\mmenu.h ..\src\mwindow.h &
..\src\mconfig.h ..\src\rcfile.h ..\src\mdialog.h ..\src\mwidget.h &
..\src\keys.h ..\src\mutilities.h
$(COMPILE) -fo=$^@ ..\src\mmenu.c
mplayer.obj: ..\src\mplayer.c ..\src\mplayer.h ..\src\mthreads.h ..\src\mconfig.h &
..\src\rcfile.h ..\src\mutilities.h
$(COMPILE) -fo=$^@ ..\src\mplayer.c
mutilities.obj: ..\src\mutilities.c ..\src\player.h ..\src\mlist.h ..\src\marchive.h &
..\src\mutilities.h
$(COMPILE) -fo=$^@ ..\src\mutilities.c
mwidget.obj: ..\src\mwidget.c ..\src\display.h ..\src\player.h ..\src\mwindow.h &
..\src\mconfig.h ..\src\rcfile.h ..\src\mwidget.h ..\src\keys.h &
..\src\mutilities.h
$(COMPILE) -fo=$^@ ..\src\mwidget.c
mwindow.obj: ..\src\mwindow.c ..\src\display.h ..\src\player.h ..\src\mwindow.h &
..\src\mconfig.h ..\src\rcfile.h ..\src\mutilities.h ..\src\keys.h &
..\src\mthreads.h ..\src\os2video.inc
$(COMPILE) -fo=$^@ ..\src\mwindow.c
rcfile.obj: ..\src\rcfile.c ..\src\rcfile.h ..\src\mutilities.h
$(COMPILE) -fo=$^@ ..\src\rcfile.c
mgetopt.obj: ..\src\mgetopt.c ..\src\mgetopt.h
$(COMPILE) -fo=$^@ ..\src\mgetopt.c
mgetopt1.obj: ..\src\mgetopt1.c ..\src\mgetopt.h
$(COMPILE) -fo=$^@ ..\src\mgetopt1.c
mfnmatch.obj: ..\src\mfnmatch.c ..\src\mfnmatch.h
$(COMPILE) -fo=$^@ ..\src\mfnmatch.c
musleep.obj: ..\src\musleep.c
$(COMPILE) -fo=$^@ ..\src\musleep.c
.c.obj:
$(COMPILE) -fo=$^@ $<
!ifndef __UNIX__
.c: ..\src
distclean: clean .symbolic
@if exist $(AOUT) del $(AOUT)
clean: .symbolic
@if exist *.obj del *.obj
!else
.c: ../src
distclean: clean .symbolic
rm -f $(AOUT)
clean: .symbolic
rm -f *.obj
!endif
Hello folks !
This is MikMod, version 3.2.7, a module player for OS/2.
This is MikMod, version 3.2.8, a module player for OS/2.
As usual with each new version, there's a lot of bugfixes and improvements.
Check out the file 'NEWS' for more information.
......
......@@ -325,6 +325,7 @@ static char* get_command (const char *pattern, const char *arc, const char *file
return command;
}
#if !(defined(__OS2__)||defined(__EMX__)||defined(__DJGPP__)||defined(_WIN32)||defined(_mikmod_amiga))
/* Split command in single arguments by inserting '\0' in command and
store them in argv. Size of argv: sizeargv */
static void split_command (char *command, char **argv, int sizeargv)
......@@ -357,6 +358,7 @@ static void split_command (char *command, char **argv, int sizeargv)
}
}
}
#endif
/* Create a copy of file 'fd' with the first 'start' lines and the
last 'end' lines removed. Ignore all lines up to the first
......@@ -735,8 +737,8 @@ void MA_FindFiles(PLAYLIST * pl, const CHAR *filename)
#else
pclose(file);
#endif
#else
/* Archive display, the Unix way */
#else /* Archive display, the Unix way */
int fd[2];
if (!pipe(fd)) {
......
......@@ -278,7 +278,9 @@ static char lzsignat[] = "-lz";
/* interesting file extensions */
static char targzext[] = ".TAR.GZ .TAZ .TGZ";
#if !defined(__OS2__)&&!defined(__EMX__)&&!defined(__DJGPP__)&&!defined(_WIN32)
static char tarbzip2ext[] = ".TAR.BZ2 .TBZ .TBZ2";
#endif
static ARCHIVE archiver_def[] = {
/* location, marker, list, filenames column, extract, skippat, skipstart, skipend */
......@@ -428,7 +430,7 @@ void CF_themes_free (THEME **themes, int *cnt)
free (*themes);
}
*cnt = 0;
*themes = NULL;
if (themes) *themes = NULL;
}
/* Free the user themes (themes above THEME_COUNT) */
......
.TH MIKMOD 1 "Version 3.2.7, 11 November 2015"
.TH MIKMOD 1 "Version 3.2.8, 07 April 2017"
.SH NAME
......
......@@ -350,6 +350,8 @@ BOOL PL_Load(PLAYLIST * pl, const CHAR *filename)
PL_Add(pl, arc ? mod : dummy, arc ? dummy : NULL, time,
(BOOL)played);
free (dummy);
} else
PL_Add(pl, mod, arc, time, (BOOL)played);
}
......
......@@ -52,7 +52,9 @@ static MP_DATA playdata;
static BOOL active = 0, paused = 1, use_threads = 0;
static int volume = -1;
#ifdef USE_THREADS
static DEFINE_MUTEX(data);
#endif
static DEFINE_THREAD(updater,updater_mode);
static void do_update(void)
......
......@@ -99,11 +99,8 @@ typedef enum {
#define DEFINE_THREAD(name,modevar) \
int modevar = MTH_NORUN
/* FIXME */
/*#define THREAD_START(name,fkt,arg) \
(_beginthread(_mm_mutex_##name, NULL, 4096, arg) != 0)*/
#define THREAD_START(name,fkt,arg) \
(_beginthread(fkt, NULL, 4096, arg) != 0)
(_beginthread(fkt, NULL, 4096, arg) != -1)
#define THREAD_JOIN(name,modevar) \
{ modevar = MTH_QUITTING; \
while (modevar==MTH_QUITTING) SLEEP(1); \
......
......@@ -50,6 +50,10 @@
#include <sys/stat.h>
#if defined(_WIN32)
#include <time.h>
#elif defined(__OS2__) || defined(__EMX__)
#define INCL_DOS
#include <os2.h>
#include <io.h>
#else
#include <sys/time.h>
#endif
......@@ -439,6 +443,25 @@ unsigned long Time1000(void)
LastRest = Delta % Freq; /* save those ticks not being counted */
LastCount = Count; /* save last count */
return LastTime;
#elif defined(__OS2__) || defined(__EMX__)
static int first = 1;
static ULONG Freq;
static long long LastCount = 0;
static long long LastRest = 0;
static long LastTime = 0;
long long Delta, Count;
if (first) {
first = 0;
DosTmrQueryFreq(&Freq);
}
DosTmrQueryTime((QWORD *) & Count);
Delta = 1000 * (Count - LastCount) + LastRest;
LastTime += (long)(Delta / Freq);
LastRest = Delta % Freq;
LastCount = Count;
return LastTime;
#else
struct timeval tv;
......
......@@ -1026,6 +1026,7 @@ void wid_str_set_input (WID_STR *w, const char *input, int length)
{
if (length>=0) {
if (w->input) free (w->input);
if (length) w->input = (char *) malloc(length + 1);
w->length = length;
}
if (w->length == 0) {
......
......@@ -828,10 +828,11 @@ void win_box_color(MWINDOW *win, int x1, int y1, int x2, int y2, ATTRS *back)
win_set_background (back[k--]);
mvaddch(i, x1, BOX_VLINE);
}
if (x2 <= maxx)
if (x2 <= maxx) {
if (back)
win_set_background (back[j++]);
mvaddch(i, x2, BOX_VLINE);
}
}
}
/* draw a box */
......
......@@ -20,8 +20,6 @@
/*==============================================================================
$Id: os2video.inc,v 1.1.1.1 2004/01/16 02:07:31 raph Exp $
OS/2 console i/o routines
==============================================================================*/
......@@ -55,13 +53,9 @@ void mvaddnstr(int y,int x,const char *str,int len)
void mvaddch(int y,int x,char ch)
{
#ifdef __WATCOMC__
char text[2]={0,0};
char text[2];
text[0]=ch;
#else
char text[2]={ch,0};
#endif
text[1]=0;
VioWrtCharStrAtt(text,1,y,x,&mvattr,hvio);
}
......@@ -132,14 +126,17 @@ void win_clrtoeol(MWINDOW *win, int x,int y)
}
}
#ifdef __EMX__
static int _mik_kbhit(void)
{
KBDKEYINFO k;
if (KbdPeek(&k, 0))
return 0;
else
return (k.fbStatus & KBDTRF_FINAL_CHAR_IN);
return (k.fbStatus & KBDTRF_FINAL_CHAR_IN);
}
#else
#define _mik_kbhit kbhit
#endif
static int win_getch(void)
{
......
......@@ -32,7 +32,7 @@
/*========== Messages */
#define playerversion "3.2.7"
#define playerversion "3.2.8"
#define mikversion "-= MikMod " playerversion " =-"
......
# Makefile for Win32 using Open Watcom compiler.
#
# wmake -f Makefile.wat
#
# to statically link to mikmod:
# wmake -f Makefile.wat target=static
!ifndef target
target = dynamic
!endif
CC=wcc386
!ifndef __UNIX__
INCLUDES=-I..\win32 -I..\src
!else
INCLUDES=-I../win32 -I../src
!endif
CPPFLAGS=-DHAVE_FCNTL_H -DHAVE_LIMITS_H -DHAVE_SYS_TIME_H -DHAVE_STRERROR -DHAVE_SNPRINTF -DHAVE_MKSTEMP
!ifneq target static
LIBS=mikmod.lib
!else
CPPFLAGS+= -DMIKMOD_STATIC
LIBS=mikmod_static.lib winmm.lib dsound.lib dxguid.lib
!endif
CFLAGS = -bt=nt -bm -fp5 -fpi87 -mf -oeatxh -w4 -zp8 -ei -zq
# -5s : Pentium stack calling conventions.
# -5r : Pentium register calling conventions.
CFLAGS+= -5s
.SUFFIXES:
.SUFFIXES: .obj .c
AOUT=mikmod.exe
COMPILE=$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES)
OBJ = display.obj marchive.obj mconfedit.obj mconfig.obj mdialog.obj mikmod.obj mlist.obj mlistedit.obj &
mmenu.obj mplayer.obj mutilities.obj mwidget.obj mwindow.obj rcfile.obj
EXTRA_OBJ = mgetopt.obj mgetopt1.obj mfnmatch.obj
all: $(AOUT)
$(AOUT): $(OBJ) $(EXTRA_OBJ)
wlink N $(AOUT) SYS NT LIBR {$(LIBS)} F {$(OBJ)} F {$(EXTRA_OBJ)}
.c.obj:
$(COMPILE) -fo=$^@ $<
!ifndef __UNIX__
.c: ..\src
distclean: clean .symbolic
@if exist $(AOUT) del $(AOUT)
clean: .symbolic
@if exist *.obj del *.obj
!else
.c: ../src
distclean: clean .symbolic
rm -f $(AOUT)
clean: .symbolic
rm -f *.obj
!endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment