diff options
| author | Hubert Figuiere <hub@figuiere.net> | 2009-05-13 21:14:47 -0400 |
|---|---|---|
| committer | Hubert Figuiere <hub@figuiere.net> | 2009-05-13 21:14:47 -0400 |
| commit | 0c34328019436e1f82f0948c7187943eafd17b40 (patch) | |
| tree | 6cae12c0f6a48048128754e05569056bd563d8fb /demo | |
| parent | 3226f3aaba73b44bae238f8b35d571a57374a445 (diff) | |
Fix build on Fedora 11
* include/libopenraw/consts.h:
* demo/cfa.cpp:
* demo/thumb.cpp:
Missing includes for gcc 4.4
* demo/Makefile.am:
Some autoconf magic fixing.
Diffstat (limited to 'demo')
| -rw-r--r-- | demo/Makefile.am | 6 | ||||
| -rw-r--r-- | demo/cfa.cpp | 3 | ||||
| -rw-r--r-- | demo/thumb.cpp | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/demo/Makefile.am b/demo/Makefile.am index 1f75540..bccf643 100644 --- a/demo/Makefile.am +++ b/demo/Makefile.am @@ -6,7 +6,9 @@ endif noinst_PROGRAMS = extensions thumb thumbc cfa ccfa $(GNOME_BINARIES) -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/gnome/include +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/gnome/include \ + @LIBGDKPIXBUF_CFLAGS@ + LIBOPENRAW_LIBS = ../lib/libopenraw.la -lstdc++ -ljpeg LIBOPENRAWGNOME_LIBS = ../gnome/libopenrawgnome.la -lstdc++ -ljpeg \ @LIBGDKPIXBUF_LIBS@ @@ -32,11 +34,9 @@ ccfa_LDADD = $(LIBOPENRAW_LIBS) ccfa_LDFLAGS = -L$(top_builddir)/lib -static gdk_SOURCES = gdk.c -gdk_CPPFLAGS = @LIBGDKPIXBUF_CFLAGS@ gdk_LDADD = $(LIBOPENRAWGNOME_LIBS) gdk_LDFLAGS = -L$(top_builddir)/gnome -static pixbufload_SOURCES = pixbufload.c -pixbufload_CPPFLAGS = @LIBGDKPIXBUF_CFLAGS@ pixbufload_LDADD = $(LIBOPENRAWGNOME_LIBS) pixbufload_LDFLAGS = -L$(top_builddir)/gnome -static diff --git a/demo/cfa.cpp b/demo/cfa.cpp index 83d9f0f..f78d2cb 100644 --- a/demo/cfa.cpp +++ b/demo/cfa.cpp @@ -18,8 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ - +#include <stdio.h> #include <stdlib.h> + #include <iostream> #include <libopenraw/libopenraw.h> #include <libopenraw/debug.h> diff --git a/demo/thumb.cpp b/demo/thumb.cpp index 8b22724..efe047a 100644 --- a/demo/thumb.cpp +++ b/demo/thumb.cpp @@ -19,6 +19,7 @@ */ +#include <stdio.h> #include <iostream> #include <libopenraw/libopenraw.h> |