diff options
author | 2010-01-07 23:36:30 +0100 | |
---|---|---|
committer | 2010-01-07 23:36:30 +0100 | |
commit | 7b35ca80124bd51929cca4422738713a8684df00 (patch) | |
tree | d3c47896ce48494e7f875aba1a1da460b563dd43 /plugins | |
parent | 001e68d2e20435662dfebd27dddc470faa383fad (diff) |
warning/compile fixes for 0.3.2-rc1
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/adplug/Makefile.am | 66 | ||||
-rw-r--r-- | plugins/adplug/adplug-db.cpp | 2 | ||||
-rw-r--r-- | plugins/alsa/alsa.c | 2 | ||||
-rw-r--r-- | plugins/gtkui/callbacks.c | 2 | ||||
-rw-r--r-- | plugins/gtkui/gtkplaylist.c | 4 | ||||
-rw-r--r-- | plugins/gtkui/search.c | 2 |
6 files changed, 70 insertions, 8 deletions
diff --git a/plugins/adplug/Makefile.am b/plugins/adplug/Makefile.am index 52cbb90d..618fe257 100644 --- a/plugins/adplug/Makefile.am +++ b/plugins/adplug/Makefile.am @@ -1,5 +1,12 @@ +adplugpath=@top_srcdir@/plugins/adplug + adlibdir = $(libdir)/$(PACKAGE) pkglib_LTLIBRARIES = adplug.la + +AM_CFLAGS = $(CFLAGS) -std=c99 -I$(adplugpath)/adplug -I$(adplugpath)/libbinio + +AM_CPPFLAGS = $(CXXFLAGS) -Dstricmp=strcasecmp -DVERSION=\"2.1\" -I$(adplugpath)/adplug -I$(adplugpath)/libbinio + adplug_la_SOURCES = adplug-db.cpp\ plugin.c\ adplug/adplug.cpp\ @@ -56,6 +63,62 @@ adplug_la_SOURCES = adplug-db.cpp\ adplug/msc.cpp\ adplug/rix.cpp\ adplug/adl.cpp\ + adplug/a2m.h\ + adplug/adl.h\ + adplug/adlibemu.h\ + adplug/adplug.h\ + adplug/adtrack.h\ + adplug/amd.h\ + adplug/analopl.h\ + adplug/bam.h\ + adplug/bmf.h\ + adplug/cff.h\ + adplug/d00.h\ + adplug/database.h\ + adplug/debug.h\ + adplug/dfm.h\ + adplug/diskopl.h\ + adplug/dmo.h\ + adplug/dro.h\ + adplug/dtm.h\ + adplug/emuopl.h\ + adplug/flash.h\ + adplug/fmc.h\ + adplug/fmopl.h\ + adplug/fprovide.h\ + adplug/hsc.h\ + adplug/hsp.h\ + adplug/hybrid.h\ + adplug/hyp.h\ + adplug/imf.h\ + adplug/kemuopl.h\ + adplug/ksm.h\ + adplug/lds.h\ + adplug/mad.h\ + adplug/mid.h\ + adplug/mididata.h\ + adplug/mkj.h\ + adplug/msc.h\ + adplug/mtk.h\ + adplug/opl.h\ + adplug/player.h\ + adplug/players.h\ + adplug/protrack.h\ + adplug/psi.h\ + adplug/rad.h\ + adplug/rat.h\ + adplug/raw.h\ + adplug/realopl.h\ + adplug/rix.h\ + adplug/rol.h\ + adplug/s3m.h\ + adplug/sa2.h\ + adplug/silentopl.h\ + adplug/sng.h\ + adplug/temuopl.h\ + adplug/u6m.h\ + adplug/xad.h\ + adplug/xsm.h\ libbinio/binfile.h\ libbinio/binio.h\ libbinio/binstr.h\ @@ -67,5 +130,4 @@ adplug_la_SOURCES = adplug-db.cpp\ adplug_la_LDFLAGS = -module -AM_CXXFLAGS = $(CFLAGS) -Dstricmp=strcasecmp -DVERSION=\"2.1\" -I adplug -I libbinio -AM_CFLAGS = $(CFLAGS) -std=c99 + diff --git a/plugins/adplug/adplug-db.cpp b/plugins/adplug/adplug-db.cpp index a5ab1ed1..f5b37ee7 100644 --- a/plugins/adplug/adplug-db.cpp +++ b/plugins/adplug/adplug-db.cpp @@ -20,7 +20,7 @@ #include <stdio.h> #include <string.h> #include "../../deadbeef.h" -#include "adplug/adplug.h" +#include "adplug.h" #include "emuopl.h" #include "silentopl.h" diff --git a/plugins/alsa/alsa.c b/plugins/alsa/alsa.c index a6fd1b77..0709fd46 100644 --- a/plugins/alsa/alsa.c +++ b/plugins/alsa/alsa.c @@ -20,7 +20,7 @@ #include <stdint.h> #include <unistd.h> #include <sys/prctl.h> -#include "deadbeef.h" +#include "../../deadbeef.h" #include "../../config.h" #define trace(...) { fprintf(stderr, __VA_ARGS__); } diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c index e2453bb6..bab9fb5a 100644 --- a/plugins/gtkui/callbacks.c +++ b/plugins/gtkui/callbacks.c @@ -35,7 +35,7 @@ #include "gtkplaylist.h" #include "search.h" #include "progress.h" -#include "session.h" +#include "../session.h" #include "gtkui.h" #include "parser.h" diff --git a/plugins/gtkui/gtkplaylist.c b/plugins/gtkui/gtkplaylist.c index 6b303c8a..762be03f 100644 --- a/plugins/gtkui/gtkplaylist.c +++ b/plugins/gtkui/gtkplaylist.c @@ -37,8 +37,8 @@ #include "search.h" #include "progress.h" #include "drawing.h" -#include "session.h" -#include "deadbeef.h" +#include "../../session.h" +#include "../../deadbeef.h" #include "parser.h" #define min(x,y) ((x)<(y)?(x):(y)) diff --git a/plugins/gtkui/search.c b/plugins/gtkui/search.c index ae53caf5..8c2055d1 100644 --- a/plugins/gtkui/search.c +++ b/plugins/gtkui/search.c @@ -31,7 +31,7 @@ #include "search.h" #include "gtkplaylist.h" -#include "deadbeef.h" +#include "../../deadbeef.h" #define min(x,y) ((x)<(y)?(x):(y)) #define max(x,y) ((x)>(y)?(x):(y)) |