diff --git a/INSTALL-MacOSX.md b/INSTALL-MacOSX.md index de3b78b0..5d2b45c7 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 2d3dbe1e..a4bc9f22 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 c2c67782..200a56b3 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