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',