dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix up plugin API header/lib installation for non-Windows platforms.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5904 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
pabs3 2009-01-11 09:48:07 +00:00
parent 521d9c2ced
commit bf6c65b158
3 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Contrib/ExDLL/SConscript
View file

@ -8,7 +8,6 @@ lib_files = Split("""
api_files = Split(""" api_files = Split("""
pluginapi.h pluginapi.h
pluginapi.lib
#Source/exehead/api.h #Source/exehead/api.h
""") """)
@ -32,11 +31,25 @@ lib = api_env.Library(lib_target, lib_files)
# distribute library, files and examples # distribute library, files and examples
env.DistributeExamples(example + api_files + lib, path='Plugin') example += api_files
if env['PLATFORM'] == 'win32':
example += lib
else:
example += lib_files
if env.has_key('PREFIX_PLUGINAPI_INC'):
env.Distribute(api_files, None, 'pluginapi_inc', '', '', 'pluginapi', 'pluginapi')
if env.has_key('PREFIX_PLUGINAPI_LIB'):
env.Distribute(lib, None, 'pluginapi_lib', '', '', 'pluginapi', 'pluginapi')
env.DistributeExamples(example, path='Plugin')
# make sure all the other plug-ins can use the library # make sure all the other plug-ins can use the library
env.Install('#$BUILD_PREFIX/api', api_files) env.Install('#$BUILD_PREFIX/api', api_files + lib)
plugin_env.Append(CPPPATH = ['#$BUILD_PREFIX/api']) plugin_env.Append(CPPPATH = ['#$BUILD_PREFIX/api'])
plugin_env.Append(LIBPATH = ['#$BUILD_PREFIX/api']) plugin_env.Append(LIBPATH = ['#$BUILD_PREFIX/api'])

2
SCons/Tools/crossmingw.py
View file

@ -172,8 +172,6 @@ def generate(env):
env['SHOBJSUFFIX'] = '$OBJSUFFIX' env['SHOBJSUFFIX'] = '$OBJSUFFIX'
env['PROGPREFIX'] = '' env['PROGPREFIX'] = ''
env['PROGSUFFIX'] = '.exe' env['PROGSUFFIX'] = '.exe'
env['LIBPREFIX'] = ''
env['LIBSUFFIX'] = '.lib'
env['SHLIBPREFIX'] = '' env['SHLIBPREFIX'] = ''
env['SHLIBSUFFIX'] = '.dll' env['SHLIBSUFFIX'] = '.dll'
env['LIBPREFIXES'] = [ '$LIBPREFIX' ] env['LIBPREFIXES'] = [ '$LIBPREFIX' ]

2
SConstruct
View file

@ -167,6 +167,8 @@ opts.Add(('PREFIX_CONF', 'Path to install nsisconf.nsh to', dirs['conf']))
opts.Add(('PREFIX_BIN', 'Path to install native binaries to', dirs['bin'])) opts.Add(('PREFIX_BIN', 'Path to install native binaries to', dirs['bin']))
opts.Add(('PREFIX_DATA', 'Path to install nsis data to (plugins, includes, stubs, contrib, win32 binaries)', dirs['data'])) opts.Add(('PREFIX_DATA', 'Path to install nsis data to (plugins, includes, stubs, contrib, win32 binaries)', dirs['data']))
opts.Add(('PREFIX_DOC','Path to install nsis README / INSTALL / TODO files to.', dirs['doc'])) opts.Add(('PREFIX_DOC','Path to install nsis README / INSTALL / TODO files to.', dirs['doc']))
opts.Add(('PREFIX_PLUGINAPI_INC','Path to install plugin API headers to.', None))
opts.Add(('PREFIX_PLUGINAPI_LIB','Path to install plugin static library to.', None))
opts.Update(defenv) opts.Update(defenv)
Help(opts.GenerateHelpText(defenv)) Help(opts.GenerateHelpText(defenv))