# HG changeset patch
# User chainsaw
# Date 1139176713 28800
# Node ID fc1788e1ab04d29f3f268467556dfd5970d3a726
# Parent  e9cf6c7c662318f2d31e08f8f516d79fa06b3a10
[svn] Start building adplug.

diff -r e9cf6c7c6623 -r fc1788e1ab04 Plugins/Input/adplug/Makefile.in
--- a/Plugins/Input/adplug/Makefile.in	Sun Feb 05 13:32:51 2006 -0800
+++ b/Plugins/Input/adplug/Makefile.in	Sun Feb 05 13:58:33 2006 -0800
@@ -1,5 +1,5 @@
-include ../../../rules.mk
-include ../../../objective.mk
+include ../../../mk/rules.mk
+include ../../../mk/objective.mk
 
 SUBDIRS = core
 OBJECTIVE_LIBS = libadplug.so
@@ -14,3 +14,4 @@
 
 CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(BINIO_CFLAGS) \
 	-I../../../intl -I../../.. -I./core
+CXXFLAGS = $(CFLAGS)
diff -r e9cf6c7c6623 -r fc1788e1ab04 Plugins/Input/adplug/adplug-xmms.cc
--- a/Plugins/Input/adplug/adplug-xmms.cc	Sun Feb 05 13:32:51 2006 -0800
+++ b/Plugins/Input/adplug/adplug-xmms.cc	Sun Feb 05 13:58:33 2006 -0800
@@ -393,6 +393,7 @@
 static void adplug_stop(void);
 static void adplug_play(char *filename);
 
+#if 0
 static void subsong_slider(GtkAdjustment *adj)
 {
   adplug_stop();
@@ -400,7 +401,6 @@
   adplug_play(plr.filename);
 }
 
-#if 0
 static void close_infobox(GtkDialog *infodlg)
 {
   // Forget our references to the instance of the "currently playing song" info
@@ -675,6 +675,7 @@
   plr.playing = false; // important! XMMS won't get a self-ended song without it.
   dbg_printf(".\n");
   g_thread_exit(NULL);
+  return(NULL);
 }
 
 // sampsize macro not useful anymore.
diff -r e9cf6c7c6623 -r fc1788e1ab04 Plugins/Input/adplug/core/Makefile.in
--- a/Plugins/Input/adplug/core/Makefile.in	Sun Feb 05 13:32:51 2006 -0800
+++ b/Plugins/Input/adplug/core/Makefile.in	Sun Feb 05 13:58:33 2006 -0800
@@ -11,12 +11,6 @@
 rol.cpp xsm.cpp adlibemu.c dro.cpp lds.cpp realopl.cpp analopl.cpp \
 temuopl.cpp msc.cpp rix.cpp
 
-# This is a hack. Throughout AdPlug, stricmp() is used to do caseless string
-# comparations. UNIX libc's don't support stricmp(), but do support the BSD
-# strcasecmp(), so we have to replace every occurance of stricmp() into
-# strcasecmp(). stricmp() seems to be Windows, but maybe also POSIX...
-AM_CPPFLAGS = -Dstricmp=strcasecmp
-
 noinst_HEADERS = adplug.h emuopl.h fmopl.h silentopl.h opl.h diskopl.h \
 a2m.h amd.h bam.h d00.h dfm.h hsc.h hsp.h imf.h ksm.h lds.h mid.h mkj.h mtk.h \
 protrack.h rad.h raw.h sa2.h sng.h u6m.h player.h fmc.h mad.h xad.h bmf.h \
@@ -25,5 +19,6 @@
 analopl.h temuopl.h msc.h rix.h
 
 CFLAGS += -fPIC -DPIC $(BINIO_CFLAGS) -I../../../../intl -I../../../..
+CXXFLAGS = $(CFLAGS) -Dstricmp=strcasecmp
 
 OBJECTS = ${SOURCES:.c=.o} ${SOURCES:.cpp=.o}