mirror of
https://github.com/weechat/weechat.git
synced 2026-06-29 06:16:40 +02:00
Fix compilation under Cygwin (patch #6916)
This commit is contained in:
@@ -1,12 +1,13 @@
|
||||
WeeChat ChangeLog
|
||||
=================
|
||||
FlashCode <flashcode@flashtux.org>
|
||||
v0.3.1-dev, 2009-10-02
|
||||
v0.3.1-dev, 2009-10-04
|
||||
|
||||
|
||||
Version 0.3.1 (under dev!)
|
||||
--------------------------
|
||||
|
||||
* core: fix compilation under Cygwin (patch #6916)
|
||||
* core: fix cmake directories: let user customize lib, share, locale and include
|
||||
directories (patch #6922)
|
||||
* core: fix plural form in translation files (bug #27430)
|
||||
|
||||
@@ -45,6 +45,9 @@ netbsd*)
|
||||
solaris*)
|
||||
LDFLAGS="$LDFLAGS -lsocket -lxnet"
|
||||
;;
|
||||
cygwin*)
|
||||
LDFLAGS="$LDFLAGS -no-undefined"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Gettext
|
||||
|
||||
@@ -1967,7 +1967,7 @@ config_weechat_init_options ()
|
||||
N_("standard plugins extension in filename (for example "
|
||||
"\".so\" under Linux or \".dll\" under Microsoft Windows)"),
|
||||
NULL, 0, 0,
|
||||
#ifdef WIN32
|
||||
#if defined(WIN32) || defined(__CYGWIN__)
|
||||
".dll",
|
||||
#else
|
||||
".so",
|
||||
|
||||
@@ -897,7 +897,7 @@ network_connect_with_fork (struct t_hook *hook_connect)
|
||||
any suggestion is welcome to improve that!
|
||||
*/
|
||||
network_connect_child (hook_connect);
|
||||
network_connect_child_read_cb (hook_connect);
|
||||
network_connect_child_read_cb (hook_connect, 0);
|
||||
#else
|
||||
switch (pid = fork ())
|
||||
{
|
||||
|
||||
@@ -54,6 +54,14 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
|
||||
ENDIF(HAVE_BACKTRACE)
|
||||
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
|
||||
|
||||
IF(ICONV_LIBRARY)
|
||||
LIST(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
|
||||
ENDIF(ICONV_LIBRARY)
|
||||
|
||||
IF(LIBINTL_LIBRARY)
|
||||
LIST(APPEND EXTRA_LIBS ${LIBINTL_LIBRARY})
|
||||
ENDIF(LIBINTL_LIBRARY)
|
||||
|
||||
ADD_EXECUTABLE(${EXECUTABLE} ${WEECHAT_CURSES_SRC})
|
||||
|
||||
INCLUDE_DIRECTORIES(.. ../../core ../../plugins)
|
||||
|
||||
@@ -28,6 +28,10 @@
|
||||
#include <curses.h>
|
||||
#endif
|
||||
|
||||
#ifdef __CYGWIN__
|
||||
#include <sys/termios.h>
|
||||
#endif
|
||||
|
||||
struct t_gui_buffer;
|
||||
struct t_gui_window;
|
||||
struct t_gui_bar_window;
|
||||
|
||||
@@ -36,6 +36,14 @@ IF(PKG_CONFIG_FOUND)
|
||||
ENDIF(GTK2_FOUND)
|
||||
ENDIF(PKG_CONFIG_FOUND)
|
||||
|
||||
IF(ICONV_LIBRARY)
|
||||
LIST(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
|
||||
ENDIF(ICONV_LIBRARY)
|
||||
|
||||
IF(LIBINTL_LIBRARY)
|
||||
LIST(APPEND EXTRA_LIBS ${LIBINTL_LIBRARY})
|
||||
ENDIF(LIBINTL_LIBRARY)
|
||||
|
||||
ADD_EXECUTABLE(${EXECUTABLE} ${WEECHAT_GTK_SRC})
|
||||
|
||||
INCLUDE_DIRECTORIES(.. ../../core ../../plugins)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -31,6 +31,7 @@ struct t_gui_bar_item;
|
||||
struct t_gui_completion;
|
||||
struct t_infolist;
|
||||
struct t_weelist;
|
||||
struct timeval;
|
||||
|
||||
/* API version (used to check that plugin has same API and can be loaded) */
|
||||
#define WEECHAT_PLUGIN_API_VERSION "20090614-02"
|
||||
|
||||
Reference in New Issue
Block a user