Author: hpoussin Date: Wed Sep 5 13:27:40 2007 New Revision: 28870
URL: http://svn.reactos.org/svn/reactos?rev=28870&view=rev Log: Finally let Wine package version depend of ReactOS version
Modified: trunk/reactos/include/reactos/wine/config.h trunk/reactos/tools/widl/widl.mak
Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/config... ============================================================================== --- trunk/reactos/include/reactos/wine/config.h (original) +++ trunk/reactos/include/reactos/wine/config.h Wed Sep 5 13:27:40 2007 @@ -1,5 +1,7 @@ /* include/config.h. Generated by configure. */ /* include/config.h.in. Generated from configure.ac by autoheader. */ + +#include "reactos/buildno.h"
#define __WINE_CONFIG_H
@@ -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 */
Modified: trunk/reactos/tools/widl/widl.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.mak?rev=288... ============================================================================== --- trunk/reactos/tools/widl/widl.mak (original) +++ trunk/reactos/tools/widl/widl.mak Wed Sep 5 13:27:40 2007 @@ -59,7 +59,8 @@ 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)