immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix MacOSX install instruction and compilation 

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
dev-time-step
Victor Vieux 2015-09-28 15:39:23 -07:00 committed by krzys-h
parent 61a3ba2800
commit 49ee00d90d
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL-MacOSX.md
View File

@ -8,7 +8,7 @@ After installing Developer Command Line Tools, you should have basic tools like
``` ```
And then: And then:
```bash ```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: 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 ```bash

6
src/common/config.h.cmake
View File

@ -16,13 +16,7 @@
#cmakedefine OPENAL_SOUND #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 #define SDL_MAIN_FUNC main
#endif
#cmakedefine PORTABLE @PORTABLE@ #cmakedefine PORTABLE @PORTABLE@

2
src/ui/controls/edit.cpp
View File

@ -304,7 +304,7 @@ bool CEdit::EventProcess(const Event &event)
{ {
bShift = ( (event.kmodState & KEY_MOD(SHIFT) ) != 0 ); bShift = ( (event.kmodState & KEY_MOD(SHIFT) ) != 0 );
#if PLATFORM_MACOSX #if PLATFORM_MACOSX
bControl = ( (event.kmodState & KEY_MOD(META) ) != 0); bControl = ( (event.kmodState & KEY_MOD(GUI) ) != 0);
#else #else
bControl = ( (event.kmodState & KEY_MOD(CTRL) ) != 0); bControl = ( (event.kmodState & KEY_MOD(CTRL) ) != 0);
#endif #endif