diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2001-01-23 19:51:46 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2001-01-23 19:51:46 +0000 |
| commit | 0d706f523465b6f00816a5eca3c43c40e79a45fd (patch) | |
| tree | 23eaef35d2c143697ba106158278eeb27208e328 /test | |
| parent | 4c5c42d1a6f4b56bac116dff7e80659404f1d362 (diff) | |
| download | libapr-0d706f523465b6f00816a5eca3c43c40e79a45fd.tar.gz | |
A little more effort to make these tests compile on windows ... a long
way yet to go to make this build cleanly.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@61105 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test')
| -rw-r--r-- | test/MakeWin32Make.pl | 10 | ||||
| -rw-r--r-- | test/aprtest.dsw | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/test/MakeWin32Make.pl b/test/MakeWin32Make.pl index 062a1d814..a0c6318f2 100644 --- a/test/MakeWin32Make.pl +++ b/test/MakeWin32Make.pl @@ -3,12 +3,14 @@ use IO::File; $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 @@ while ($t = <$srcfl>) { 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|) { diff --git a/test/aprtest.dsw b/test/aprtest.dsw index a0228e52a..6d2d700a7 100644 --- a/test/aprtest.dsw +++ b/test/aprtest.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 5.00 ############################################################################### -Project: "aprlib"="..\aprlib.dsp" - Package Owner=<4> +Project: "apr"="..\apr.dsp" - Package Owner=<4> Package=<5> {{{ @@ -26,6 +26,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name aprlib End Project Dependency + Begin Project Dependency + Project_Dep_Name apr + End Project Dependency }}} ############################################################################### |