[DAPL,DAPL2]
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Tue, 1 Apr 2008 23:52:06 +0000 (23:52 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Tue, 1 Apr 2008 23:52:06 +0000 (23:52 +0000)
  Make DAPL & DAPL2 build correct in DDK or WDK environments
  DAPL2 dtest & dtestx - remove explicit SDK_INC_PATH in SOURCES file, not required.

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

ulp/dapl/dapl/udapl/SOURCES
ulp/dapl/dat/udat/SOURCES
ulp/dapl2/dapl/udapl/SOURCES
ulp/dapl2/dapl/udapl_scm/SOURCES
ulp/dapl2/dat/udat/SOURCES
ulp/dapl2/test/dtest/SOURCES
ulp/dapl2/test/dtestx/SOURCES

index f7aa65c..f391625 100644 (file)
@@ -6,7 +6,11 @@ TARGETNAME=dapld
 TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=DYNLINK\r
 DLLENTRY=_DllMainCRTStartup\r
+!if $(_NT_TOOLS_VERSION) == 0x700\r
 DLLDEF=$O\udapl_exports.def\r
+!else\r
+DLLDEF=$(OBJ_PATH)\$O\udapl_exports.def\r
+!endif\r
 USE_MSVCRT=1\r
 \r
 SOURCES=udapl.rc               \\r
index 425cbbe..f9b9f6b 100644 (file)
@@ -6,7 +6,11 @@ TARGETNAME=datd
 TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=DYNLINK\r
 DLLENTRY=_DllMainCRTStartup\r
+!if $(_NT_TOOLS_VERSION) == 0x700\r
 DLLDEF=$O\udat_exports.def\r
+!else\r
+DLLDEF=$(OBJ_PATH)\$O\udat_exports.def\r
+!endif\r
 USE_MSVCRT=1\r
 \r
 SOURCES=udat.rc                        \\r
index fd7aa64..d534777 100644 (file)
@@ -6,7 +6,11 @@ TARGETNAME=dapl2d
 TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=DYNLINK\r
 DLLENTRY=_DllMainCRTStartup\r
+!if $(_NT_TOOLS_VERSION) == 0x700\r
 DLLDEF=$O\udapl_exports.def\r
+!else\r
+DLLDEF=$(OBJ_PATH)\$O\udapl_exports.def\r
+!endif\r
 USE_MSVCRT=1\r
 \r
 # pickup local files, then via udapl_sources.c get common files\r
index 25675d6..cb0a8ba 100644 (file)
@@ -6,7 +6,11 @@ TARGETNAME=dapl2-scmd
 TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=DYNLINK\r
 DLLENTRY=_DllMainCRTStartup\r
+!if $(_NT_TOOLS_VERSION) == 0x700\r
 DLLDEF=$O\udapl_scm_exports.def\r
+!else\r
+DLLDEF=$(OBJ_PATH)\$O\udapl_scm_exports.def\r
+!endif\r
 USE_MSVCRT=1\r
 \r
 # pickup local files, then via udapl_sources.c get common files\r
index a55d841..edc9aeb 100644 (file)
@@ -6,7 +6,11 @@ TARGETNAME=dat2d
 TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=DYNLINK\r
 DLLENTRY=_DllMainCRTStartup\r
+!if $(_NT_TOOLS_VERSION) == 0x700\r
 DLLDEF=$O\udat_exports.def\r
+!else\r
+DLLDEF=$(OBJ_PATH)\$O\udat_exports.def\r
+!endif\r
 USE_MSVCRT=1\r
 \r
 SOURCES=udat.rc                        \\r
index f6a5330..2071175 100644 (file)
@@ -12,9 +12,7 @@ SOURCES=dtest.rc      \
        dtest.c         \\r
        getopt.c\r
 \r
-INCLUDES=.;..\..\dat\include;\\r
-       ../../../../inc;..\..\..\..\inc\user;\\r
-       $(SDK_INC_PATH);\r
+INCLUDES=.;..\..\dat\include;../../../../inc;..\..\..\..\inc\user;\r
 \r
 RCOPTIONS=/I..\..\..\..\inc;\r
 \r
index 492f3a8..e96e98e 100644 (file)
@@ -11,9 +11,7 @@ USE_MSVCRT=1
 SOURCES=dtestx.rc      \\r
                dtestx.c\r
 \r
-INCLUDES=.;..\..\dat\include;\\r
-               ../../../../inc;..\..\..\..\inc\user;\\r
-               $(SDK_INC_PATH);\r
+INCLUDES=.;..\..\dat\include;../../../../inc;..\..\..\..\inc\user;\r
 \r
 RCOPTIONS=/I..\..\..\..\inc;\r
 \r