From 0e970f97eb688a177627adf8d9a5965d69ebc308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Wed, 5 Sep 2007 09:27:40 +0000 Subject: [PATCH] Finally let Wine package version depend of ReactOS version svn path=/trunk/; revision=28870 --- reactos/include/reactos/wine/config.h | 10 ++++++---- reactos/tools/widl/widl.mak | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/reactos/include/reactos/wine/config.h b/reactos/include/reactos/wine/config.h index 5285b313afd..10db80551f8 100644 --- a/reactos/include/reactos/wine/config.h +++ b/reactos/include/reactos/wine/config.h @@ -1,6 +1,8 @@ /* include/config.h. Generated by configure. */ /* include/config.h.in. Generated from configure.ac by autoheader. */ +#include "reactos/buildno.h" + #define __WINE_CONFIG_H /* Specifies the compiler flag that forces a short wchar_t */ @@ -878,14 +880,14 @@ /* Define to the full name of this package. */ #define PACKAGE_NAME "ReactOS" -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ReactOS 0.3.0" - /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ReactOS" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.3.0" +#define PACKAGE_VERSION KERNEL_VERSION_STR + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION /* Define to the soname of the libcapi20 library. */ /* #undef SONAME_LIBCAPI20 */ diff --git a/reactos/tools/widl/widl.mak b/reactos/tools/widl/widl.mak index e836dea9648..84d35c1f85f 100644 --- a/reactos/tools/widl/widl.mak +++ b/reactos/tools/widl/widl.mak @@ -59,7 +59,8 @@ WIDL_OBJECTS = \ WIDL_HOST_CFLAGS = $(TOOLS_CFLAGS) \ -DINT16=SHORT -D__USE_W32API -DYYDEBUG=1 -D__REACTOS__=1 \ -I$(WIDL_BASE) -I$(WPP_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk + -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk \ + -I$(INTERMEDIATE_)include WIDL_HOST_LFLAGS = $(TOOLS_LFLAGS)