diff --git a/Make.rules.in b/Make.rules.in index affddeec8f..90cf96555f 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -70,11 +70,12 @@ MAKEDEP = $(TOOLSDIR)/tools/makedep WRC = $(TOOLSDIR)/tools/wrc/wrc WMC = $(TOOLSDIR)/tools/wmc/wmc WIDL = $(TOOLSDIR)/tools/widl/widl -LDPATH = @LDPATH@ -DLLDIR = $(TOPOBJDIR)/dlls -LIBWINE = -L$(TOPOBJDIR)/library -lwine -LIBUNICODE= -L$(TOPOBJDIR)/unicode -lwine_unicode -LIBUUID = -L$(TOPOBJDIR)/ole -lwine_uuid +WRCFLAGS = -J -m $(EXTRAWRCFLAGS) +LDPATH = @LDPATH@ +DLLDIR = $(TOPOBJDIR)/dlls +LIBWINE = -L$(TOPOBJDIR)/library -lwine +LIBUNICODE = -L$(TOPOBJDIR)/unicode -lwine_unicode +LIBUUID = -L$(TOPOBJDIR)/ole -lwine_uuid @SET_MAKE@ diff --git a/dlls/gdi/Makefile.in b/dlls/gdi/Makefile.in index 854c55bd6d..87bf3cc430 100644 --- a/dlls/gdi/Makefile.in +++ b/dlls/gdi/Makefile.in @@ -87,6 +87,6 @@ gdi.exe.spec.c: gdi.exe.spec version16.res $(LDPATH) $(WINEBUILD) $(DEFS) -H 65520 -o $@ -M $(MODULE) -r version16.res --spec $(SRCDIR)/gdi.exe.spec version16.res: version16.rc - $(LDPATH) $(WRC) $(DIVINCL) -o $@ -w16 -m -r $(SRCDIR)/version16.rc + $(LDPATH) $(WRC) $(WRCFLAGS) $(DIVINCL) -o $@ -w16 -r $(SRCDIR)/version16.rc ### Dependencies: diff --git a/dlls/kernel/Makefile.in b/dlls/kernel/Makefile.in index 53c1455244..3277253e94 100644 --- a/dlls/kernel/Makefile.in +++ b/dlls/kernel/Makefile.in @@ -56,6 +56,6 @@ krnl386.exe.spec.c: krnl386.exe.spec version16.res $(LDPATH) $(WINEBUILD) $(DEFS) -N kernel -o $@ -M $(MODULE) -r version16.res --spec $(SRCDIR)/krnl386.exe.spec version16.res: version16.rc - $(LDPATH) $(WRC) $(DIVINCL) -o $@ -w16 -m -r $(SRCDIR)/version16.rc + $(LDPATH) $(WRC) $(WRCFLAGS) $(DIVINCL) -o $@ -w16 -r $(SRCDIR)/version16.rc ### Dependencies: diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 33d3f927ce..c4f5931bc5 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -65,7 +65,7 @@ uninstall:: # Special rules for 16-bit resource files version16.res: version16.rc - $(LDPATH) $(WRC) $(DIVINCL) -o $@ -w16 -m -r $(SRCDIR)/version16.rc + $(LDPATH) $(WRC) $(WRCFLAGS) $(DIVINCL) -o $@ -w16 -r $(SRCDIR)/version16.rc shell.spec.c: shell.spec version16.res $(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -M $(MODULE) -r version16.res --spec $(SRCDIR)/shell.spec diff --git a/dlls/user/Makefile.in b/dlls/user/Makefile.in index 95fdd79d20..86b0e43ef2 100644 --- a/dlls/user/Makefile.in +++ b/dlls/user/Makefile.in @@ -114,12 +114,12 @@ mouse.spec.c: mouse.spec resources/mouse.res $(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -M $(MODULE) -r resources/mouse.res --spec $(SRCDIR)/mouse.spec resources/display.res: resources/display.rc - $(LDPATH) $(WRC) $(DIVINCL) -o $@ -w16 -m -r $(SRCDIR)/resources/display.rc + $(LDPATH) $(WRC) $(WRCFLAGS) $(DIVINCL) -o $@ -w16 -r $(SRCDIR)/resources/display.rc resources/mouse.res: resources/mouse.rc - $(LDPATH) $(WRC) $(DIVINCL) -o $@ -w16 -m -r $(SRCDIR)/resources/mouse.rc + $(LDPATH) $(WRC) $(WRCFLAGS) $(DIVINCL) -o $@ -w16 -r $(SRCDIR)/resources/mouse.rc resources/version16.res: resources/version16.rc - $(LDPATH) $(WRC) $(DIVINCL) -o $@ -w16 -m -r $(SRCDIR)/resources/version16.rc + $(LDPATH) $(WRC) $(WRCFLAGS) $(DIVINCL) -o $@ -w16 -r $(SRCDIR)/resources/version16.rc ### Dependencies: diff --git a/programs/winhelp/Makefile.in b/programs/winhelp/Makefile.in index 9b8b5ff503..c11eee1b4a 100644 --- a/programs/winhelp/Makefile.in +++ b/programs/winhelp/Makefile.in @@ -2,7 +2,6 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -WRCFLAGS = -DWINELIB MODULE = winhelp.exe APPMODE = gui IMPORTS = comdlg32 shell32 user32 gdi32 kernel32 @@ -16,7 +15,8 @@ C_SRCS = \ EXTRA_SRCS = macro.lex.l EXTRA_OBJS = @LEX_OUTPUT_ROOT@.o -WRCFLAGS = -DWINELIB + +EXTRAWRCFLAGS = -DWINELIB RC_SRCS = rsrc.rc