[Bf-blender-cvs] [74108e2] master: Fix player compile in scons and disable -Wmissing-prototypes for Apple atm.
Jens Verwiebe
noreply at git.blender.org
Mon Jan 27 19:36:21 CET 2014
Commit: 74108e2d6c3ee93e49f89892f3a5d72c039a6168
Author: Jens Verwiebe
Date: Mon Jan 27 19:36:05 2014 +0100
https://developer.blender.org/rB74108e2d6c3ee93e49f89892f3a5d72c039a6168
Fix player compile in scons and disable -Wmissing-prototypes for Apple atm.
===================================================================
M source/blenderplayer/bad_level_call_stubs/SConscript
M source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
diff --git a/source/blenderplayer/bad_level_call_stubs/SConscript b/source/blenderplayer/bad_level_call_stubs/SConscript
index 59a4b18..a331b6d 100644
--- a/source/blenderplayer/bad_level_call_stubs/SConscript
+++ b/source/blenderplayer/bad_level_call_stubs/SConscript
@@ -30,6 +30,7 @@ Import ('env')
sources = ['stubs.c']
incs = [
+ '..',
'#/intern/guardedalloc',
'#/source/blender/makesdna',
'#/source/blender/makesrna',
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 5e822f7..556377b 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -140,7 +140,7 @@ struct wmWindowManager;
/* may cause troubles... enable for now so args match for certain */
#if 1
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(__APPLE__)
# pragma GCC diagnostic error "-Wmissing-prototypes"
#endif
More information about the Bf-blender-cvs
mailing list