[colobot] 22/377: fix MacOSX install instruction and compilation

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit 49ee00d90d01d63fc1baaf8596d589162e839034
Author: Victor Vieux <victorvieux at gmail.com>
Date:   Mon Sep 28 15:39:23 2015 -0700

    fix MacOSX install instruction and compilation
    
    Signed-off-by: Victor Vieux <victorvieux at gmail.com>
---
 INSTALL-MacOSX.md         | 2 +-
 src/common/config.h.cmake | 6 ------
 src/ui/controls/edit.cpp  | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/INSTALL-MacOSX.md b/INSTALL-MacOSX.md
index de3b78b..5d2b45c 100644
--- a/INSTALL-MacOSX.md
+++ b/INSTALL-MacOSX.md
@@ -8,7 +8,7 @@ After installing Developer Command Line Tools, you should have basic tools like
 ```
 And then:
 ```bash
-  brew install cmake sdl sdl_image sdl_ttf boost glew physfs flac libsndfile libvorbis vorbis-tools gettext libicns librsvg wget
+  brew install cmake sdl2 sdl2_image sdl2_ttf boost glew physfs flac libsndfile libvorbis vorbis-tools gettext libicns librsvg wget
 ```
 Gettext is installed in separate directory without adding the files to system path, so in order to get it working normally, you should call also:
 ```bash
diff --git a/src/common/config.h.cmake b/src/common/config.h.cmake
index 2d3dbe1..a4bc9f2 100644
--- a/src/common/config.h.cmake
+++ b/src/common/config.h.cmake
@@ -16,13 +16,7 @@
 
 #cmakedefine OPENAL_SOUND
 
-#cmakedefine USE_SDL_MAIN @USE_SDL_MAIN@
-
-#ifdef USE_SDL_MAIN
-#define SDL_MAIN_FUNC SDL_main
-#else
 #define SDL_MAIN_FUNC main
-#endif
 
 #cmakedefine PORTABLE @PORTABLE@
 
diff --git a/src/ui/controls/edit.cpp b/src/ui/controls/edit.cpp
index c2c6778..200a56b 100644
--- a/src/ui/controls/edit.cpp
+++ b/src/ui/controls/edit.cpp
@@ -304,7 +304,7 @@ bool CEdit::EventProcess(const Event &event)
     {
         bShift   = ( (event.kmodState & KEY_MOD(SHIFT) ) != 0 );
         #if PLATFORM_MACOSX
-        bControl = ( (event.kmodState & KEY_MOD(META) ) != 0);
+        bControl = ( (event.kmodState & KEY_MOD(GUI) ) != 0);
         #else
         bControl = ( (event.kmodState & KEY_MOD(CTRL) ) != 0);
         #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git