You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2001/01/23 20:51:53 UTC
cvs commit: apr/test MakeWin32Make.pl aprtest.dsw
wrowe 01/01/23 11:51:51
Modified: test MakeWin32Make.pl aprtest.dsw
Log:
A little more effort to make these tests compile on windows ... a long
way yet to go to make this build cleanly.
Revision Changes Path
1.5 +6 -4 apr/test/MakeWin32Make.pl
Index: MakeWin32Make.pl
===================================================================
RCS file: /home/cvs/apr/test/MakeWin32Make.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MakeWin32Make.pl 2001/01/23 06:00:40 1.4
+++ MakeWin32Make.pl 2001/01/23 19:51:43 1.5
@@ -3,12 +3,14 @@
$srcfl = new IO::File "Makefile.in", "r" || die "failed to open .in file";
$dstfl = new IO::File "Makefile", "w" || die "failed to create Makefile";
-print $dstfl "LINK=link.exe\n";
-
while ($t = <$srcfl>) {
if ($t =~ m|\@INCLUDE_RULES\@|) {
- $t = "ALL: \$(TARGETS)\n";
+ $t = "ALL: \$(TARGETS)\n\n"
+ . "CL = cl.exe\n"
+ . "LINK = link.exe /nologo /debug /machine:I386\n\n"
+ . ".c.obj::\n"
+ . "\t\$(CL) -c \$*.c \$(CFLAGS)\n";
}
if ($t =~ m|^ALL_LIBS=|) {
$t = "ALL_LIBS=../LibD/apr.lib kernel32\.lib user32\.lib advapi32\.lib ws2_32\.lib wsock32\.lib ole32\.lib";
@@ -16,7 +18,7 @@
if ($t =~ s|\@CFLAGS\@|\/nologo \/MDd \/W3 \/Gm \/GX \/Zi \/Od \/D "_DEBUG" \/D "WIN32" \/D APR_DECLARE_STATIC \/FD|) {
$t =~ s|-g ||;
}
- $t =~ s|\@LDFLAGS\@|\/nologo \/debug \/machine:I386|;
+ $t =~ s|\@LDFLAGS\@||;
$t =~ s|\@RM\@|del|;
if ($t =~ s|(\$\(RM\)) -f|$1|) {
1.2 +4 -1 apr/test/aprtest.dsw
Index: aprtest.dsw
===================================================================
RCS file: /home/cvs/apr/test/aprtest.dsw,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aprtest.dsw 2000/12/04 22:26:52 1.1
+++ aprtest.dsw 2001/01/23 19:51:46 1.2
@@ -3,7 +3,7 @@
###############################################################################
-Project: "aprlib"="..\aprlib.dsp" - Package Owner=<4>
+Project: "apr"="..\apr.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -25,6 +25,9 @@
{{{
Begin Project Dependency
Project_Dep_Name aprlib
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name apr
End Project Dependency
}}}