Merge
authorunc0rr
Thu, 21 Feb 2013 22:31:03 +0400
changeset 8539 49e657b77499
parent 8534 92da587691c9 (current diff)
parent 8537 11d5903fe6f9 (diff)
child 8541 0cd63b963330
Merge
--- 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)
--- 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);