From 08c28ddbc919ef952c4536980d8b11a2cb4fae7f Mon Sep 17 00:00:00 2001 From: pabs3 Date: Tue, 28 Oct 2008 10:42:06 +0000 Subject: [PATCH] Build System Resource.dll from source code instead of shipping the binary. git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5756 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/System/Resource.dll | Bin 4608 -> 0 bytes Contrib/System/Resource/Icon.ico | Bin 0 -> 3310 bytes Contrib/System/Resource/Resource.h | 1 + Contrib/System/Resource/Resource.rc | 3 +++ Contrib/System/SConscript | 17 +++++++++++++++++ 5 files changed, 21 insertions(+) delete mode 100644 Contrib/System/Resource.dll create mode 100644 Contrib/System/Resource/Icon.ico create mode 100755 Contrib/System/Resource/Resource.h create mode 100755 Contrib/System/Resource/Resource.rc diff --git a/Contrib/System/Resource.dll b/Contrib/System/Resource.dll deleted file mode 100644 index 4ef1f83478c44b502a38624eae3e6eac01e5bd62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4608 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 literal 0 HcmV?d00001 diff --git a/Contrib/System/Resource/Resource.h b/Contrib/System/Resource/Resource.h new file mode 100755 index 00000000..6ba42504 --- /dev/null +++ b/Contrib/System/Resource/Resource.h @@ -0,0 +1 @@ +#define IDI_ICON 103 diff --git a/Contrib/System/Resource/Resource.rc b/Contrib/System/Resource/Resource.rc new file mode 100755 index 00000000..dfa4eba8 --- /dev/null +++ b/Contrib/System/Resource/Resource.rc @@ -0,0 +1,3 @@ +#include "Resource.h" + +IDI_ICON ICON "Icon.ico" diff --git a/Contrib/System/SConscript b/Contrib/System/SConscript index 58731def..9012d830 100644 --- a/Contrib/System/SConscript +++ b/Contrib/System/SConscript @@ -36,3 +36,20 @@ BuildPlugin( nodeflib = False, defines = ['SYSTEM_EXPORTS'] ) + +Import('env') + +res = 'Resource/Resource.rc' + +res_obj = 'Resource/Resource-rc.o' + +res_target = env.RES(res_obj, res) + +resources = Split(""" + Resource/Icon.ico + Resource/Resource.h +""") + +env.Depends(res_target, resources) + +env.SharedLibrary('Resource', res_target)