changes needed to build win32 marketmaker with MSVC 2015

DeckerSU · Nov 10, 2017 · 23a4df1 · 23a4df1
1 parent a67a72f
commit 23a4df1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/OSlibs/win/mingw.h b/OSlibs/win/mingw.h
@@ -61,13 +61,18 @@
  * @remarks - #if (defined(_M_X64) || defined(__amd64__)) && defined(WIN32)
  *     is equivalent to #if defined(_M_X64) as _M_X64 is defined for MSVC only
  */
-#if !defined(_M_X64)
-struct pollfd {
-    SOCKET fd;        /* file descriptor */
-    short events;     /* requested events */
-    short revents;    /* returned events */
-};
-#endif
+
+
+// [Decker] pollfs is already defined in winsock2.h
+
+//#if !defined(_M_X64)
+//struct pollfd {
+    //SOCKET fd;        /* file descriptor */
+    //short events;     /* requested events */
+    //short revents;    /* returned events */
+//};
+//#endif
+
 
 #if defined(_M_X64)
 /*

diff --git a/marketmaker.vcxproj b/marketmaker.vcxproj
@@ -130,6 +130,7 @@
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>Ws2_32.lib;Advapi32.lib;$(SolutionDir)OSlibs\win\release\pthreadVC2.lib;libcurl.lib;nanomsg.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">