diff --git a/dlls/compile.bat b/dlls/compile.bat index f97806a5..0106f56d 100644 --- a/dlls/compile.bat +++ b/dlls/compile.bat @@ -113,7 +113,7 @@ set LIBS=user32.lib set OUTNAME=hl.dll set DEBUG=/debug -cl %DEFINES% %LIBS% %SOURCES% %INCLUDES% -o %OUTNAME% /link /dll /out:%OUTNAME% %DEBUG% /def:".\hl.def" +cl %DEFINES% %LIBS% %SOURCES% %INCLUDES% -o %OUTNAME% /link /dll /out:%OUTNAME% %DEBUG% echo -- Compile done. Cleaning... diff --git a/dlls/h_export.cpp b/dlls/h_export.cpp index 11884f9c..88353c7c 100644 --- a/dlls/h_export.cpp +++ b/dlls/h_export.cpp @@ -43,8 +43,8 @@ BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) return TRUE; } -// stdcall for win32 -#define EXPORT2 WINAPI +// cdecl for win32 +#define EXPORT2 WINAPIV #else #define EXPORT2 #endif diff --git a/dlls/wscript b/dlls/wscript index 33d37185..854bbb73 100644 --- a/dlls/wscript +++ b/dlls/wscript @@ -10,15 +10,8 @@ def options(opt): return def configure(conf): - if conf.env.COMPILER_CC == 'msvc': - # hl.def removes MSVC function name decoration from GiveFnptrsToDll on Windows. - # Without this, the lookup for this function fails. - hlDefNode = conf.path.find_resource("./hl.def") - - if hlDefNode is not None: - conf.env.append_unique('LINKFLAGS', '/def:%s' % hlDefNode.abspath()) - else: - conf.fatal("Could not find hl.def") + # stub + return def build(bld): source = bld.path.parent.ant_glob([