winverbs/build: update build environment to support the WDK

Winverbs library can now be built using the WDK.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
git-svn-id: svn://openib.tc.cornell.edu/gen1@1140 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/branches/winverbs/core/winverbs/user/SOURCES b/branches/winverbs/core/winverbs/user/SOURCES
index eaee43daec0da643ea772cfeaab1a91d68bfac43..63ebf654a5b2b3ea0f753918ee0502518b841e51 100644 (file)
--- 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)\r
 TARGETTYPE = DYNLINK\r
 \r
+!if $(_NT_TOOLS_VERSION) == 0x700\r
 DLLDEF = $O\wv_exports.def\r
+!else\r
+DLLDEF = $(OBJ_PATH)\$O\wv_exports.def\r
+!endif\r
+DLLENTRY = DllMain\r
 USE_NTDLL = 1\r
 \r
 SOURCES = \\r
@@ -31,4 +36,4 @@ TARGETLIBS = \
        $(SDK_LIB_PATH)\kernel32.lib    \\r
        $(SDK_LIB_PATH)\uuid.lib\r
 \r
-MSC_WARNING_LEVEL = /W4 /wd4244 /wd4201\r
+MSC_WARNING_LEVEL = /W3 /EHsc\r

diff --git a/branches/winverbs/core/winverbs/user/wv_export.def b/branches/winverbs/core/winverbs/user/wv_export.def
deleted file mode 100644 (file)
index 9016674..0000000
--- a/branches/winverbs/core/winverbs/user/wv_export.def
+++ /dev/null
@@ -1,35 +0,0 @@
-/*\r
- * Copyright (c) 2008 Intel Corporation. All rights reserved.\r
- *\r
- * This software is available to you under the OpenIB.org BSD license\r
- * below:\r
- *\r
- *     Redistribution and use in source and binary forms, with or\r
- *     without modification, are permitted provided that the following\r
- *     conditions are met:\r
- *\r
- *      - Redistributions of source code must retain the above\r
- *        copyright notice, this list of conditions and the following\r
- *        disclaimer.\r
- *\r
- *      - Redistributions in binary form must reproduce the above\r
- *        copyright notice, this list of conditions and the following\r
- *        disclaimer in the documentation and/or other materials\r
- *        provided with the distribution.\r
- *\r
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AWV\r
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS\r
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN\r
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\r
- * SOFTWARE.\r
- */\r
-\r
-LIBRARY        WINVERBS.DLL\r
-\r
-EXPORTS\r
-       DllCanUnloadNow         PRIVATE\r
-       DllGetClassObject       PRIVATE\r
-       WvGetObject                     PRIVATE\r

diff --git a/branches/winverbs/core/winverbs/user/wv_exports.src b/branches/winverbs/core/winverbs/user/wv_exports.src
index 2d419569cad34e026662f563d37334cbebabd199..ed6a38c071a304b13d043ef639927ae8210d2268 100644 (file)
--- 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\r
 #endif\r
 \r
-#ifndef _WIN64\r
 EXPORTS\r
+DllCanUnloadNow        PRIVATE\r
 \r
-#endif\r