[igraph] Building igraph 0.6 rev 1601 with msvc9

[Chris Wj]

Hi guys. I just built igraph 0.6 from bzr rev 1601 on Windows with msvc9 (VS 2008). I had to make changes in 2 files:

diff -r igraph06_msvc_src_orig/centrality.c igraph-0.6-msvc/igraph-0.6-msvc/src/centrality.c
38a39,40
> #define M_SQRT2 1.4142135623730950488016887
> 
diff -r igraph06_msvc_src_orig/heap.c igraph-0.6-msvc/igraph-0.6-msvc/src/heap.c
854c854
< static inline void igraph_i_2wheap_switch(igraph_2wheap_t *h,
---
> static __inline void igraph_i_2wheap_switch(igraph_2wheap_t *h,
873c873
< static inline void igraph_i_2wheap_shift_up(igraph_2wheap_t *h, 
---
> static __inline void igraph_i_2wheap_shift_up(igraph_2wheap_t *h, 
883c883
< static inline void igraph_i_2wheap_sink(igraph_2wheap_t *h,
---
> static __inline void igraph_i_2wheap_sink(igraph_2wheap_t *h,

Afterwards, it built like a charm.

For reference, I did a './bootstrap.sh && ./configure && make msvc" on linux, copied over the igraph-0.6-msvc.zip and also the igraph header files to windows, loaded that up in VS 2008, applied the fixes above, and built igraph.lib.

This seemed to go well, but building the Python library, not so much. I had to monkeypatch graphobject.c because it is missing parameter 3 at line 3533:

- igraph_get_shortest_paths_dijkstra(&self->g, &ptrvec, from, igraph_vss_all(), weights, mode)) 
+ igraph_get_shortest_paths_dijkstra(&self->g, &ptrvec, &ptrvec_edges, from, igraph_vss_all(), weights, mode)) 

 as well as use the /FORCE option while building graphobject.obj because it could not resolve _igraph_assortativity_degree (and a few others).

I managed to install it in python to get the process down, but I know this hack isn't going to hold up well. Any suggestions to fix the igraph_get_shortest_paths_dijkstra call? I want to demo an analysis on Windows, but it needs some features of the 0.6 branch (like weighted calculations).

-Chris

igraph06_msvc09_diff.txt
Description: Text document