Re[2]: [lmi] the rest of MSVC compilation patch

[Vadim Zeitlin]

On Thu, 21 Aug 2008 13:59:18 +0000 Greg Chicares <address@hidden> wrote:

GC> [On 2008-07-12 19:27Z, Vadim Zeitlin had written:]
GC> > 
GC> >  For now, let me attach all the changes done in my local msvc branch.
GC> 
GC> I've updated your patch and attached a new version below, omitting
GC> all files that were completely new. Please confirm that, with this
GC> patch (and the completely-new files that you already have), lmi
GC> compiles and links with msvc.

 I've just tested this patch and it's almost enough to build MSVC
successfully but there are 2 other small changes which need to be done to
remove the "almost":

1. This one is simply to allow building LMI using static wx libraries, it's
   not really MSVC-specific:

--- wx_new.hpp  2008-01-01 18:30:08 +0000
+++ wx_new.hpp  2008-08-26 22:30:25 +0000
@@ -40,7 +40,7 @@
 #   elif defined LMI_WX_NEW_USE_SO
 #       define LMI_WX_NEW_SO __declspec(dllimport)
 #   else  // !defined LMI_WX_NEW_BUILD_SO && !defined LMI_WX_NEW_USE_SO
-#       error Either LMI_WX_NEW_BUILD_SO or LMI_WX_NEW_USE_SO must be defined.
+#       define LMI_WX_NEW_SO
 #   endif // !defined LMI_WX_NEW_BUILD_SO && !defined LMI_WX_NEW_USE_SO
 #else  // !defined HAVE_CONFIG_H && !defined LMI_MSW
 #   error Unknown platform and build system.

I'm not sure if you want to accept it and it's not a problem for us to keep
it locally (it's already part of our mainline version, in fact, and it
didn't appear in the patches I sent you because it wasn't modified at all
in my msvc branch).

2. This one is more mysterious but is needed in order to fix link errors
   related to missing MultiDimTable symbols:

--- tier_view.cpp       2008-02-17 15:17:16 +0000
+++ tier_view.cpp       2008-08-26 22:50:29 +0000
@@ -30,6 +30,7 @@

 #include "multidimgrid_any.hpp"
 #include "multidimgrid_tools.hpp"
+#include "multidimgrid_safe.tpp"
 #include "safely_dereference_as.hpp"
 #include "stratified_charges.hpp"
 #include "stratified_charges.xpp"

Also notice that VC gives me warnings about removing "unreferenced" (its
term, not mine) MultiDimTable methods declared, but not implemented, in
multidimgrid_safe.hpp (DoGet/SetValueAny(), StringToValue() and
ValueToString()) so it clearly has a problem with .hpp/.tpp split but,
again, I can live with this provided the above patch is applied to make it
link.

 No other changes are needed to make the latest cvs HEAD build with MSVC.

 Thanks!
VZ