mysterx doesn't need the delayload tricks, because it's a MzScheme extension

svn: r5621
This commit is contained in:
Matthew Flatt 2007-02-16 02:26:54 +00:00
parent da4191880c
commit 4c7a4b3cd6
2 changed files with 8 additions and 22 deletions

View File

@ -5666,25 +5666,11 @@ void browserHwndMsgLoop (LPVOID p)
free(destroy);
}
#ifdef MZ_PRECISE_GC
# define DLL_RELATIVE_PATH L"../../../../../../../../lib"
#else
# define DLL_RELATIVE_PATH L"../../../../../../../lib"
#endif
#include "../mzscheme/delayed.inc"
BOOL APIENTRY DllMain (HANDLE hModule, DWORD reason, LPVOID lpReserved)
{
if (reason == DLL_PROCESS_ATTACH) {
#ifdef MZ_PRECISE_GC
load_delayed_dll((HINSTANCE)hModule, "libmzsch3mxxxxxxx.dll");
#else
load_delayed_dll((HINSTANCE)hModule, "libmzgcxxxxxxx.dll");
load_delayed_dll((HINSTANCE)hModule, "libmzschxxxxxxx.dll");
#endif
hInstance = (HINSTANCE)hModule;
browserHwndMutex = CreateSemaphore (NULL, 1, 1, NULL);

View File

@ -70,8 +70,8 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386 /DELAYLOAD:libmzschxxxxxxx.dll /DELAYLOAD:libmzgcxxxxxxx.dll"
AdditionalDependencies="htmlhelp.lib libmzgcxxxxxxx.lib libmzschxxxxxxx.lib mzdyn.obj delayimp.lib"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="htmlhelp.lib libmzgcxxxxxxx.lib libmzschxxxxxxx.lib mzdyn.obj"
OutputFile="..\..\..\collects\mysterx\private\compiled\native\win32\i386\mxmain.dll"
LinkIncremental="0"
SuppressStartupBanner="true"
@ -165,8 +165,8 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386 /DELAYLOAD:libmzschxxxxxxx.dll /DELAYLOAD:libmzgcxxxxxxx.dll"
AdditionalDependencies="htmlhelp.lib libmzgcxxxxxxx.lib libmzschxxxxxxx.lib mscoree.lib mzdyn.obj delayimp.lib"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="htmlhelp.lib libmzgcxxxxxxx.lib libmzschxxxxxxx.lib mscoree.lib mzdyn.obj"
OutputFile="..\..\..\collects\mysterx\private\compiled\native\win32\i386\mxmain.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -259,8 +259,8 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386 /DELAYLOAD:libmzschxxxxxxx.dll /DELAYLOAD:libmzgcxxxxxxx.dll"
AdditionalDependencies="htmlhelp.lib libmzgcxxxxxxx.lib libmzschxxxxxxx.lib mzdyn.obj delayimp.lib"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="htmlhelp.lib libmzgcxxxxxxx.lib libmzschxxxxxxx.lib mzdyn.obj"
OutputFile="..\..\..\collects\mysterx\private\compiled\native\win32\i386\mxmain.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -354,8 +354,8 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386 /DELAYLOAD:libmzsch3mxxxxxxx.dll"
AdditionalDependencies="htmlhelp.lib libmzsch3mxxxxxxx.lib mzdyn3m.obj delayimp.lib"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="htmlhelp.lib libmzsch3mxxxxxxx.lib mzdyn3m.obj"
OutputFile="..\..\..\collects\mysterx\private\compiled\native\win32\i386\3m\mxmain.dll"
LinkIncremental="1"
SuppressStartupBanner="true"