# HG changeset patch # User koda # Date 1362784858 -3600 # Node ID 9624836094ded4e552c8ac038b78ab97d1dbe518 # Parent 63936a70c177aeda735d7823b1de9af3eb053d05 fix linking on osx diff -r 63936a70c177 -r 9624836094de hedgewars/CMakeLists.txt --- 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() diff -r 63936a70c177 -r 9624836094de hedgewars/PNGh.pas --- 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} diff -r 63936a70c177 -r 9624836094de hedgewars/uVideoRec.pas --- 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