From b9e8ba7ba9f0afe3403de7ce526ecc753484ec97 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Tue, 19 Apr 2005 20:00:43 +0000
Subject: [PATCH] Math compiles

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3976 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Math/SConscript | 11 +++++------
 SConstruct              |  3 +--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Contrib/Math/SConscript b/Contrib/Math/SConscript
index a5821663..04131977 100644
--- a/Contrib/Math/SConscript
+++ b/Contrib/Math/SConscript
@@ -1,10 +1,10 @@
 target = 'Math'
 
 files = Split("""
-	Source/Math.cpp
-	Source/MyMath.cpp
-	Source/plugin.cpp
-	Source/floatp10.c
+	Source/Math.c
+	Source/MyMath.c
+	Source/plugin.c
+	Source/mathcrt.lib
 """)
 
 libs = Split("""
@@ -14,9 +14,8 @@ libs = Split("""
 Import('PluginEnv')
 
 env = PluginEnv(target, entry = 'DllMain', nodeflib = 0)
-#env = PluginEnv(target, entry = '_DllMainCRTStartup', vc7 = 1)
 
-#libs = libs + [File('Source/mathcrt.lib')]
+env.Append(CPPFLAGS = env['CPP_FLAG'])
 
 plugin = env.SharedLibrary(target, files, LIBS = libs)
 
diff --git a/SConstruct b/SConstruct
index d821b4cd..421cd961 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,7 +1,6 @@
 ## TODO
 #
 #   * VPatch GenPat (wait for v3 written in C)
-#   * Get Math to Compile
 #   * Write SConscript for NSIS Menu
 #    - Use inheritance instead of current wxWidgets patches
 #    - Compile for POSIX too? wxWidgets is cross platform after all...
@@ -23,7 +22,7 @@ plugins = [
 	'InstallOptions',
 	'LangDLL',
 	'Library/TypeLib',
-	# compile errors 'Math',
+	'Math',
 	'nsExec',
 	'NSISdl',
 	'Splash',