windows: add build files for openib_scm, remove /Wp64 build option.

Add build files for windows socket cm and change build
option on windows providers. The new Win7 WDK issues a
depreciated compiler option warning for /Wp64
(Enable 64-bit porting warnings)

Signed-off-by: Arlin Davis <arlin.r.davis@intel.com>

diff --git a/dapl/openib_cma/SOURCES b/dapl/openib_cma/SOURCES
index 29e836e4e1ad4145cbe025775c0dd7d044f5c9f4..e59ef358180b9437cd0fe679f64e38728cf2e71c 100644 (file)
--- a/dapl/openib_cma/SOURCES
+++ b/dapl/openib_cma/SOURCES
@@ -53,4 +53,4 @@ TARGETLIBS= \
        $(TARGETPATH)\*\librdmacmd.lib\r
 !endif\r
 \r
-MSC_WARNING_LEVEL = /W1 /wd4113 /Wp64\r
+MSC_WARNING_LEVEL = /W1 /wd4113\r

diff --git a/dapl/openib_scm/SOURCES b/dapl/openib_scm/SOURCES
new file mode 100644 (file)
index 0000000..f9204d9
--- /dev/null
+++ b/dapl/openib_scm/SOURCES
@@ -0,0 +1,53 @@
+!if $(FREEBUILD)\r
+TARGETNAME=dapl2-ofa-scm\r
+!else\r
+TARGETNAME=dapl2-ofa-scmd\r
+!endif\r
+\r
+TARGETPATH = ..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
+TARGETTYPE = DYNLINK\r
+DLLENTRY = _DllMainCRTStartup\r
+\r
+!if $(_NT_TOOLS_VERSION) == 0x700\r
+DLLDEF=$O\udapl_ofa_scm_exports.def\r
+!else\r
+DLLDEF=$(OBJ_PATH)\$O\udapl_ofa_scm_exports.def\r
+!endif\r
+\r
+USE_MSVCRT = 1\r
+\r
+SOURCES = \\r
+       udapl.rc \\r
+       ..\dapl_common_src.c    \\r
+       ..\dapl_udapl_src.c             \\r
+       dapl_ib_cq.c                    \\r
+       dapl_ib_extensions.c    \\r
+       dapl_ib_mem.c                   \\r
+       dapl_ib_qp.c                    \\r
+       dapl_ib_util.c                  \\r
+       dapl_ib_cm.c\r
+\r
+INCLUDES = ..\include;..\common;windows;..\..\dat\include;\\r
+                  ..\..\dat\udat\windows;..\udapl\windows;\\r
+                  ..\..\..\..\inc;..\..\..\..\inc\user;..\..\..\libibverbs\include\r
+\r
+DAPL_OPTS = -DEXPORT_DAPL_SYMBOLS -DDAT_EXTENSIONS -DSOCK_CM -DOPENIB -DCQ_WAIT_OBJECT\r
+\r
+USER_C_FLAGS = $(USER_C_FLAGS) $(DAPL_OPTS)\r
+\r
+!if !$(FREEBUILD)\r
+USER_C_FLAGS = $(USER_C_FLAGS) -DDAPL_DBG\r
+!endif\r
+\r
+TARGETLIBS= \\r
+       $(SDK_LIB_PATH)\kernel32.lib \\r
+       $(SDK_LIB_PATH)\ws2_32.lib \\r
+!if $(FREEBUILD)\r
+       $(TARGETPATH)\*\dat2.lib \\r
+       $(TARGETPATH)\*\libibverbs.lib\r
+!else\r
+       $(TARGETPATH)\*\dat2d.lib \\r
+       $(TARGETPATH)\*\libibverbsd.lib\r
+!endif\r
+\r
+MSC_WARNING_LEVEL = /W1 /wd4113\r

diff --git a/dapl/openib_scm/udapl.rc b/dapl/openib_scm/udapl.rc
new file mode 100644 (file)
index 0000000..8550256
--- /dev/null
+++ b/dapl/openib_scm/udapl.rc
@@ -0,0 +1,48 @@
+/*\r
+ * Copyright (c) 2007, 2009 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 AND\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
+ * $Id$\r
+ */\r
+\r
+\r
+#include <oib_ver.h>\r
+\r
+#define VER_FILETYPE                   VFT_DLL\r
+#define VER_FILESUBTYPE                        VFT2_UNKNOWN\r
+\r
+#if DBG\r
+#define VER_FILEDESCRIPTION_STR                "Direct Access Provider Library v2.0 (OFA socket-cm) (Debug)"\r
+#define VER_INTERNALNAME_STR           "dapl2-ofa-scmd.dll"\r
+#define VER_ORIGINALFILENAME_STR       "dapl2-ofa-scmd.dll"\r
+#else\r
+#define VER_FILEDESCRIPTION_STR                "Direct Access Provider Library v2.0 (OFA socket-cm)"\r
+#define VER_INTERNALNAME_STR           "dapl2-ofa-scm.dll"\r
+#define VER_ORIGINALFILENAME_STR       "dapl2-ofa-scm.dll"\r
+#endif\r
+\r
+#include <common.ver>\r