diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2011-10-27 19:46:26 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2011-10-27 19:46:26 +0400 |
| commit | 7a20ced627115768ad94ab522fadd320f7a760c3 (patch) | |
| tree | 045b3b23a26be3ca77a072ccf5c24034ba4432ef /intern/ghost | |
| parent | 699030ceb698f827fe582bf03a78a44ffc283629 (diff) | |
Fix player prototype, fix compile for OSX/XCode4.2, use always tablet enabled (test)
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/SConscript | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 39757c873d8..e6a29522e6d 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -108,7 +108,7 @@ if window_system in ('win32-vc', 'win64-vc'): env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15]) #, cc_compileflags=env['CCFLAGS'].append('/WX') ) elif env['WITH_GHOST_COCOA']: # always use Apple-gcc-4.2 for objC language, for gnu-compilers do not support it fully yet - env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compilerchange='/usr/bin/gcc-4.2', cxx_compilerchange='/usr/bin/g++-4.2' ) + env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++' ) print "GHOST COCOA WILL BE COMPILED WITH APPLE GCC" else: diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index d9eab56cfdc..7a6c0a02043 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -578,7 +578,7 @@ GHOST_SystemCocoa::GHOST_SystemCocoa() if (strstr(rstring,"MacBookAir") || (strstr(rstring,"MacBook") && (rstring[strlen(rstring)-3]>='5') && (rstring[strlen(rstring)-3]<='9'))) m_hasMultiTouchTrackpad = true; - else m_hasMultiTouchTrackpad = false; + else m_hasMultiTouchTrackpad = true; free( rstring ); rstring = NULL; |