Revision: 41318
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41318
Author: jensverwiebe
Date: 2011-10-27 15:46:26 +0000 (Thu, 27 Oct 2011)
Log Message:
-----------
Fix player prototype, fix compile for OSX/XCode4.2, use always tablet enabled
(test)
Modified Paths:
--------------
trunk/blender/intern/ghost/SConscript
trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
trunk/blender/source/blender/quicktime/SConscript
trunk/blender/source/gameengine/GamePlayer/common/GPC_Engine.cpp
Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript 2011-10-27 14:41:26 UTC (rev
41317)
+++ trunk/blender/intern/ghost/SConscript 2011-10-27 15:46:26 UTC (rev
41318)
@@ -108,7 +108,7 @@
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:
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2011-10-27
14:41:26 UTC (rev 41317)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2011-10-27
15:46:26 UTC (rev 41318)
@@ -578,7 +578,7 @@
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;
Modified: trunk/blender/source/blender/quicktime/SConscript
===================================================================
--- trunk/blender/source/blender/quicktime/SConscript 2011-10-27 14:41:26 UTC
(rev 41317)
+++ trunk/blender/source/blender/quicktime/SConscript 2011-10-27 15:46:26 UTC
(rev 41318)
@@ -35,6 +35,6 @@
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)
Modified: trunk/blender/source/gameengine/GamePlayer/common/GPC_Engine.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/common/GPC_Engine.cpp
2011-10-27 14:41:26 UTC (rev 41317)
+++ trunk/blender/source/gameengine/GamePlayer/common/GPC_Engine.cpp
2011-10-27 15:46:26 UTC (rev 41318)
@@ -131,7 +131,7 @@
}
-bool GPC_Engine::Start(char *filename)
+bool GPC_Engine::Start(const char *filename)
{
ReportList reports;
BlendFileData *bfd;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
