diff options
| author | Pete Batard <pbatard@gmail.com> | 2010-09-21 15:42:30 +0100 |
|---|---|---|
| committer | Pete Batard <pbatard@gmail.com> | 2010-09-21 15:42:30 +0100 |
| commit | c9502f2d1c80f2b4a78816bb199d7778076c576e (patch) | |
| tree | 1cf97979bd0c35df59f1815ea3b4a87f09f8091c | |
| parent | 54e0ee800d58583520b870a29a4c6e7c2619b33f (diff) | |
| download | libusb-c9502f2d1c80f2b4a78816bb199d7778076c576e.tar.gz | |
force the handling of version stringification in the .rc
* this removes the version string from libusb_version.h
| -rw-r--r-- | libusb/libusb-1.0.rc | 4 | ||||
| -rw-r--r-- | libusb/libusb_version.h | 1 | ||||
| -rw-r--r-- | libusb/libusb_version.h.in | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/libusb/libusb-1.0.rc b/libusb/libusb-1.0.rc index 17362dc..d579653 100644 --- a/libusb/libusb-1.0.rc +++ b/libusb/libusb-1.0.rc @@ -8,6 +8,10 @@ #include "winresrc.h" #include "libusb_version.h" +#define __DEFTOSTR(x) #x +#define _DEFTOSTR(x) __DEFTOSTR(x) +#define LIBUSB_PACKAGE_VERSION _DEFTOSTR(LIBUSB_VERSION_MAJOR.LIBUSB_VERSION_MINOR.LIBUSB_VERSION_MICRO.LIBUSB_VERSION_NANO) + VS_VERSION_INFO VERSIONINFO FILEVERSION LIBUSB_VERSION_MAJOR,LIBUSB_VERSION_MINOR,LIBUSB_VERSION_MICRO,LIBUSB_VERSION_NANO PRODUCTVERSION LIBUSB_VERSION_MAJOR,LIBUSB_VERSION_MINOR,LIBUSB_VERSION_MICRO,LIBUSB_VERSION_NANO diff --git a/libusb/libusb_version.h b/libusb/libusb_version.h index 19a1f89..627df5d 100644 --- a/libusb/libusb_version.h +++ b/libusb/libusb_version.h @@ -25,6 +25,5 @@ #define LIBUSB_VERSION_MINOR 0 #define LIBUSB_VERSION_MICRO 8 #define LIBUSB_VERSION_NANO 10305 -#define LIBUSB_PACKAGE_VERSION "1.0.8.10305" #endif diff --git a/libusb/libusb_version.h.in b/libusb/libusb_version.h.in index 3a26550..f27a59a 100644 --- a/libusb/libusb_version.h.in +++ b/libusb/libusb_version.h.in @@ -25,6 +25,5 @@ #define LIBUSB_VERSION_MINOR @LIBUSB_VERSION_MINOR@ #define LIBUSB_VERSION_MICRO @LIBUSB_VERSION_MICRO@ #define LIBUSB_VERSION_NANO @LIBUSB_VERSION_NANO@ -#define LIBUSB_PACKAGE_VERSION "@LIBUSB_VERSION_MAJOR@.@LIBUSB_VERSION_MINOR@.@LIBUSB_VERSION_MICRO@.@LIBUSB_VERSION_NANO@" #endif |