[4/6] dlls/Maketest.rules.in: Add support of building various resources for cross and usual tests
Alexander Morozov
amorozov at etersoft.ru
Tue Jul 22 03:58:49 CDT 2008
Ntoskrnl.exe test consists of a driver and a program to load it.
The driver is placed in resource. For cross and usual test are used
drivers built with various compilers. So it is necessary to build various
resources.
-------------- next part --------------
From 190a3143afa004b8384c3086baee0859b2dac48c Mon Sep 17 00:00:00 2001
From: Alexander Morozov <amorozov at etersoft.ru>
Date: Mon, 21 Jul 2008 18:47:41 +0400
Subject: [PATCH] dlls/Maketest.rules.in: Add support of building various resources for cross and usual tests
---
dlls/Maketest.rules.in | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in
index 4bc23e2..5818f9b 100644
--- a/dlls/Maketest.rules.in
+++ b/dlls/Maketest.rules.in
@@ -1,10 +1,12 @@
# Global rules for building dll unit tests -*-Makefile-*-
#
# Each individual makefile should define the following variables:
-# TESTDLL : the dll to test
-# CTESTS : list of C test programs
-# EXTRALIBS : extra libraries to link in (optional)
-# EXTRADEFS : extra symbol definitions, like -DWINELIB (optional)
+# TESTDLL : the dll to test
+# CTESTS : list of C test programs
+# EXTRALIBS : extra libraries to link in (optional)
+# EXTRADEFS : extra symbol definitions, like -DWINELIB (optional)
+# EXTRA_RC_SRCS : resource source files which should not be linked to cross tests
+# CROSS_RC_SRCS : resource source files only for cross tests
#
# plus all variables required by the global Make.rules.in
#
@@ -22,7 +24,7 @@ ALL_LIBS = $(IMPORTS:%=-l%) $(EXTRALIBS) $(LDFLAGS) $(LIBS)
EXTRA_OBJS = testlist.o
CROSSTEST = $(TESTDLL:%.dll=%)_crosstest.exe
-CROSSOBJS = $(C_SRCS:.c=.cross.o) $(RC_SRCS:.rc=.res.cross.o) $(BISON_SRCS:.y=.tab.cross.o) $(LEX_SRCS:.l=.yy.cross.o) $(IDL_GEN_C_SRCS:.c=.cross.o) testlist.cross.o
+CROSSOBJS = $(C_SRCS:.c=.cross.o) $(RC_SRCS:.rc=.res.cross.o) $(CROSS_RC_SRCS:.rc=.res.cross.o) $(BISON_SRCS:.y=.tab.cross.o) $(LEX_SRCS:.l=.yy.cross.o) $(IDL_GEN_C_SRCS:.c=.cross.o) testlist.cross.o
CROSSCC = @CROSSCC@
CROSSWINDRES = @CROSSWINDRES@
@@ -32,13 +34,13 @@ all: $(TESTPROGRAM)
# Rules for .so main module
-$(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in
- $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mconsole $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LIBPORT) $(ALL_LIBS)
+$(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) $(EXTRA_RC_SRCS:.rc=.res) Makefile.in
+ $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mconsole $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) $(EXTRA_RC_SRCS:.rc=.res) -o $@ $(LIBPORT) $(ALL_LIBS)
# Rules for .exe main module
-$(MODULE): $(OBJS) $(RCOBJS) Makefile.in
- $(CC) $(APPMODE) $(OBJS) $(RCOBJS) -o $@ -L$(DLLDIR) $(IMPORTS:%=-L$(DLLDIR)/%) $(ALL_LIBS)
+$(MODULE): $(OBJS) $(RCOBJS) $(EXTRA_RC_SRCS:.rc=.res.o) Makefile.in
+ $(CC) $(APPMODE) $(OBJS) $(RCOBJS) $(EXTRA_RC_SRCS:.rc=.res.o) -o $@ -L$(DLLDIR) $(IMPORTS:%=-L$(DLLDIR)/%) $(ALL_LIBS)
# Rules for building test list
--
1.5.4.5.GIT
More information about the wine-patches
mailing list