From: Arlin Davis <arlin.r.davis@intel.com>
Date: Mon, 18 May 2009 16:06:19 +0000 (-0700)
Subject: windows: add build files for openib_scm, remove /Wp64 build option.
X-Git-Tag: dapl-2.0.20-1~15
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3be4ccf9681a975e74a5aa05e3f7912477f342a7;p=~ardavis%2Fdapl.git

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 29e836e..e59ef35 100644
--- a/dapl/openib_cma/SOURCES
+++ b/dapl/openib_cma/SOURCES
@@ -53,4 +53,4 @@ TARGETLIBS= \
 	$(TARGETPATH)\*\librdmacmd.lib
 !endif
 
-MSC_WARNING_LEVEL = /W1 /wd4113 /Wp64
+MSC_WARNING_LEVEL = /W1 /wd4113
diff --git a/dapl/openib_scm/SOURCES b/dapl/openib_scm/SOURCES
new file mode 100644
index 0000000..f9204d9
--- /dev/null
+++ b/dapl/openib_scm/SOURCES
@@ -0,0 +1,53 @@
+!if $(FREEBUILD)
+TARGETNAME=dapl2-ofa-scm
+!else
+TARGETNAME=dapl2-ofa-scmd
+!endif
+
+TARGETPATH = ..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)
+TARGETTYPE = DYNLINK
+DLLENTRY = _DllMainCRTStartup
+
+!if $(_NT_TOOLS_VERSION) == 0x700
+DLLDEF=$O\udapl_ofa_scm_exports.def
+!else
+DLLDEF=$(OBJ_PATH)\$O\udapl_ofa_scm_exports.def
+!endif
+
+USE_MSVCRT = 1
+
+SOURCES = \
+	udapl.rc \
+	..\dapl_common_src.c	\
+	..\dapl_udapl_src.c		\
+	dapl_ib_cq.c			\
+	dapl_ib_extensions.c	\
+	dapl_ib_mem.c			\
+	dapl_ib_qp.c			\
+	dapl_ib_util.c			\
+	dapl_ib_cm.c
+
+INCLUDES = ..\include;..\common;windows;..\..\dat\include;\
+		   ..\..\dat\udat\windows;..\udapl\windows;\
+		   ..\..\..\..\inc;..\..\..\..\inc\user;..\..\..\libibverbs\include
+
+DAPL_OPTS = -DEXPORT_DAPL_SYMBOLS -DDAT_EXTENSIONS -DSOCK_CM -DOPENIB -DCQ_WAIT_OBJECT
+
+USER_C_FLAGS = $(USER_C_FLAGS) $(DAPL_OPTS)
+
+!if !$(FREEBUILD)
+USER_C_FLAGS = $(USER_C_FLAGS) -DDAPL_DBG
+!endif
+
+TARGETLIBS= \
+	$(SDK_LIB_PATH)\kernel32.lib \
+	$(SDK_LIB_PATH)\ws2_32.lib \
+!if $(FREEBUILD)
+	$(TARGETPATH)\*\dat2.lib \
+	$(TARGETPATH)\*\libibverbs.lib
+!else
+	$(TARGETPATH)\*\dat2d.lib \
+	$(TARGETPATH)\*\libibverbsd.lib
+!endif
+
+MSC_WARNING_LEVEL = /W1 /wd4113
diff --git a/dapl/openib_scm/udapl.rc b/dapl/openib_scm/udapl.rc
new file mode 100644
index 0000000..8550256
--- /dev/null
+++ b/dapl/openib_scm/udapl.rc
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2007, 2009 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 AND
+ * 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.
+ *
+ * $Id$
+ */
+
+
+#include <oib_ver.h>
+
+#define VER_FILETYPE			VFT_DLL
+#define VER_FILESUBTYPE			VFT2_UNKNOWN
+
+#if DBG
+#define VER_FILEDESCRIPTION_STR		"Direct Access Provider Library v2.0 (OFA socket-cm) (Debug)"
+#define VER_INTERNALNAME_STR		"dapl2-ofa-scmd.dll"
+#define VER_ORIGINALFILENAME_STR	"dapl2-ofa-scmd.dll"
+#else
+#define VER_FILEDESCRIPTION_STR		"Direct Access Provider Library v2.0 (OFA socket-cm)"
+#define VER_INTERNALNAME_STR		"dapl2-ofa-scm.dll"
+#define VER_ORIGINALFILENAME_STR	"dapl2-ofa-scm.dll"
+#endif
+
+#include <common.ver>