# HG changeset patch # User unc0rr # Date 1361471463 -14400 # Node ID 49e657b77499f75974a6f856e9999a759b7ac192 # Parent 92da587691c98216dbc6d51ea3ddb0dc0775f8e4# Parent 11d5903fe6f91a9d6081b0233c9917e4e0860a0e Merge diff -r 92da587691c9 -r 49e657b77499 hedgewars/CMakeLists.txt --- a/hedgewars/CMakeLists.txt Thu Feb 21 22:20:43 2013 +0400 +++ b/hedgewars/CMakeLists.txt Thu Feb 21 22:31:03 2013 +0400 @@ -146,6 +146,10 @@ list(APPEND pascal_flags "-k${SDLMAIN_LIB}") endif() + + #when you have multiple ld installation make sure you get the one bundled with the compiler + get_filename_component(compiler_dir ${CMAKE_C_COMPILER} PATH) + list(APPEND pascal_flags "-FD${compiler_dir}") endif(APPLE) if(NOT NOPNG) diff -r 92da587691c9 -r 49e657b77499 hedgewars/uChat.pas --- a/hedgewars/uChat.pas Thu Feb 21 22:20:43 2013 +0400 +++ b/hedgewars/uChat.pas Thu Feb 21 22:31:03 2013 +0400 @@ -394,9 +394,7 @@ SetLine(InputStr, '', true) else begin - // err, does anyone have any documentation on this sequence? - // ^^ isn't it obvious? 27 is esc, 32 is space, inbetween is "/team" - KeyPressChat(27); + // "/team " KeyPressChat(47); KeyPressChat(116); KeyPressChat(101);