Build 16-bit resources separately from 32-bit

[Dmitry Timoshkov]

Hello.

Changelog:
    Dmitry Timoshkov <dmitry at codeweavers.com>
    Build 16-bit resources separately from 32-bit.

Please rename the following files to complete the patch:

dlls/gdi/version16.rc --> version16.rc16
dlls/kernel/version16.rc --> version16.rc16
dlls/user/resources/display.rc --> display.rc16
dlls/user/resources/mouse.rc --> mouse.rc16
dlls/user/resources/version16.rc --> version16.rc16

diff -u cvs/hq/wine/Make.rules.in wine/Make.rules.in
--- cvs/hq/wine/Make.rules.in	Tue Apr 17 10:44:28 2001
+++ wine/Make.rules.in	Wed May 23 22:06:21 2001
@@ -170,7 +170,7 @@
 
 # Implicit rules
 
-.SUFFIXES: .mc .rc .mc.rc .res .spec .spec.c .glue.c
+.SUFFIXES: .mc .rc .rc16 .mc.rc .res .spec .spec.c .glue.c
 
 .c.o:
 	$(CC) -c $(ALLCFLAGS) -o $*.o $<
@@ -187,6 +187,9 @@
 .rc.res:
 	$(LDPATH) $(WRC) $(WRCFLAGS) $(DIVINCL) -o $@ -r $<
 
+.rc16.res:
+	$(LDPATH) $(WRC) $(DIVINCL) -o $@ -w16 -m -r $<
+
 .spec.spec.c:
 	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L$(DLLDIR) -o $@ -spec $<
 
@@ -210,7 +213,7 @@
 
 # Rule for main module spec file
 
-$(MODULE).spec.c: $(MODULE).spec $(RC_SRCS:.rc=.res) $(SYMBOLFILE) $(WINEBUILD)
+$(MODULE).spec.c: $(MODULE).spec $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc16=.res) $(SYMBOLFILE) $(WINEBUILD)
 	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L$(DLLDIR) $(SYMBOLFILE:%=-sym %) -o $@ -spec $(SRCDIR)/$(MODULE).spec
 
 # Rule to rebuild the resource compiler
@@ -271,7 +274,7 @@
 	cd `dirname $@` && $(MAKE) depend
 
 depend: $(MAKEDEP) $(GEN_C_SRCS) $(SUBDIRS:%=%/__depend__)
-	$(MAKEDEP) $(DIVINCL) -C$(SRCDIR) $(C_SRCS) $(RC_SRCS) $(MC_SRCS) $(EXTRA_SRCS) -C. $(GEN_C_SRCS)
+	$(MAKEDEP) $(DIVINCL) -C$(SRCDIR) $(C_SRCS) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(EXTRA_SRCS) -C. $(GEN_C_SRCS)
 
 # Rules for cleaning
 
@@ -282,7 +285,7 @@
 	-cd `dirname $@` && $(RM) $(CLEAN_FILES)
 
 clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__)
-	$(RM) $(CLEAN_FILES) $(GEN_C_SRCS) $(GEN_ASM_SRCS) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.mc.rc) $(PROGRAMS)
+	$(RM) $(CLEAN_FILES) $(GEN_C_SRCS) $(GEN_ASM_SRCS) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc16=.res) $(MC_SRCS:.mc=.mc.rc) $(PROGRAMS)
 
 # Rules for installing
 
@@ -299,6 +302,8 @@
 $(GLUE:.c=.glue.c): $(WINEBUILD) $(TOPSRCDIR)/include/builtin16.h
 
 $(RC_SRCS:.rc=.res): $(WRC)
+
+$(RC_SRCS16:.rc16=.res): $(WRC)
 
 $(MC_SRCS:.mc=.mc.rc): $(WMC)
 
Binary files cvs/hq/wine/debugger/winedbg and wine/debugger/winedbg differ
diff -u cvs/hq/wine/dlls/gdi/Makefile.in wine/dlls/gdi/Makefile.in
--- cvs/hq/wine/dlls/gdi/Makefile.in	Sat Feb 24 04:37:13 2001
+++ wine/dlls/gdi/Makefile.in	Wed May 23 22:22:22 2001
@@ -15,8 +15,10 @@
 	wing.c
 
 RC_SRCS= \
-	version.rc \
-	version16.rc
+	version.rc
+
+RC_SRCS16= \
+	version16.rc16
 
 GLUE = printdrv.c thunk.c
 
@@ -38,13 +40,6 @@
 
 $(EXTRA_OBJS): dummy
 	@cd `dirname $@` && $(MAKE) `basename $@`
-
-# Special rules for 16-bit resource files
-
-version16.res: version16.rc
-	$(LDPATH) $(WRC) $(DIVINCL) -o $@ -w16 -m -r $(SRCDIR)/version16.rc
-
-gdi.spec.c: version16.res
 
 ### Dependencies:
 
diff -u cvs/hq/wine/dlls/kernel/Makefile.in wine/dlls/kernel/Makefile.in
--- cvs/hq/wine/dlls/kernel/Makefile.in	Sun Mar 11 21:12:55 2001
+++ wine/dlls/kernel/Makefile.in	Wed May 23 22:33:01 2001
@@ -23,8 +23,10 @@
 	wowthunk.c
 
 RC_SRCS = \
-	kernel.rc \
-	version16.rc
+	kernel.rc
+
+RC_SRCS16 = \
+	version16.rc16
 
 MC_SRCS = \
 	messages/winerr_enu.mc
@@ -38,12 +40,5 @@
 @MAKE_DLL_RULES@
 
 kernel.res: $(MC_SRCS:.mc=.mc.rc)
-
-# Special rules for 16-bit resource files
-
-version16.res: version16.rc
-	$(LDPATH) $(WRC) $(DIVINCL) -o $@ -w16 -m -r $(SRCDIR)/version16.rc
-
-kernel.spec.c: version16.res
 
 ### Dependencies:
diff -u cvs/hq/wine/dlls/user/Makefile.in wine/dlls/user/Makefile.in
--- cvs/hq/wine/dlls/user/Makefile.in	Sat Feb 24 04:37:14 2001
+++ wine/dlls/user/Makefile.in	Wed May 23 22:33:55 2001
@@ -24,10 +24,12 @@
 	wsprintf.c
 
 RC_SRCS = \
-	resources/display.rc \
-	resources/mouse.rc \
-	resources/user32.rc \
-	resources/version16.rc
+	resources/user32.rc
+
+RC_SRCS16 = \
+	resources/display.rc16 \
+	resources/mouse.rc16 \
+	resources/version16.rc16
 
 GLUE = thunk.c
 
@@ -46,22 +48,5 @@
 
 $(EXTRA_OBJS): dummy
 	@cd `dirname $@` && $(MAKE) `basename $@`
-
-# Special rules for 16-bit resource files
-
-resources/display.res: resources/display.rc
-	$(LDPATH) $(WRC) $(DIVINCL) -o $@ -w16 -m -r $(SRCDIR)/resources/display.rc
-
-resources/mouse.res: resources/mouse.rc
-	$(LDPATH) $(WRC) $(DIVINCL) -o $@ -w16 -m -r $(SRCDIR)/resources/mouse.rc
-
-resources/version16.res: resources/version16.rc
-	$(LDPATH) $(WRC) $(DIVINCL) -o $@ -w16 -m -r $(SRCDIR)/resources/version16.rc
-
-display.spec.c: resources/display.res
-
-mouse.spec.c: resources/mouse.res
-
-user.spec.c: resources/version16.res
 
 ### Dependencies: