From 6cdc279244091c284529bf4992507532932b25bb Mon Sep 17 00:00:00 2001 From: f0rt Date: Sun, 21 Jun 2015 16:13:45 +0000 Subject: [PATCH] #260 pluginapi include files are referenced twice for platforms other than Windows. git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6585 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/ExDLL/SConscript | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Contrib/ExDLL/SConscript b/Contrib/ExDLL/SConscript index 419869d4..89fbbc73 100644 --- a/Contrib/ExDLL/SConscript +++ b/Contrib/ExDLL/SConscript @@ -46,15 +46,16 @@ lib = api_envT.Library(lib_targetT, lib_files) if PerformPluginExtrasDistOperationOnce(plugin_envT, unicodetarget): env.DistributeExamples(api_files, path='Plugin/nsis') env.DistributeExamples(example, path='Plugin') + if env['PLATFORM'] != 'win32': + if env.has_key('PREFIX_PLUGINAPI_INC'): + env.Distribute(api_files, None, 'pluginapi_inc', '', 'nsis', 'pluginapi', 'pluginapi') + if env['PLATFORM'] == 'win32': env.DistributeExamples(lib, path='Plugin/nsis') else: example += lib_files - if env.has_key('PREFIX_PLUGINAPI_INC'): - env.Distribute(api_files, None, 'pluginapi_inc', '', 'nsis', 'pluginapi', 'pluginapi') - if env.has_key('PREFIX_PLUGINAPI_LIB'): env.Distribute(lib, None, 'pluginapi_lib', '', 'nsis', 'pluginapi', 'pluginapi')