[WinOF]

[mirror/winof/.git] / inc / openib.def

diff --git a/inc/openib.def b/inc/openib.def
index fe230f6..9e606bb 100644 (file)
--- a/inc/openib.def
+++ b/inc/openib.def
@@ -1,3 +1,4 @@
+\r

 !INCLUDE $(NTMAKEENV)\makefile.def\r
 \r
 # Allow overriding the company name.\r
 !INCLUDE $(NTMAKEENV)\makefile.def\r
 \r
 # Allow overriding the company name.\r


@@ -10,31 +11,21 @@ IB_COMPANYNAME="""OpenFabrics\40Alliance"""
 IB_PRODUCTNAME="""OpenFabrics\x20Windows"""\r
 !ENDIF\r
 \r
 IB_PRODUCTNAME="""OpenFabrics\x20Windows"""\r
 !ENDIF\r
 \r

-!IF !DEFINED(IB_MAJORVERSION)\r
-IB_MAJORVERSION=1\r
-!endif\r
-\r
-!IF !DEFINED(IB_MINORVERSION)\r
-IB_MINORVERSION=0\r
-!endif\r
-\r
-!IF !DEFINED(IB_FILEBUILD)\r
-IB_FILEBUILD=0\r
-!endif\r
+# get module version: major, minor & build version\r
+!include mod_ver.def\r

 \r
 \r

-!IF !DEFINED(IB_FILEREV)\r
-IB_FILEREV=$(OPENIB_REV)\r
-\r
-!endif\r
+!IF !DEFINED(OPENIB_REV)\r
+OPENIB_REV=0\r
+!ENDIF\r

 \r
 !IFNDEF VER_PROVIDER\r
 \r
 !IFNDEF VER_PROVIDER\r

-VER_PROVIDER="""OpenIB"""\r
+VER_PROVIDER="""OpenFabrics"""\r

 !ENDIF\r
 \r
 C_DEFINES=$(C_DEFINES) -DIB_COMPANYNAME=$(IB_COMPANYNAME) \\r
     -DIB_PRODUCTNAME=$(IB_PRODUCTNAME) \\r
     -DVER_FILEMAJORVERSION=$(IB_MAJORVERSION) \\r
     -DVER_FILEMINORVERSION=$(IB_MINORVERSION) \\r
 !ENDIF\r
 \r
 C_DEFINES=$(C_DEFINES) -DIB_COMPANYNAME=$(IB_COMPANYNAME) \\r
     -DIB_PRODUCTNAME=$(IB_PRODUCTNAME) \\r
     -DVER_FILEMAJORVERSION=$(IB_MAJORVERSION) \\r
     -DVER_FILEMINORVERSION=$(IB_MINORVERSION) \\r

-    -DVER_FILEBUILD=$(IB_FILEBUILD) \\r
-       -DVER_FILEREV=$(IB_FILEREV) \\r
-       -DVER_PROVIDER=$(VER_PROVIDER)
\ No newline at end of file
+    -DVER_FILEBUILD=$(IB_BUILDVERSION) \\r
+    -DVER_FILEREV=$(OPENIB_REV) \\r
+    -DVER_PROVIDER=$(VER_PROVIDER)\r