changeset 279:1983383db0f5 trunk

[svn] build fixes: - now configure properly find flac 1.1.3beta2 - fix CXXFLAGS. it would lose audacious include path if --with-libFLAC was given. - suppress gcc 4.1.1 compile warnings
author yaz
date Sun, 19 Nov 2006 22:54:10 -0800
parents 8f4dc0d63925
children 3b5878a7c62f
files ChangeLog m4/libFLAC.m4 src/paranormal/cfg.c src/xspf/urlencode.c
diffstat 4 files changed, 15 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Nov 19 15:37:28 2006 -0800
+++ b/ChangeLog	Sun Nov 19 22:54:10 2006 -0800
@@ -1,3 +1,12 @@
+2006-11-19 23:37:28 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [584]
+  - add surface flip
+  
+  trunk/src/paranormal/builtins.c |    2 +
+  trunk/src/paranormal/general.c  |   43 ++++++++++++++++++++++++++++++++++++++++
+  2 files changed, 45 insertions(+)
+
+
 2006-11-19 22:54:33 +0000  William Pitcock <nenolod@nenolod.net>
   revision [582]
   - more presets
--- a/m4/libFLAC.m4	Sun Nov 19 15:37:28 2006 -0800
+++ b/m4/libFLAC.m4	Sun Nov 19 22:54:10 2006 -0800
@@ -22,12 +22,12 @@
     LIBFLAC_LIBS="-L$libdir"
   fi
 
-  LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -lm"
+  LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -logg -lm"
 
   if test "x$libFLAC_includes" != "x" ; then
-    LIBFLAC_CFLAGS="-I$libFLAC_includes"
+    LIBFLAC_CFLAGS="-I$prefix/include -I$libFLAC_includes"
   elif test "x$libFLAC_prefix" != "x" ; then
-    LIBFLAC_CFLAGS="-I$libFLAC_prefix/include"
+    LIBFLAC_CFLAGS="-I$prefix/include -I$libFLAC_prefix/include"
   elif test "$prefix" != "xNONE"; then
     LIBFLAC_CFLAGS="-I$prefix/include"
   fi
--- a/src/paranormal/cfg.c	Sun Nov 19 15:37:28 2006 -0800
+++ b/src/paranormal/cfg.c	Sun Nov 19 22:54:10 2006 -0800
@@ -355,7 +355,7 @@
       struct pn_actuator *a;
       GtkCTreeNode *root;
 
-      fname = gtk_file_selection_get_filename (selector);
+      fname = (char *) gtk_file_selection_get_filename (selector);
       a = load_preset (fname);
       if (! a)
 	pn_error ("Unable to load file: \"%s\"", fname);
@@ -401,7 +401,7 @@
       const char *fname;
       struct pn_actuator *a;
 
-      fname = gtk_file_selection_get_filename (selector);
+      fname = (char *) gtk_file_selection_get_filename (selector);
       a = extract_actuator ();
 
       if (! save_preset (fname, a))
--- a/src/xspf/urlencode.c	Sun Nov 19 15:37:28 2006 -0800
+++ b/src/xspf/urlencode.c	Sun Nov 19 22:54:10 2006 -0800
@@ -1,6 +1,7 @@
 /* the original code was taken from wget-1.10.2 */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <glib.h>
 #include <ctype.h>