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

2
Contrib/AdvSplash/advsplash.c
View file

@ -3,7 +3,7 @@
#include <windows.h>
#include <windowsx.h>
#include <pluginapi.h> // nsis plugin
#include <nsis/pluginapi.h> // nsis plugin
HINSTANCE g_hInstance;

2
Contrib/Banner/Banner.c
View file

@ -1,5 +1,5 @@
#include <windows.h>
#include <pluginapi.h> // nsis plugin
#include <nsis/pluginapi.h> // nsis plugin
#include "../../Source/exehead/resource.h"
// Turn a pair of chars into a word

2
Contrib/BgImage/BgImage.cpp
View file

@ -1,6 +1,6 @@
#include <windows.h>
#include <mmsystem.h>
#include <pluginapi.h> // nsis plugin
#include <nsis/pluginapi.h> // nsis plugin
#undef EXDLL_INIT

2
Contrib/Dialer/dialer.c
View file

@ -2,7 +2,7 @@
#include <windows.h>
#include <wininet.h>
#include <pluginapi.h> // nsis plugin
#include <nsis/pluginapi.h> // nsis plugin
#define NSISFunction(funcname) void __declspec(dllexport) funcname(HWND hwndParent, int string_size, char *variables, stack_t **stacktop, extra_parameters *extra)

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

2
Contrib/InstallOptions/InstallerOptions.cpp
View file

@ -14,7 +14,7 @@
#include "resource.h"
#include "shellapi.h"
#include <pluginapi.h> // nsis plugin
#include <nsis/pluginapi.h> // nsis plugin
// Use for functions only called from one place to possibly reduce some code
// size. Allows the source code to remain readable by leaving the function

2
Contrib/LangDLL/LangDLL.c
View file

@ -10,7 +10,7 @@
// LangDLL:LangDialog "Language Selection" "Choose a language" 2F French 1036 English 1033 12 Garamond
#include <pluginapi.h> // nsis plugin
#include <nsis/pluginapi.h> // nsis plugin
HINSTANCE g_hInstance;
HWND g_hwndParent;

2
Contrib/Library/TypeLib/TypeLib.cpp
View file

@ -6,7 +6,7 @@
*/
#include <windows.h>
#include <pluginapi.h> // nsis plugin
#include <nsis/pluginapi.h> // nsis plugin
#define NSISFunction(funcname) extern "C" void __declspec(dllexport) funcname(HWND hwndParent, int string_size, char *variables, stack_t **stacktop)

2
Contrib/Math/Source/Math.c
View file

@ -1,5 +1,5 @@
#include <windows.h>
#include <pluginapi.h> // nsis plugin
#include <nsis/pluginapi.h> // nsis plugin
#include "MyMath.h"
#include "Math.h"

2
Contrib/Math/Source/Math.h
View file

@ -1,6 +1,6 @@
#pragma once
#include <pluginapi.h> // nsis plugin
#include <nsis/pluginapi.h> // nsis plugin
#ifdef _DEBUG
//#define _DEBUG_LEAKS

2
Contrib/NSISdl/nsisdl.cpp
View file

@ -26,7 +26,7 @@
#include "util.h"
#include "httpget.h"
#include <pluginapi.h> // nsis plugin
#include <nsis/pluginapi.h> // nsis plugin
void *operator new( unsigned int num_bytes )
{

2
Contrib/Splash/splash.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/StartMenu/StartMenu.c
View file

@ -1,6 +1,6 @@
#include <windows.h>
#include <shlobj.h>
#include <pluginapi.h> // nsis plugin
#include <nsis/pluginapi.h> // nsis plugin
#include "resource.h"
HINSTANCE g_hInstance;

2
Contrib/System/Source/Plugin.h
View file

@ -1,7 +1,7 @@
#ifndef ___PLUGIN__H___
#define ___PLUGIN__H___
#include <pluginapi.h> // nsis plugin
#include <nsis/pluginapi.h> // nsis plugin
#define PLUGINFUNCTION(name) \
void __declspec(dllexport) name( \

2
Contrib/UserInfo/UserInfo.c
View file

@ -1,5 +1,5 @@
#include <windows.h>
#include <pluginapi.h> // nsis plugin
#include <nsis/pluginapi.h> // nsis plugin
typedef BOOL (WINAPI*CHECKTOKENMEMBERSHIP)(HANDLE TokenHandle,PSID SidToCheck,PBOOL IsMember);
CHECKTOKENMEMBERSHIP _CheckTokenMembership=NULL;

2
Contrib/VPatch/Source/Plugin/vpatchdll.c
View file

@ -25,7 +25,7 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <pluginapi.h> // nsis plugin
#include <nsis/pluginapi.h> // nsis plugin
#include "apply_patch.h"
#include "checksum.h"

2
Contrib/nsDialogs/browse.c
View file

@ -1,7 +1,7 @@
#include <windows.h>
#include <shlobj.h>
#include <pluginapi.h> // nsis plugin
#include <nsis/pluginapi.h> // nsis plugin
#include "defs.h"

2
Contrib/nsDialogs/input.c
View file

@ -1,6 +1,6 @@
#include <windows.h>
#include <pluginapi.h> // nsis plugin
#include <nsis/pluginapi.h> // nsis plugin
#include "input.h"
#include "defs.h"

2
Contrib/nsDialogs/nsDialogs.c
View file

@ -1,6 +1,6 @@
#include <windows.h>
#include <pluginapi.h> // nsis plugin
#include <nsis/pluginapi.h> // nsis plugin
#include "defs.h"
#include "input.h"

2
Contrib/nsDialogs/rtl.c
View file

@ -1,7 +1,7 @@
#include <windows.h>
#include <commctrl.h>
#include <pluginapi.h> // nsis plugin
#include <nsis/pluginapi.h> // nsis plugin
#include "defs.h"

2
Contrib/nsExec/nsexec.c
View file

@ -21,7 +21,7 @@ freely, subject to the following restrictions:
#include <windows.h>
#include <commctrl.h>
#include <winnt.h>
#include <pluginapi.h> // nsis plugin
#include <nsis/pluginapi.h> // nsis plugin
#ifndef true
#define true TRUE