ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winetest: Build exe resources as separate .res files.

This commit is contained in:
Alexandre Julliard 2009-07-04 11:20:09 +02:00
parent a6beb50668
commit 0dc951694b
6 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -197,7 +197,7 @@ programs/winedbg/dbg.tab.h
programs/winedbg/debug.yy.c programs/winedbg/debug.yy.c
programs/winedbg/winedbg.man programs/winedbg/winedbg.man
programs/winetest/*_test.exe programs/winetest/*_test.exe
programs/winetest/tests.rc programs/winetest/*_test.rc
programs/winhlp32/macro.lex.yy.c programs/winhlp32/macro.lex.yy.c
server/wineserver server/wineserver
server/wineserver-installed server/wineserver-installed

10
configure vendored
View File

@ -28762,10 +28762,14 @@ for dir in $ALL_TEST_DIRS
do do
if test "$dir" != "\\" if test "$dir" != "\\"
then then
testname=`expr $dir : '\(.*\)/tests'`_test.exe testname=`expr $dir : '\(.*\)/tests'`_test
ALL_WINETEST_DEPENDS="$ALL_WINETEST_DEPENDS ALL_WINETEST_DEPENDS="$ALL_WINETEST_DEPENDS
$testname: \$(DLLDIR)/$dir/$testname\$(DLLEXT)
cp \$(DLLDIR)/$dir/$testname\$(DLLEXT) \$@ && \$(STRIP) \$@" $testname.exe: \$(DLLDIR)/$dir/$testname.exe\$(DLLEXT)
cp \$(DLLDIR)/$dir/$testname.exe\$(DLLEXT) \$@ && \$(STRIP) \$@
$testname.rc:
echo \"$testname.exe TESTRES \\\"$testname.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
$testname.res: $testname.rc $testname.exe"
fi fi
done done

10
configure.ac
View File

@ -2527,10 +2527,14 @@ for dir in $ALL_TEST_DIRS
do do
if test "$dir" != "\\" if test "$dir" != "\\"
then then
testname=`expr $dir : '\(.*\)/tests'`_test.exe testname=`expr $dir : '\(.*\)/tests'`_test
ALL_WINETEST_DEPENDS="$ALL_WINETEST_DEPENDS ALL_WINETEST_DEPENDS="$ALL_WINETEST_DEPENDS
$testname: \$(DLLDIR)/$dir/$testname\$(DLLEXT)
cp \$(DLLDIR)/$dir/$testname\$(DLLEXT) \$@ && \$(STRIP) \$@" $testname.exe: \$(DLLDIR)/$dir/$testname.exe\$(DLLEXT)
cp \$(DLLDIR)/$dir/$testname.exe\$(DLLEXT) \$@ && \$(STRIP) \$@
$testname.rc:
echo \"$testname.exe TESTRES \\\"$testname.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
$testname.res: $testname.rc $testname.exe"
fi fi
done done

21
programs/winetest/Makefile.in
View File

@ -20,25 +20,18 @@ RC_SRCS = \
SVG_SRCS = winetest.svg SVG_SRCS = winetest.svg
@MAKE_PROG_RULES@
ALL_TEST_DIRS = @ALL_TEST_DIRS@ ALL_TEST_DIRS = @ALL_TEST_DIRS@
TESTBINS = $(ALL_TEST_DIRS:%/tests=%_test.exe) TESTBINS = $(ALL_TEST_DIRS:%/tests=%_test.exe)
TESTRCS = $(TESTBINS:.exe=.rc)
EXTRA_OBJS = $(TESTRCS:.rc=.res)
@MAKE_PROG_RULES@
@ALL_WINETEST_DEPENDS@ @ALL_WINETEST_DEPENDS@
# Special rules
winetest.res: $(TESTBINS)
tests.rc: Makefile.in $(TOPOBJDIR)/config.status
(for i in $(TESTBINS); do echo "$$i TESTRES \"$$i\""; done) >$@ || ($(RM) $@ && false)
clean:: clean::
$(RM) tests.rc dist.res winetest-dist.exe $(TESTBINS) $(RM) winetest-dist.exe $(TESTBINS) $(TESTRCS)
depend: tests.rc
# Rules for building distributable executable # Rules for building distributable executable
@ -53,5 +46,3 @@ winetest-dist.exe winetest-dist.exe.so: $(OBJS) dist.res Makefile.in
dist.res: build.nfo dist.res: build.nfo
@DEPENDENCIES@ # everything below this line is overwritten by make depend @DEPENDENCIES@ # everything below this line is overwritten by make depend
winetest.res: tests.rc

2
programs/winetest/winetest.rc
View File

@ -82,5 +82,3 @@ END
/* @makedep: winetest.ico */ /* @makedep: winetest.ico */
IDI_WINE ICON "winetest.ico" IDI_WINE ICON "winetest.ico"
#include "tests.rc"

2
tools/make_makefiles
View File

@ -74,8 +74,8 @@ my @ignores = (
"dlls/*/tests/testlist.c", "dlls/*/tests/testlist.c",
"include/config.h", "include/config.h",
"include/stamp-h", "include/stamp-h",
"programs/winetest/tests.rc",
"programs/winetest/*_test.exe", "programs/winetest/*_test.exe",
"programs/winetest/*_test.rc",
); );
# Source files and their resulting target to ignore # Source files and their resulting target to ignore