From 8995a3c19624c56a0c5cb0f2a23d0a00106106bb Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Wed, 13 Apr 2011 01:51:23 +0200 Subject: [PATCH 1/2] Added missing #include. Fixes compile error when compiling with GCC 4.5.1. --- src/debug.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/debug.h b/src/debug.h index 5ba9387..12e101b 100644 --- a/src/debug.h +++ b/src/debug.h @@ -2,6 +2,8 @@ #ifndef DEBUG_H #define DEBUG_H +#include + #define NODEBUG_L 0 #define ERROR_L 1 #define WARNING_L 2 From 23042f3122f102e9d75ee7e829b5bd3d2fb7724a Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Wed, 13 Apr 2011 03:36:47 +0200 Subject: [PATCH 2/2] Cleaned up link flags. Use the flags found by "configure" and nothing more. The hardcoded "-lpng12" broke linking with libpng 1.4. --- src/Makefile.am | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index f2dbbfc..ce31093 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,8 +31,4 @@ AM_CXXFLAGS = @CXXFLAGS@ @SDL_CFLAGS@ -DTARGET_GP2X \ -fno-exceptions \ -Wall -Wextra -Wundef -Wunused-macros -gmenu2x_LDADD = @LIBS@ @SDL_LIBS@ -lSDL_image -lSDL_gfx -lSDL -ljpeg -lpng12 -lz -ldl -lpthread - -gmenu2x_LDFLAGS = -lSDL_image -lSDL_gfx -lSDL -ljpeg -lpng12 -lz -ldl -lpthread - -gmenu2x_LIBS = @LIBS@ @SDL_LIBS@ -lSDL_image -lSDL_gfx -lSDL -ljpeg -lpng12 -lz -ldl -lpthread +gmenu2x_LDADD = @LIBS@ @SDL_LIBS@