From d28a1e06f51b081cfd3de82e7ecdb1b335c8060d Mon Sep 17 00:00:00 2001 From: bztdlinux Date: Sun, 15 Nov 2009 21:25:44 +0000 Subject: [PATCH] Configure lua for target platform, fixes linker warning about tmpnam git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4581 8ced0084-cf51-0410-be5f-012b33b47a6e --- Externals/Lua/luaconf.h | 2 +- SConstruct | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Externals/Lua/luaconf.h b/Externals/Lua/luaconf.h index e2cb26163a..2c46a4b340 100644 --- a/Externals/Lua/luaconf.h +++ b/Externals/Lua/luaconf.h @@ -10,7 +10,7 @@ #include #include - +#include "../../Source/Core/Common/Src/Config.h" /* ** ================================================================== diff --git a/SConstruct b/SConstruct index 8eccc6726a..fdcdcbe396 100644 --- a/SConstruct +++ b/SConstruct @@ -335,6 +335,18 @@ conf.Define('HAVE_COCOA', env['HAVE_COCOA']) conf.Define('HAVE_PORTAUDIO', env['HAVE_PORTAUDIO']) conf.Define('HAVE_SFML', env['HAVE_SFML']) +# lua +env['LUA_USE_MACOSX'] = 0 +env['LUA_USE_LINUX'] = 0 +env['LUA_USE_POSIX'] = 0 +if sys.platform == 'darwin': + env['LUA_USE_MACOSX'] = 1 +elif sys.platform == 'linux2': + env['LUA_USE_LINUX'] = 1 + +conf.Define('LUA_USE_MACOSX', env['LUA_USE_MACOSX']) +conf.Define('LUA_USE_LINUX', env['LUA_USE_LINUX']) + # profile env['USE_OPROFILE'] = 0 if (flavour == 'prof'):