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

Install the pluginapi stuff in a subdirectory.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5922 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
pabs3 2009-02-04 14:08:31 +00:00
parent f41ba95bab
commit eff14a4702
24 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Contrib/ExDLL/SConscript
View file

@ -33,26 +33,26 @@ lib = api_env.Library(lib_target, lib_files)
# distribute library, files and examples
example += api_files
env.DistributeExamples(api_files, path='Plugin/nsis')
if env['PLATFORM'] == 'win32':
example += lib
env.DistributeExamples(lib, path='Plugin/nsis')
else:
example += lib_files
if env.has_key('PREFIX_PLUGINAPI_INC'):
env.Distribute(api_files, None, 'pluginapi_inc', '', '', 'pluginapi', 'pluginapi')
env.Distribute(api_files, None, 'pluginapi_inc', '', 'nsis', 'pluginapi', 'pluginapi')
if env.has_key('PREFIX_PLUGINAPI_LIB'):
env.Distribute(lib, None, 'pluginapi_lib', '', '', 'pluginapi', 'pluginapi')
env.Distribute(lib, None, 'pluginapi_lib', '', 'nsis', 'pluginapi', 'pluginapi')
env.DistributeExamples(example, path='Plugin')
# make sure all the other plug-ins can use the library
env.Install('#$BUILD_PREFIX/api', api_files + lib)
env.Install('#$BUILD_PREFIX/api/nsis', api_files + lib)
plugin_env.Append(CPPPATH = ['#$BUILD_PREFIX/api'])
plugin_env.Append(LIBPATH = ['#$BUILD_PREFIX/api'])
plugin_env.Append(LIBPATH = ['#$BUILD_PREFIX/api/nsis'])
plugin_env.Append(LIBS = [lib_target])

2
Contrib/ExDLL/exdll.c
View file

@ -1,5 +1,5 @@
#include <windows.h>
#include <pluginapi.h> // nsis plugin
#include <nsis/pluginapi.h> // nsis plugin
HINSTANCE g_hInstance;

2
Contrib/ExDLL/exdll.h
View file

@ -5,7 +5,7 @@
#define _EXDLL_H_
#include <windows.h>
#include <pluginapi.h> // nsis plugin
#include <nsis/pluginapi.h> // nsis plugin
// this may not work if /NODEFAULTLIB is used
#ifdef _MSC_VER