[AD] [A4.4.1.1SVN] 3 Patch Submissions

[Edgar <edgarreynaldo@xxxxxxxxxx>]

Over the last week or two, I've had a couple problems building Allegro 
4.4.1.1. Here are the 3 patches that fix the problems I was having.

1) CMakeLists.txt.diff, applies to allegro/CMakeLists.txt. Fixes a 
problem on Windows with MinGW where the allegro library build was not 
being linked with '-pg'.

2) FileList.cmake.diff, applies to allegro/cmake/FileList.cmake. Fixes a 
problem where not all platforms built and linked with 
allegro/src/misc/colconv.c.

3)loadpng.c.diff, applies to allegro/addons/loadpng/loadpng.c. Fixes the 
problem of loadpng.c not including zlib.h. (latest version of png.h no 
longer includes zlib.h).

Let me know if these patches are acceptable and whether or not they get 
committed.

Thanks, Edgar.


--- CMakeLists.txt.old	2011-03-11 23:27:50.374392000 -0600
+++ CMakeLists.txt	2011-03-11 23:21:45.493449000 -0600
@@ -769,6 +769,12 @@
     set(allegro_OUTPUT_NAME alleg)
 endif()
 
+if (CMAKE_BUILD_TYPE STREQUAL Profile)
+    if (COMPILER_GCC)
+        set(ALLEGRO_LINK_FLAGS "-pg")
+    endif()
+endif()
+
 set_target_properties(allegro
     PROPERTIES
     COMPILE_FLAGS "-DALLEGRO_SRC ${ALLEGRO_MODULES_PATH_FLAG}"

Index: FileList.cmake
===================================================================
--- FileList.cmake	(revision 14595)
+++ FileList.cmake	(working copy)
@@ -98,6 +98,7 @@
         src/c/czscan32.c
         src/c/czscan8.c
         src/misc/ccolconv.c
+        src/misc/colconv.c
         )
 
 set(ALLEGRO_SRC_DOS_FILES
@@ -185,7 +186,6 @@
         src/win/wthread.c
         src/win/wtimer.c
         src/win/wwnd.c
-        src/misc/colconv.c
         )
 
 set(ALLEGRO_SRC_BEOS_FILES
@@ -221,7 +221,6 @@
         src/beos/bwindow.cpp
         src/beos/bwscreen.cpp
         src/unix/ufile.c
-        src/misc/colconv.c
         src/misc/pckeys.c
         )
 
@@ -298,7 +297,6 @@
         src/x/xdga2.c
         src/x/xdga2s.s
         src/x/xwins.s
-        src/misc/colconv.c
         )
 
 set(ALLEGRO_SRC_MACOSX_FILES
@@ -321,7 +319,6 @@
         src/unix/uptimer.c
         src/unix/usystem.c
         src/unix/uthreads.c
-        src/misc/colconv.c
         )
 
 set(ALLEGRO_SRC_PSP_FILES
@@ -336,7 +333,6 @@
         src/psp/ptimer.c
         src/psp/pvram.c
         src/psp/pvtable8.c
-        src/misc/colconv.c
         )
 
 set(ALLEGRO_INCLUDE_ALLEGRO_FILES

Index: addons/loadpng/loadpng.c
===================================================================
--- addons/loadpng/loadpng.c	(revision 14595)
+++ addons/loadpng/loadpng.c	(working copy)
@@ -6,6 +6,7 @@
 
 
 #include <png.h>
+#include <zlib.h>
 #include <allegro.h>
 #include <allegro/internal/aintern.h>
 #include "loadpng.h"