From 2ba7135eaaf59d254e2e580b05b0d69745d75fac Mon Sep 17 00:00:00 2001 From: shefty Date: Wed, 7 May 2008 17:31:33 +0000 Subject: [PATCH] winverbs/build: update build environment to support the WDK Winverbs library can now be built using the WDK. Signed-off-by: Sean Hefty git-svn-id: svn://openib.tc.cornell.edu/gen1@1140 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- branches/winverbs/core/winverbs/user/SOURCES | 7 +++- .../winverbs/core/winverbs/user/wv_export.def | 35 ------------------- .../core/winverbs/user/wv_exports.src | 3 +- 3 files changed, 7 insertions(+), 38 deletions(-) delete mode 100644 branches/winverbs/core/winverbs/user/wv_export.def diff --git a/branches/winverbs/core/winverbs/user/SOURCES b/branches/winverbs/core/winverbs/user/SOURCES index eaee43da..63ebf654 100644 --- a/branches/winverbs/core/winverbs/user/SOURCES +++ b/branches/winverbs/core/winverbs/user/SOURCES @@ -7,7 +7,12 @@ TARGETNAME = winverbsd TARGETPATH = ..\..\..\bin\user\obj$(BUILD_ALT_DIR) TARGETTYPE = DYNLINK +!if $(_NT_TOOLS_VERSION) == 0x700 DLLDEF = $O\wv_exports.def +!else +DLLDEF = $(OBJ_PATH)\$O\wv_exports.def +!endif +DLLENTRY = DllMain USE_NTDLL = 1 SOURCES = \ @@ -31,4 +36,4 @@ TARGETLIBS = \ $(SDK_LIB_PATH)\kernel32.lib \ $(SDK_LIB_PATH)\uuid.lib -MSC_WARNING_LEVEL = /W4 /wd4244 /wd4201 +MSC_WARNING_LEVEL = /W3 /EHsc diff --git a/branches/winverbs/core/winverbs/user/wv_export.def b/branches/winverbs/core/winverbs/user/wv_export.def deleted file mode 100644 index 90166740..00000000 --- a/branches/winverbs/core/winverbs/user/wv_export.def +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2008 Intel Corporation. All rights reserved. - * - * This software is available to you under the OpenIB.org BSD license - * below: - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AWV - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -LIBRARY WINVERBS.DLL - -EXPORTS - DllCanUnloadNow PRIVATE - DllGetClassObject PRIVATE - WvGetObject PRIVATE diff --git a/branches/winverbs/core/winverbs/user/wv_exports.src b/branches/winverbs/core/winverbs/user/wv_exports.src index 2d419569..ed6a38c0 100644 --- a/branches/winverbs/core/winverbs/user/wv_exports.src +++ b/branches/winverbs/core/winverbs/user/wv_exports.src @@ -4,7 +4,6 @@ LIBRARY winverbsd.dll LIBRARY winverbs.dll #endif -#ifndef _WIN64 EXPORTS +DllCanUnloadNow PRIVATE -#endif -- 2.41.0