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/03/31 09:54:48 UTC
cvs commit: apr/test MakeWin32Make.pl
wrowe 01/03/30 23:54:48
Modified: test MakeWin32Make.pl
Log:
This gets us nmake'ing on win32
Revision Changes Path
1.7 +4 -4 apr/test/MakeWin32Make.pl
Index: MakeWin32Make.pl
===================================================================
RCS file: /home/cvs/apr/test/MakeWin32Make.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MakeWin32Make.pl 2001/01/28 23:23:20 1.6
+++ MakeWin32Make.pl 2001/03/31 07:54:47 1.7
@@ -9,8 +9,8 @@
$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";
+ . "#.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";
@@ -18,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\@||;
+ $t =~ s|\$\{LD_FLAGS\}||;
$t =~ s|\.\./libapr\.la|../LibD/apr.lib|;
$t =~ s|\@RM\@|del|;
@@ -38,7 +38,7 @@
$t =~ s|--export-dynamic ||;
$t =~ s|-fPIC ||;
}
- if ($t =~ s|--module|\/subsystem:windows \/dll|) {
+ if ($t =~ s|-shared|\/subsystem:windows \/dll|) {
$t =~ s|-o (\S+)|\/out:\"$1\"|;
}
while ($t =~ s|\.a\b|\.lib|) {}