diff --git a/Makefile.am b/Makefile.am index aa3afb0..f383ef1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,23 @@ ZIP = zip ZIPFLAGS = -j ZIPFILE = $(PACKAGE)-$(VERSION).zip -binarydist: +MAKEPIMP = wine makepimp + +bindistprep: make + $(STRIP) src/.libs/in_adlib.dll + +zipdist: bindistprep $(ZIP) -l $(ZIPFLAGS) $(ZIPFILE) $(BINARYDIST) $(ZIP) $(ZIPFLAGS) $(ZIPFILE) $(BINARYBINS) + +pimpdist: bindistprep + make +# MakePimp is unable to read from src/.libs, since .libs is an invalid +# path for a Windows program. Thus, we temporarily copy the file to a +# saner path. + cp src/.libs/in_adlib.dll . + $(MAKEPIMP) in_adlib.psc + rm in_adlib.dll + +binarydist: zipdist pimpdist diff --git a/NEWS b/NEWS index 1e7c243..cc68d85 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +Changes for version 1.8 (2007-04-09) + - Fixed default for ignored filetypes. + - New default playback is in stereo. + Changes for version 1.7 (2006-05-13) - Now using the GNU build-system and compiled with MinGW by default. This fixes a lot of bugs. diff --git a/README b/README index eb42c4c..e7ad280 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ -AdPlug Winamp plugin v1.7 +AdPlug Winamp plugin v1.8 -Copyright (c) 1999 - 2006 Simon Peter +Copyright (c) 1999 - 2007 Simon Peter Copyright (c) 2002 Nikita V. Kalaganov Website: http://adplug.sourceforge.net diff --git a/configure.in b/configure.in index c8be3d6..b448846 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ # Tell autoconf we're compiling a C++ DLL, using automake & libtool -AC_INIT(in_adlib,1.7) +AC_INIT(in_adlib,1.8) AC_CONFIG_SRCDIR(src/plugin.cpp) AC_CONFIG_FILES([Makefile src/Makefile in_adlib.psc]) AM_INIT_AUTOMAKE diff --git a/in_adlib.psc.in b/in_adlib.psc.in index 9f21613..6ea708d 100644 --- a/in_adlib.psc.in +++ b/in_adlib.psc.in @@ -18,8 +18,8 @@ OutFile @PACKAGE@-@VERSION@.exe ; -------------------- SetOutPath $DSPDIR -AddFile @srcdir@/src/.libs/in_adlib.dll -AddFile @srcdir@/README +AddFile in_adlib.dll +AddFile @srcdir@\README ;AddFile ..\..\adplug.db ; Post-install execute section diff --git a/src/config.cpp b/src/config.cpp index 1e31e4e..e9e3b8a 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 1999 - 2006 Simon Peter + Copyright (c) 1999 - 2007 Simon Peter Copyright (c) 2002 Nikita V. Kalaganov This library is free software; you can redistribute it and/or @@ -34,7 +34,7 @@ #define DFL_EMU emuts #define DFL_REPLAYFREQ 44100 #define DFL_USE16BIT true -#define DFL_STEREO false +#define DFL_STEREO true #define DFL_USEOUTPUT DFL_EMU #define DFL_ADLIBPORT 0x388 #define DFL_TESTOPL2 true @@ -43,7 +43,7 @@ #define DFL_PRIORITY 4 #define DFL_STDTIMER true #define DFL_DISKDIR "C:\\" -#define DFL_IGNORED "17;" +#define DFL_IGNORED "19;" #define DFL_DBFILE "adplug.db" #define DFL_USEDB true #define DFL_S3M_WORKAROUND true diff --git a/src/in_adlib.rc b/src/in_adlib.rc index 56b16e6..b68b6f5 100644 --- a/src/in_adlib.rc +++ b/src/in_adlib.rc @@ -1,6 +1,6 @@ /* -*- Mode: C -*- * - * Copyright (c) 1999 - 2006 Simon Peter + * Copyright (c) 1999 - 2007 Simon Peter * Copyright (c) 2002 Nikita V. Kalaganov * * This library is free software; you can redistribute it and/or @@ -119,7 +119,7 @@ BEGIN SS_REALSIZEIMAGE,5,41,267,71 CTEXT "",IDC_PLUGIN_VER,6,0,273,8,NOT WS_GROUP LTEXT "url_sp",IDC_URL_SP,175,14,50,8,NOT WS_GROUP - RTEXT "Copyright (c) 1999 - 2006 Simon Peter <",IDC_STATIC,49, + RTEXT "Copyright (c) 1999 - 2007 Simon Peter <",IDC_STATIC,49, 14,126,8,NOT WS_GROUP LTEXT ">",IDC_STATIC,226,14,8,8,NOT WS_GROUP LTEXT "url_nk",IDC_URL_NK,181,23,38,8,NOT WS_GROUP diff --git a/src/plugin.cpp b/src/plugin.cpp index 8f17929..06333ec 100644 --- a/src/plugin.cpp +++ b/src/plugin.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 1999 - 2006 Simon Peter + Copyright (c) 1999 - 2007 Simon Peter Copyright (c) 2002 Nikita V. Kalaganov This library is free software; you can redistribute it and/or @@ -228,10 +228,11 @@ extern "C" __declspec(dllexport) In_Module *winampGetInModule2() mod.UsesOutputPlug = config.useoutputplug; filetypes.add("a2m", "Adlib Tracker 2 Modules (*.A2M)"); + filetypes.add("adl", "Westwood ADL Files (*.ADL)"); filetypes.add("amd", "AMUSIC Modules (*.AMD)"); filetypes.add("bam", "Bob's Adlib Music Files (*.BAM)"); - filetypes.add("cmf", "Creative Adlib Music Files (*.CMF)"); filetypes.add("cff", "BoomTracker 4 Modules (*.CFF)"); + filetypes.add("cmf", "Creative Adlib Music Files (*.CMF)"); filetypes.add("d00", "Packed EdLib Modules (*.D00)"); filetypes.add("dfm", "Digital-FM Modules (*.DFM)"); filetypes.add("dmo", "TwinTeam Modules (*.DMO)"); @@ -255,14 +256,14 @@ extern "C" __declspec(dllexport) In_Module *winampGetInModule2() filetypes.add("rol", "Adlib Visual Composer Modules (*.ROL)"); if(!cfg.s3m_workaround) filetypes.add("s3m", "Scream Tracker 3 Modules (*.S3M)"); - filetypes.add("sat", "Surprise! Adlib Tracker Modules (*.SAT)"); filetypes.add("sa2", "Surprise! Adlib Tracker 2 Modules (*.SA2)"); + filetypes.add("sat", "Surprise! Adlib Tracker Modules (*.SAT)"); filetypes.add("sci", "Sierra Adlib Audio Files (*.SCI)"); filetypes.add("sng", "Adlib Tracker Modules (*.SNG)"); filetypes.add("sng", "Faust Music Creator Modules (*.SNG)"); filetypes.add("sng", "SNGPlay Files (*.SNG)"); - filetypes.add("xms", "XMS-Tracker Modules (*.XMS)"); filetypes.add("xad", "Exotic Adlib Files (*.XAD)"); + filetypes.add("xms", "XMS-Tracker Modules (*.XMS)"); filetypes.add("xsm", "eXtra Simple Music Files (*.XSM)"); filetypes.set_ignore_list(config.get_ignored());