[WIX] set include search paths correctly. update README.

git-svn-id: svn://openib.tc.cornell.edu/gen1@2784 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/OFED/WIX/SDK_Samples/rdma_bw/Makefile.x64 b/trunk/OFED/WIX/SDK_Samples/rdma_bw/Makefile.x64
index e6bcf08fb9660257bbb5f33398b4cbb63c5d6b69..c666519753a484411c1c2984ae70be667aee7a64 100644 (file)
--- a/trunk/OFED/WIX/SDK_Samples/rdma_bw/Makefile.x64
+++ b/trunk/OFED/WIX/SDK_Samples/rdma_bw/Makefile.x64
@@ -27,8 +27,10 @@
 \r
 PGM=ibv_rdma_bw\r
 \r
-LIB_PATH=%SystemDrive%\OFED_SDK\Lib\r
-INC_PATH=%SystemDrive%\OFED_SDK\Inc\r
+SDK=%SystemDrive%\OFED_SDK\r
+\r
+INC_PATH=$(SDK)\Inc\r
+LIB_PATH=$(SDK)\Lib\r
 \r
 IB_LIBS=libibverbs.lib librdmacm.lib\r
 \r
@@ -45,7 +47,7 @@ EXEC = $(PGM).exe
 \r
 CC = cl\r
 \r
-INC_FLAGS = /I $(INC_PATH)\r
+INC_FLAGS = /I $(INC_PATH) /I $(INC_PATH)\linux /I $(INC_PATH)\etc\r
 RFLAGS=/r /i $(INC_PATH)\r
 \r
 UNUSED_CL=/Zp1 /Od\r

diff --git a/trunk/OFED/WIX/SDK_Samples/rdma_bw/Makefile.x86 b/trunk/OFED/WIX/SDK_Samples/rdma_bw/Makefile.x86
index f4ce61db5453a63496de0577bde1102dbb69fe9e..a69198ecb88910b4d100f5eac81b9eed85b19529 100644 (file)
--- a/trunk/OFED/WIX/SDK_Samples/rdma_bw/Makefile.x86
+++ b/trunk/OFED/WIX/SDK_Samples/rdma_bw/Makefile.x86
@@ -27,8 +27,10 @@
 \r
 PGM=ibv_rdma_bw\r
 \r
-LIB_PATH=%SystemDrive%\OFED_SDK\Lib\r
-INC_PATH=%SystemDrive%\OFED_SDK\Inc\r
+SDK=%SystemDrive%\OFED_SDK\r
+\r
+INC_PATH=$(SDK)\Inc\r
+LIB_PATH=$(SDK)\Lib\r
 \r
 IB_LIBS=libibverbs.lib librdmacm.lib\r
 \r
@@ -45,7 +47,7 @@ EXEC = $(PGM).exe
 \r
 CC = cl\r
 \r
-INC_FLAGS = /I $(INC_PATH)\r
+INC_FLAGS = /I $(INC_PATH) /I $(INC_PATH)\linux /I $(INC_PATH)\etc\r
 RFLAGS=/r /i $(INC_PATH)\r
 \r
 UNUSED_CL=/Zp1 /Od\r

diff --git a/trunk/OFED/WIX/SDK_Samples/rdma_bw/README.txt b/trunk/OFED/WIX/SDK_Samples/rdma_bw/README.txt
index dd49aa0aa71ef714b0afc24181027a76e90469b9..9ba2a4f53d9a24bc8dc7842c519890f6f7ebba59 100644 (file)
--- a/trunk/OFED/WIX/SDK_Samples/rdma_bw/README.txt
+++ b/trunk/OFED/WIX/SDK_Samples/rdma_bw/README.txt
@@ -33,7 +33,7 @@ Makefile Solution
 Assuming Visual Studio is installed, select a Visual Studio x64 command\r
 window from the start menu.\r
 \r
-nmake -f Makefile.x64\r
+nmake -f Makefile\r
 \r
 If building a win32 application on a 64-bit platform then link with\r
 lbal32[d].lib & complib32[d].lib.\r
@@ -46,13 +46,11 @@ Executing ibv_rdma_bw.exe
 \r
 Example ibv_rdma_bw invocation: local loopback test\r
 \r
-\r
 Separate processes for server & client (different cmd windows).\r
 \r
 server:    ibv_rdma_bw \r
 client:    ibv_rdma_bw -h <ethernet-hostname>\r
 \r
-\r
 Example using rdma_cm over IPoIB interface\r
 \r
 server:    ibv_rdma_bw -c\r