From 74108e2d6c3ee93e49f89892f3a5d72c039a6168 Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Mon, 27 Jan 2014 19:36:05 +0100 Subject: [PATCH] Fix player compile in scons and disable -Wmissing-prototypes for Apple atm. --- source/blenderplayer/bad_level_call_stubs/SConscript | 1 + source/blenderplayer/bad_level_call_stubs/stubs.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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