From 18e7e0d933565232a23cf5fb16ebd680b1dc9a90 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 20 Jan 2003 23:27:49 +0000 Subject: [PATCH] Include $prefix/include/wine/windows into the WINE include search path. wrc no longer understands -r (not needed). --- tools/winemaker | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index d95113660cb..183b62eb926 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -2635,7 +2635,7 @@ else fi]) if test -n "$WINE_ROOT" then - WINE_INCLUDE_ROOT="$WINE_ROOT/include:$WINE_ROOT/include/wine" + WINE_INCLUDE_ROOT="$WINE_ROOT/include:$WINE_ROOT/include/wine:$WINE_ROOT/include/wine/windows:$WINE_ROOT/include/windows" WINE_LIBRARY_ROOT="$WINE_ROOT:$WINE_ROOT/lib:$WINE_ROOT/library" WINE_UNICODE_ROOT="$WINE_ROOT:$WINE_ROOT/lib:$WINE_ROOT/unicode" WINE_UUID_ROOT="$WINE_ROOT:$WINE_ROOT/lib:$WINE_ROOT/ole" @@ -2695,7 +2695,7 @@ fi if test -z "$WINE_INCLUDE_ROOT" then - WINE_INCLUDE_ROOT=":/usr/include/wine:/usr/local/include/wine:/opt/wine/include:/opt/wine/include/wine"; + WINE_INCLUDE_ROOT=":/usr/include/wine/windows:/usr/include/wine:/usr/local/include/wine/windows:/opt/wine/include/windows:/opt/wine/include/wine"; else AC_PATH_FILE(WINE_INCLUDE_ROOT,[windef.h],[ AC_MSG_ERROR([Could not find the Wine headers (windef.h)]) @@ -3080,7 +3080,7 @@ DISTCLEAN_FILES = config.* Makefile Make.rules $(CXX) -c $(ALLCXXFLAGS) -o $@ $< .rc.res: - $(LDPATH) $(WRC) $(WRCFLAGS) $(DIVINCL) -o $@ -r $< + $(LDPATH) $(WRC) $(WRCFLAGS) $(DIVINCL) -o $@ $< .PHONY: all install uninstall clean distclean depend dummy