[svn:parrot] r34155 - in branches/vc9: config/init/hints lib/Parrot/Configure/Options lib/Parrot/Configure/Options/Conf

Author: rblasch
Date: Sat Dec 20 11:11:31 2008
New Revision: 34155

Modified:
   branches/vc9/config/init/hints/mswin32.pm
   branches/vc9/lib/Parrot/Configure/Options/Conf.pm
   branches/vc9/lib/Parrot/Configure/Options/Conf/Shared.pm

Log:
Don't rely on CFLAGS pulled in from Perl.
Added --with-debug-crt, for linking to the Debug CRT.


Modified: branches/vc9/config/init/hints/mswin32.pm
==============================================================================
--- branches/vc9/config/init/hints/mswin32.pm	(original)
+++ branches/vc9/config/init/hints/mswin32.pm	Sat Dec 20 11:11:31 2008
@@ -38,6 +38,18 @@
     }
 
     if ($is_msvc) {
+        my ($md, $msvcrt);
+        if ($conf->options->get('with-debug-crt')) {
+            $md = '-MDd';
+            $msvcrt = 'msvcrtd.lib';
+        }
+        else {
+            $md = '-MD';
+            $msvcrt = 'msvcrt.lib';
+        }
+
+        $ccflags = "-nologo $md -GF -Zi -GS -RTCcsu -DWIN32";
+        $libs = "$msvcrt kernel32.lib ws2_32.lib";
 
         # Check the output of cl.exe to see if it contains the
         # string 'Standard' and remove the -O1 option if it does.
@@ -81,8 +93,9 @@
             ld_share_flags      => '-dll',
             ld_load_flags       => '-dll',
             ld_out              => '-out:',
+            linkflags           => '-nologo -nodefaultlib',
             ldflags             => '-nologo -nodefaultlib',
-            libs                => 'kernel32.lib ws2_32.lib msvcrt.lib oldnames.lib ',
+            libs                => $libs,
             libparrot_static    => 'libparrot' . $conf->data->get('a'),
             libparrot_shared    => 'libparrot$(SHARE_EXT)',
             ar_flags            => '',

Modified: branches/vc9/lib/Parrot/Configure/Options/Conf.pm
==============================================================================
--- branches/vc9/lib/Parrot/Configure/Options/Conf.pm	(original)
+++ branches/vc9/lib/Parrot/Configure/Options/Conf.pm	Sat Dec 20 11:11:31 2008
@@ -102,6 +102,7 @@
    --without-gmp        Build parrot without GMP support
    --without-opengl     Build parrot without OpenGL support (GL/GLU/GLUT)
    --without-pcre       Build parrot without pcre support
+   --with-debug-crt     Build parrot with the Debug CRT (Visual C++)
 
 ICU Options:
 

Modified: branches/vc9/lib/Parrot/Configure/Options/Conf/Shared.pm
==============================================================================
--- branches/vc9/lib/Parrot/Configure/Options/Conf/Shared.pm	(original)
+++ branches/vc9/lib/Parrot/Configure/Options/Conf/Shared.pm	Sat Dec 20 11:11:31 2008
@@ -74,6 +74,7 @@
     without-opengl
     without-pcre
     without-icu
+    with-debug-crt
     yacc
 };
 

• [svn:parrot] r34155 - in branches/vc9: config/init/hints lib/Parrot/Configure/Options lib/Parrot/Configure/Options/Conf by rblasch