Merge pull request #11 from vanous/mingw64

small changes for mingw64
OpenLightingProject · Oct 31, 2015 · ba9e7ee · ba9e7ee
2 parents 4e63da4 + d66d823
commit ba9e7ee
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/README b/README
@@ -2,4 +2,13 @@
 Libartnet is an implementation of the ArtNet protocol. ArtNet allows the
 transmission of DMX and related data over IP networks.
 
-For installation notes see the INSTALL file.
+For installation notes see the INSTALL file. Run autoreconf -fi to create configure scripts.
+
+Building libartnet with mingw-w64:
+
+set up mingw-w64 (and possibly MSYS).
+
+for a 64-bit build: --host=x86_64-w64-mingw32
+for a 32-bit build: --host=i686-w64-mingw32
+
+./configure ac_cv_func_malloc_0_nonnull=yes  ac_cv_func_realloc_0_nonnull=yes --host=x86_64-w64-mingw32 --prefix=/some/path/prefix
diff --git a/artnet/artnet.h b/artnet/artnet.h
@@ -28,7 +28,7 @@
 #ifndef WIN32
 #include <sys/select.h>
 #else
-#include <Winsock2.h>
+#include <winsock2.h>
 typedef unsigned long in_addr_t;
 #endif
 

diff --git a/artnet/network.c b/artnet/network.c
@@ -28,7 +28,7 @@
 #else
 typedef int socklen_t;
 #include <winsock2.h>
-#include <Lm.h>
+#include <lm.h>
 #include <iphlpapi.h>
 #endif
 

diff --git a/artnet/private.h b/artnet/private.h
@@ -445,7 +445,11 @@ typedef struct {
  * The main node structure
  */
 typedef struct artnet_node_s{
+  #ifdef WIN32
+  SOCKET sd;
+  #else
   int sd;                  // the two sockets
+  #endif
   node_state_t state;      // the state struct
   node_callbacks_t callbacks;  // the callbacks struct
   struct ports_s {