Fix player prototype, fix compile for OSX/XCode4.2, use always tablet enabled (test)
authorJens Verwiebe <info@jensverwiebe.de>
Thu, 27 Oct 2011 15:46:26 +0000 (15:46 +0000)
committerJens Verwiebe <info@jensverwiebe.de>
Thu, 27 Oct 2011 15:46:26 +0000 (15:46 +0000)
intern/ghost/SConscript
intern/ghost/intern/GHOST_SystemCocoa.mm
source/blender/quicktime/SConscript
source/gameengine/GamePlayer/common/GPC_Engine.cpp

index 39757c8..e6a2952 100644 (file)
@@ -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:
index d9eab56..7a6c0a0 100644 (file)
@@ -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;
index a128ded..37f6474 100644 (file)
@@ -35,6 +35,6 @@ defs=['WITH_QUICKTIME']
 
 if env['WITH_GHOST_COCOA']:
     defs.append('GHOST_COCOA')
-    env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities, cc_compilerchange='/usr/bin/gcc-4.2', cxx_compilerchange='/usr/bin/g++-4.2') # always use Apple-gcc-4.2 for objC language, for gnu-compilers do not support it fully yet
+    env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities, cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++') # always use Apple-gcc-4.2 for objC language, for gnu-compilers do not support it fully yet
 else:
     env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities)
index d846e9a..6548310 100644 (file)
@@ -131,7 +131,7 @@ GPC_Engine::~GPC_Engine()
 }
 
 
-bool GPC_Engine::Start(char *filename)
+bool GPC_Engine::Start(const char *filename)
 {
        ReportList reports;
        BlendFileData *bfd;