[svn:parrot] r40521 - in trunk: . config/init/hints

[jonathan at svn.parrot.org]

Author: jonathan
Date: Thu Aug 13 11:11:45 2009
New Revision: 40521
URL: https://trac.parrot.org/parrot/changeset/40521

Log:
[config][install] A couple of fixes to make installed Parrot work out better for Win32 and MSVC++. With this plus some tweaks in Rakudo, Rakudo now builds on an installable Parrot on this platform.

Modified:
   trunk/MANIFEST.generated
   trunk/config/init/hints/mswin32.pm

Modified: trunk/MANIFEST.generated
==============================================================================
--- trunk/MANIFEST.generated	Thu Aug 13 10:30:42 2009	(r40520)
+++ trunk/MANIFEST.generated	Thu Aug 13 11:11:45 2009	(r40521)
@@ -48,6 +48,7 @@
 include/parrot/vtable.h                           [main]include
 install_config.fpmc                               [main]lib
 src/install_config.o                              [main]lib
+src/install_config.obj                            [main]lib
 installable_parrot_config.exe                     [main]bin
 installable_parrot_config                         [main]bin
 installable_parrot_debugger.exe                   [main]bin
@@ -64,6 +65,7 @@
 installable_pbc_to_exe                            [main]bin
 lib/Parrot/Config/Generated.pm                    [devel]lib
 libparrot.dll                                     [main]bin
+libparrot.lib                                     [main]bin
 lib/Parrot/OpLib/core.pm                          [devel]lib
 lib/Parrot/Pmc2c/PCCMETHOD_BITS.pm                [devel]lib
 lib/Parrot/PMC.pm                                 [devel]lib

Modified: trunk/config/init/hints/mswin32.pm
==============================================================================
--- trunk/config/init/hints/mswin32.pm	Thu Aug 13 10:30:42 2009	(r40520)
+++ trunk/config/init/hints/mswin32.pm	Thu Aug 13 11:11:45 2009	(r40521)
@@ -114,6 +114,8 @@
         # Unclear if it's needed both for ld and link.
         $conf->data->set( libparrot_ldflags   => "\"$build_dir\\libparrot.lib\"" );
         $conf->data->set( libparrot_linkflags   => "\"$build_dir\\libparrot.lib\"" );
+        $conf->data->set( inst_libparrot_ldflags   => "\"$bindir\\libparrot.lib\"" );
+        $conf->data->set( inst_libparrot_linkflags   => "\"$bindir\\libparrot.lib\"" );
 
         # 'link' needs to be link.exe, not cl.exe.
         # This makes 'link' and 'ld' the same.