From 334dad1e157345457fe6bc124df9c39ccfbb8af9 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Mon, 5 Aug 2002 14:31:50 +0000
Subject: [PATCH] Compiles without Platform SDK

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@649 212acab6-be3b-0410-9dea-997c60f758d6
---
 Examples/makensis.nsi   | 11 ++++++++++-
 Source/DialogTemplate.h |  4 ++++
 Source/ResourceEditor.h |  4 ++++
 Source/makenssi.cpp     |  2 +-
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi
index 94ed7a86..a0a2c102 100644
--- a/Examples/makensis.nsi
+++ b/Examples/makensis.nsi
@@ -1,5 +1,5 @@
 !define VER_MAJOR 2
-!define VER_MINOR 0a3
+!define VER_MINOR 0a4
 
 !ifdef NO_COMPRESSION
 SetCompress off
@@ -170,6 +170,15 @@ Section "Splash"
   NoShortCuts:
 SectionEnd
 
+Section "Splash w/transparency"
+  SectionIn 1 2
+  SetOutPath $INSTDIR\Contrib\MagicLime
+  SetOverwrite try
+  File ..\Contrib\MagicLime\splash.c
+  SetOutPath $INSTDIR\Bin
+  File ..\Bin\magiclime.exe
+SectionEnd
+
 Section "Zip2Exe"
   SectionIn 1 2
   DetailPrint "Extracting zip2exe source"
diff --git a/Source/DialogTemplate.h b/Source/DialogTemplate.h
index 81bc5f02..ea6ada81 100644
--- a/Source/DialogTemplate.h
+++ b/Source/DialogTemplate.h
@@ -33,6 +33,10 @@
 #include <StdExcept>
 using namespace std;
 
+#ifndef IS_INTRESOURCE
+#define IS_INTRESOURCE(_r) (((ULONG_PTR)(_r) >> 16) == 0)
+#endif
+
 struct DialogItemTemplate {
 	DWORD	dwHelpId; // Extended only
 
diff --git a/Source/ResourceEditor.h b/Source/ResourceEditor.h
index 3233180e..a730c900 100644
--- a/Source/ResourceEditor.h
+++ b/Source/ResourceEditor.h
@@ -40,6 +40,10 @@
 #include <StdExcept>
 using namespace std;
 
+#ifndef IS_INTRESOURCE
+#define IS_INTRESOURCE(_r) (((ULONG_PTR)(_r) >> 16) == 0)
+#endif
+
 class CResourceDirectory;
 class CResourceDirectoryEntry;
 class CResourceDataEntry;
diff --git a/Source/makenssi.cpp b/Source/makenssi.cpp
index 71c3e10e..010f81ee 100644
--- a/Source/makenssi.cpp
+++ b/Source/makenssi.cpp
@@ -1,4 +1,4 @@
-const char *NSIS_VERSION="v2.0a3";
+const char *NSIS_VERSION="v2.0a4";
 
 /* 
   Nullsoft "SuperPimp" Installation System - makensis.cpp - installer compiler code