[ofw] openib-windows modifications to support a cleaner build in the WDK env.

Smith, Stan stan.smith at intel.com
Thu Feb 28 13:55:40 PST 2008


10 files modified to compile under WDK without undue noise and/or
errors...

====> file: trunk\tools\nsc\SOURCES

Index: SOURCES
===================================================================
--- SOURCES	(revision 953)
+++ SOURCES	(working copy)
@@ -2,7 +2,7 @@
 TARGETPATH=..\..\bin\user\obj$(BUILD_ALT_DIR)
 TARGETTYPE=PROGRAM
 UMTYPE=console
-USE_CRTDLL=1
+USE_MSVCRT=1
 
 SOURCES=nsc.c \
         nsc.rc

====> file: trunk\tools\flint\user\SOURCES

Index: SOURCES
===================================================================
--- SOURCES	(revision 953)
+++ SOURCES	(working copy)
@@ -1,8 +1,7 @@
 TARGETNAME=flint
 TARGETTYPE=PROGRAM
 UMTYPE=console
-USE_CRTDLL=1
-USE_NTDLL=1
+USE_MSVCRT=1
 
 
 !if !defined(WINIBHOME)
@@ -28,11 +27,9 @@
 
 TARGETLIBS= \
 !if $(FREEBUILD)
-			$(CRT_LIB_PATH)\msvcrt.lib \
 			$(SDK_LIB_PATH)\Ws2_32.lib\
 			$(TARGETPATH)\*\mtcr.lib
 !else
-			$(CRT_LIB_PATH)\msvcrtd.lib\
 			$(SDK_LIB_PATH)\Ws2_32.lib\
 			$(TARGETPATH)\*\mtcr.lib
 !endif

====> file: trunk\tools\mst\user\SOURCES

Index: SOURCES
===================================================================
--- SOURCES	(revision 953)
+++ SOURCES	(working copy)
@@ -1,9 +1,8 @@
 TARGETNAME=mst
 TARGETTYPE=PROGRAM
 UMTYPE=console
-USE_CRTDLL=1
+USE_MSVCRT=1
 
-
 !if !defined(WINIBHOME)
 WINIBHOME=..\..\..
 !endif

====> file: trunk\tools\mtcr\user\SOURCES

Index: SOURCES
===================================================================
--- SOURCES	(revision 953)
+++ SOURCES	(working copy)
@@ -9,7 +9,7 @@
 TARGETNAME=mtcr
 DLLENTRY=_DllMainCRTStartup
 DLLDEF=mtcr.def
-USE_CRTDLL=1
+USE_MSVCRT=1
 
 !if !defined(WINIBHOME)
 WINIBHOME=..\..\..
@@ -37,12 +37,10 @@
 TARGETLIBS= \
 !if $(FREEBUILD)
 			$(TARGETPATH)\*\complib.lib \
-			$(CRT_LIB_PATH)\msvcrt.lib \
 			$(TARGETPATH)\*\ibal.lib\
 			$(SDK_LIB_PATH)\Kernel32.lib\
 !else
 			$(TARGETPATH)\*\complibd.lib\
-			$(CRT_LIB_PATH)\msvcrt.lib\
 			$(TARGETPATH)\*\ibald.lib\
 			$(SDK_LIB_PATH)\Ws2_32.lib\
 			$(SDK_LIB_PATH)\Kernel32.lib\

====> file: trunk\tools\spark\user\SOURCES

Index: SOURCES
===================================================================
--- SOURCES	(revision 953)
+++ SOURCES	(working copy)
@@ -1,10 +1,9 @@
 TARGETNAME=spark
 TARGETTYPE=PROGRAM
 UMTYPE=console
-USE_CRTDLL=1
-USE_NTDLL=1
+USE_MSVCRT=1
+USE_STL=1
 
-
 !if !defined(WINIBHOME)
 WINIBHOME=..\..\..
 !endif
@@ -24,11 +23,9 @@
 
 TARGETLIBS= \
 !if $(FREEBUILD)
-			$(CRT_LIB_PATH)\msvcprt.lib \
 			$(SDK_LIB_PATH)\Ws2_32.lib\
 			$(TARGETPATH)\*\mtcr.lib
 !else
-			$(CRT_LIB_PATH)\msvcprt.lib\
 			$(SDK_LIB_PATH)\Ws2_32.lib\
 			$(TARGETPATH)\*\mtcr.lib
 !endif

====> file: trunk\ulp\opensm\user\ibtrapgen\SOURCES

Index: SOURCES
===================================================================
--- SOURCES	(revision 953)
+++ SOURCES	(working copy)
@@ -35,15 +35,13 @@
 			$(LIBPATH)\*\ibal.lib \
 			$(LIBPATH)\*\complib.lib \
 			$(TARGETPATH)\*\osmv_ibal.lib \
-			$(TARGETPATH)\*\opensm_ibal.lib \
-			$(CRT_LIB_PATH)\msvcrt.lib
+			$(TARGETPATH)\*\opensm_ibal.lib
 
 !else
 			$(LIBPATH)\*\ibald.lib \
 			$(LIBPATH)\*\complibd.lib \
 			$(TARGETPATH)\*\osmv_ibald.lib \
-			$(TARGETPATH)\*\opensm_ibald.lib \
-			$(CRT_LIB_PATH)\msvcrt.lib
+			$(TARGETPATH)\*\opensm_ibald.lib
 !endif
 
 #DO NOT TOUCH the order of search path , until ib_types.h merging
process will be done


====> file: trunk\ulp\opensm\user\ibvendor\SOURCES

Index: SOURCES
===================================================================
--- SOURCES	(revision 953)
+++ SOURCES	(working copy)
@@ -17,7 +17,7 @@
 TARGETPATH=$(WINIBHOME)\bin\user\obj$(BUILD_ALT_DIR)
 !endif
 
-USE_NTDLL=1
+USE_MSVCRT=1
 OVR_DIR=..\addon
 
 
@@ -31,13 +31,11 @@
 TARGETLIBS=\
 !if $(FREEBUILD)
 			$(LIBPATH)\*\ibal.lib \
-			$(LIBPATH)\*\complib.lib \
-			$(CRT_LIB_PATH)\msvcrt.lib
+			$(LIBPATH)\*\complib.lib
 
 !else
 			$(LIBPATH)\*\ibald.lib \
-			$(LIBPATH)\*\complibd.lib \
-			$(CRT_LIB_PATH)\msvcrt.lib
+			$(LIBPATH)\*\complibd.lib
 !endif
 
 #DO NOT TOUCH the order of search path , until ib_types.h merging


====> file: trunk\ulp\opensm\user\opensm\SOURCES

Index: SOURCES
===================================================================
--- SOURCES	(revision 953)
+++ SOURCES	(working copy)
@@ -129,15 +129,13 @@
 			$(LIBPATH)\*\ibal.lib \
 			$(LIBPATH)\*\complib.lib \
 			$(TARGETPATH)\*\osmv_ibal.lib \
-			$(TARGETPATH)\*\opensm_ibal.lib \
-			$(CRT_LIB_PATH)\msvcrt.lib
+			$(TARGETPATH)\*\opensm_ibal.lib
 
 !else
 			$(LIBPATH)\*\ibald.lib \
 			$(LIBPATH)\*\complibd.lib \
 			$(TARGETPATH)\*\osmv_ibald.lib \
-			$(TARGETPATH)\*\opensm_ibald.lib \
-			$(CRT_LIB_PATH)\msvcrt.lib
+			$(TARGETPATH)\*\opensm_ibald.lib
 !endif
 
 #DO NOT TOUCH the order of search path , until ib_types.h merging
process will be done

====> file: trunk\ulp\opensm\user\osmtest\SOURCES

Index: SOURCES
===================================================================
--- SOURCES	(revision 953)
+++ SOURCES	(working copy)
@@ -39,15 +39,13 @@
 			$(LIBPATH)\*\ibal.lib \
 			$(LIBPATH)\*\complib.lib \
 			$(TARGETPATH)\*\osmv_ibal.lib \
-			$(TARGETPATH)\*\opensm_ibal.lib \
-			$(CRT_LIB_PATH)\msvcrt.lib
+			$(TARGETPATH)\*\opensm_ibal.lib
 
 !else
 			$(LIBPATH)\*\ibald.lib \
 			$(LIBPATH)\*\complibd.lib \
 			$(TARGETPATH)\*\osmv_ibald.lib \
-			$(TARGETPATH)\*\opensm_ibald.lib \
-			$(CRT_LIB_PATH)\msvcrt.lib
+			$(TARGETPATH)\*\opensm_ibald.lib
 !endif
 
 #DO NOT TOUCH the order of search path , until ib_types.h merging
process will be done

====> file: trunk\ulp\opensm\user\include\opensm\osm_port_profile.h

  For 64 bit platforms, compiler complained of shifted 32-bit value
('1') extended
  to 64-bits.

Index: osm_port_profile.h
===================================================================
--- osm_port_profile.h	(revision 953)
+++ osm_port_profile.h	(working copy)
@@ -264,7 +264,7 @@
 	 value = (size_t)p_obj;
   } 
   
-  value = value | (1 << port_num);
+  value = value | ((size_t)1 << port_num);
   cl_map_insert(&(p_subn->opt.port_prof_ignore_guids),
 					 port_guid,
 					 (void *)value);





More information about the ofw mailing list