Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Verwiebe <info@jensverwiebe.de>2014-01-27 22:36:05 +0400
committerJens Verwiebe <info@jensverwiebe.de>2014-01-27 22:36:05 +0400
commit74108e2d6c3ee93e49f89892f3a5d72c039a6168 (patch)
treeb4fd90f16eb34da6f772738c1d2af33ec6059ef0 /source/blenderplayer/bad_level_call_stubs
parent7280321f7a25bf7ec4b2ad9da676ac8b712a4c8a (diff)
Fix player compile in scons and disable -Wmissing-prototypes for Apple atm.
Diffstat (limited to 'source/blenderplayer/bad_level_call_stubs')
-rw-r--r--source/blenderplayer/bad_level_call_stubs/SConscript1
-rw-r--r--source/blenderplayer/bad_level_call_stubs/stubs.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/SConscript b/source/blenderplayer/bad_level_call_stubs/SConscript
index 59a4b18cb0e..a331b6d1e6e 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 5e822f7d8a3..556377b49e0 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