--- a/hedgewars/CMakeLists.txt	Fri Mar 08 11:26:47 2013 -0500
+++ b/hedgewars/CMakeLists.txt	Sat Mar 09 00:20:58 2013 +0100
@@ -167,7 +167,8 @@
 
 find_package_or_disable_msg(PNG NOPNG "Screenshots will be saved in BMP")
 if(PNG_FOUND)
-    list(APPEND pascal_flags "-dPNG_SCREENSHOTS")
+    list(REMOVE_AT PNG_INCLUDE_DIR 1) #removing the zlib include path
+    list(APPEND pascal_flags "-dPNG_SCREENSHOTS -Fl${PNG_INCLUDE_DIR}")
 endif()
 
 

--- a/hedgewars/PNGh.pas	Fri Mar 08 11:26:47 2013 -0500
+++ b/hedgewars/PNGh.pas	Sat Mar 09 00:20:58 2013 +0100
@@ -23,11 +23,6 @@
 
 uses png;
 
-{$IFDEF FPC}
-    {$PACKRECORDS C}
-{$ELSE}
-    {$DEFINE cdecl attribute(cdecl)}
-{$ENDIF}
 
 {$IFDEF DARWIN}
     {$linklib png}

--- a/hedgewars/uVideoRec.pas	Fri Mar 08 11:26:47 2013 -0500
+++ b/hedgewars/uVideoRec.pas	Sat Mar 09 00:20:58 2013 +0100
@@ -31,6 +31,7 @@
     {$linklib avcodec}
     {$linklib avformat}
     {$linklib avutil}
+    {$linklib avwrapper}
 {$ENDIF}
 
 interface