[Crossfire-cvs] SF.net SVN: crossfire:[20435] client/trunk

[Crossfire C. r. messages. <cro...@li...>]

Revision: 20435
          http://sourceforge.net/p/crossfire/code/20435
Author:   partmedia
Date:     2017-07-23 19:34:29 +0000 (Sun, 23 Jul 2017)
Log Message:
-----------
Update Windows build

Modified Paths:
--------------
    client/trunk/CMakeLists.txt
    client/trunk/common/client.c
    client/trunk/common/script.h
    client/trunk/gtk-v2/src/CMakeLists.txt
    client/trunk/gtk-v2/src/config.c
    client/trunk/gtk-v2/src/main.c

Modified: client/trunk/CMakeLists.txt
===================================================================
--- client/trunk/CMakeLists.txt	2017-07-23 19:03:35 UTC (rev 20434)
+++ client/trunk/CMakeLists.txt	2017-07-23 19:34:29 UTC (rev 20435)
@@ -17,8 +17,7 @@
     add_definitions(-D_BSD_SOURCE)
 elseif(MINGW OR WIN32)
     add_definitions(-DWIN32)
-    find_library(WSOCK32_LIBRARY wsock32)
-    find_library(WINMM_LIBRARY winmm)
+    set(CMAKE_INSTALL_PREFIX ".")
 endif()
 
 include(GNUInstallDirs)

Modified: client/trunk/common/client.c
===================================================================
--- client/trunk/common/client.c	2017-07-23 19:03:35 UTC (rev 20434)
+++ client/trunk/common/client.c	2017-07-23 19:34:29 UTC (rev 20435)
@@ -271,6 +271,7 @@
 
     GSocket *socket = g_socket_connection_get_socket(csocket.fd);
     int i = 1, fd = g_socket_get_fd(socket);
+#ifndef WIN32
 #ifdef HAVE_GIO_GNETWORKING_H
     if (use_config[CONFIG_FASTTCP]) {
         if (setsockopt(fd, SOL_TCP, TCP_NODELAY, &i, sizeof(i)) == -1) {
@@ -278,6 +279,7 @@
         }
     }
 #endif
+#endif
     in = g_io_stream_get_input_stream(G_IO_STREAM(csocket.fd));
 }
 

Modified: client/trunk/common/script.h
===================================================================
--- client/trunk/common/script.h	2017-07-23 19:03:35 UTC (rev 20434)
+++ client/trunk/common/script.h	2017-07-23 19:34:29 UTC (rev 20435)
@@ -57,10 +57,8 @@
 #ifdef WIN32
 void script_killall(void);
 #endif
-#ifndef WIN32
 void script_fdset(int *maxfd,fd_set *set);
 void script_process(fd_set *set);
-#endif
 void script_watch(const char *cmd, const guint8 *data, const int len, const enum CmdFormat format);
 void script_monitor(const char *command, int repeat, int must_send);
 void script_monitor_str(const char *command);

Modified: client/trunk/gtk-v2/src/CMakeLists.txt
===================================================================
--- client/trunk/gtk-v2/src/CMakeLists.txt	2017-07-23 19:03:35 UTC (rev 20434)
+++ client/trunk/gtk-v2/src/CMakeLists.txt	2017-07-23 19:34:29 UTC (rev 20435)
@@ -38,9 +38,4 @@
     ${X11_LIBRARIES}
 )
 
-if(WIN32)
-    target_link_libraries(crossfire-client-gtk2
-        ${WSOCK32_LIBRARY} ${WINMM_LIBRARY})
-endif()
-
 install(TARGETS crossfire-client-gtk2 DESTINATION ${CMAKE_INSTALL_BINDIR})

Modified: client/trunk/gtk-v2/src/config.c
===================================================================
--- client/trunk/gtk-v2/src/config.c	2017-07-23 19:03:35 UTC (rev 20434)
+++ client/trunk/gtk-v2/src/config.c	2017-07-23 19:34:29 UTC (rev 20435)
@@ -716,6 +716,7 @@
     if (IS_DIFFERENT(CONFIG_FASTTCP)) {
 #ifdef TCP_NODELAY
 #ifndef WIN32
+        // TODO: Merge with setsockopt code from client.c
         int q = want_config[CONFIG_FASTTCP];
 
         if (csocket.fd &&
@@ -722,14 +723,6 @@
                 setsockopt(csocket.fd, SOL_TCP, TCP_NODELAY, &q, sizeof(q)) == -1) {
             perror("TCP_NODELAY");
         }
-#else
-        int q = want_config[CONFIG_FASTTCP];
-
-        if (csocket.fd &&
-                setsockopt(csocket.fd, SOL_TCP, TCP_NODELAY, (const char *)&q,
-                           sizeof(q)) == -1) {
-            perror("TCP_NODELAY");
-        }
 #endif
 #endif
         use_config[CONFIG_FASTTCP] = want_config[CONFIG_FASTTCP];

Modified: client/trunk/gtk-v2/src/main.c
===================================================================
--- client/trunk/gtk-v2/src/main.c	2017-07-23 19:03:35 UTC (rev 20434)
+++ client/trunk/gtk-v2/src/main.c	2017-07-23 19:34:29 UTC (rev 20435)
@@ -22,9 +22,7 @@
 #include <gtk/gtk.h>
 #include <stdbool.h>
 
-#ifdef WIN32
-#include <windows.h>
-#else
+#ifndef WIN32
 #include <signal.h>
 #endif
 
@@ -90,8 +88,6 @@
 bool next_tick = false;
 
 #ifdef WIN32 /* Win32 scripting support */
-#define PACKAGE_DATA_DIR "."
-
 static int do_scriptout() {
     script_process(NULL);
     return (TRUE);
@@ -293,15 +289,6 @@
 
 #ifdef WIN32
     maxfd = 0; /* This is ignored on win32 platforms */
-
-    /* This is required for sockets to be used under win32 */
-    WORD Version = 0x0202;
-    WSADATA wsaData;
-
-    if (WSAStartup(Version, &wsaData) != 0) {
-        LOG(LOG_CRITICAL, "main.c::main", "Could not load winsock!");
-        exit(1);
-    }
 #else /* def WIN32 */
     signal(SIGPIPE, SIG_IGN);
 #ifdef HAVE_SYSCONF

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.