changeset 2627:c0a35d3d5bb9

use in Makefile
author Tomasz Mon <desowin@gmail.com>
date Thu, 22 May 2008 15:42:44 +0200
parents b7ab90e4235e
children c45acc6e352c
files src/skins/Makefile src/skins/plugin.h src/skins/ui_skin.h
diffstat 3 files changed, 1 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/skins/Makefile	Thu May 22 15:15:31 2008 +0200
+++ b/src/skins/Makefile	Thu May 22 15:42:44 2008 +0200
@@ -35,6 +35,6 @@
 
 plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 
-CFLAGS += ${PLUGIN_CFLAGS}
+CFLAGS += ${PLUGIN_CFLAGS} ${BEEP_DEFINES}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${CAIRO_CFLAGS} ${PANGOCAIRO_CFLAGS} ${XRENDER_CFLAGS} ${XCOMPOSITE_CFLAGS} -I../..
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${CAIRO_LIBS} ${PANGOCAIRO_LIBS} ${XRENDER_LIBS} ${XCOMPOSITE_LIBS} ${MOWGLI_LIBS}
--- a/src/skins/plugin.h	Thu May 22 15:15:31 2008 +0200
+++ b/src/skins/plugin.h	Thu May 22 15:42:44 2008 +0200
@@ -28,7 +28,6 @@
 #include "ui_equalizer.h"
 
 #define PACKAGE_NAME "audacious-plugins"
-#define DATA_DIR "/usr/local/share/audacious/"
 
 void skins_init(void);
 void skins_cleanup(void);
--- a/src/skins/ui_skin.h	Thu May 22 15:15:31 2008 +0200
+++ b/src/skins/ui_skin.h	Thu May 22 15:42:44 2008 +0200
@@ -30,14 +30,8 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-#if 0
-#include "audconfig.h"
-
 #define BMP_DEFAULT_SKIN_PATH \
   DATA_DIR G_DIR_SEPARATOR_S "Skins" G_DIR_SEPARATOR_S "Default"
-#else
-#define BMP_DEFAULT_SKIN_PATH "/usr/local/share/audacious/Skins/Default"
-#endif
 
 typedef enum {
     SKIN_MAIN = 0,