moparisthebest/hexchat
1
0
Fork 0
mirror of https://github.com/moparisthebest/hexchat synced 2024-12-22 23:58:52 -05:00
Code Issues Releases Wiki Activity

some more multiplatform support

Browse Source
This commit is contained in:
Berke Viktor 2011-12-11 18:04:35 +01:00
parent 132ef6cb50
commit 13ee029364
15 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/lua/lua.c
View File

@ -43,12 +43,12 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include "../../src/common/dirent.h"
#include <errno.h> #include <errno.h>
#include <ctype.h> #include <ctype.h>
#ifdef _WIN32 #ifdef _WIN32
#include <direct.h> /* for getcwd */ #include <direct.h> /* for getcwd */
#include "../../src/common/dirent-win32.h"
#endif #endif
#if !( defined(_WIN32) || defined(LXC_XCHAT_GETTEXT) ) #if !( defined(_WIN32) || defined(LXC_XCHAT_GETTEXT) )

2
plugins/lua/makefile.mak
View File

@ -1,6 +1,6 @@
include "..\..\src\makeinc.mak" include "..\..\src\makeinc.mak"
DIRENTLIB = ..\..\src\common\dirent.lib DIRENTLIB = ..\..\src\common\dirent-win32.lib
all: lua.obj lua.def all: lua.obj lua.def
link $(LDFLAGS) $(LIBS) /dll /out:xclua.dll $(LUALIB).lib $(DIRENTLIB) /def:lua.def lua.obj link $(LDFLAGS) $(LIBS) /dll /out:xclua.dll $(LUALIB).lib $(DIRENTLIB) /def:lua.def lua.obj

2
plugins/perl/makefile-512.mak
View File

@ -1,6 +1,6 @@
include "..\..\src\makeinc.mak" include "..\..\src\makeinc.mak"
DIRENTLIB = ..\..\src\common\dirent.lib DIRENTLIB = ..\..\src\common\dirent-win32.lib
TARGET = $(PERL512OUTPUT) TARGET = $(PERL512OUTPUT)
all: $(TARGET) all: $(TARGET)

2
plugins/perl/makefile-514.mak
View File

@ -1,6 +1,6 @@
include "..\..\src\makeinc.mak" include "..\..\src\makeinc.mak"
DIRENTLIB = ..\..\src\common\dirent.lib DIRENTLIB = ..\..\src\common\dirent-win32.lib
TARGET = $(PERL514OUTPUT) TARGET = $(PERL514OUTPUT)
all: $(TARGET) all: $(TARGET)

2
plugins/perl/perl.c
View File

@ -28,7 +28,7 @@
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
#define _INC_DIRENT /* disable inclusion of perl's dirent.h, we use an own version for win32 */ #define _INC_DIRENT /* disable inclusion of perl's dirent.h, we use an own version for win32 */
#include "../../src/common/dirent.h" #include "../../src/common/dirent-win32.h"
#else #else
#include <dirent.h> #include <dirent.h>
#endif #endif

2
plugins/python/makefile.mak
View File

@ -1,6 +1,6 @@
include "..\..\src\makeinc.mak" include "..\..\src\makeinc.mak"
DIRENTLIB = ..\..\src\common\dirent.lib DIRENTLIB = ..\..\src\common\dirent-win32.lib
TARGET = $(PYTHONOUTPUT) TARGET = $(PYTHONOUTPUT)
all: $(TARGET) all: $(TARGET)

2
plugins/python/python.c
View File

@ -57,7 +57,7 @@
#include <sys/types.h> #include <sys/types.h>
#ifdef WIN32 #ifdef WIN32
#include "../../src/common/dirent.h" #include "../../src/common/dirent-win32.h"
#include "../../config.h" #include "../../config.h"
#else #else
#include <unistd.h> #include <unistd.h>

2
src/common/dirent.c → src/common/dirent-win32.c
View File

@ -56,7 +56,7 @@
* First version. * First version.
*****************************************************************************/ *****************************************************************************/
#include "dirent.h" #include "dirent-win32.h"
/* Use the new safe string functions introduced in Visual Studio 2005 */ /* Use the new safe string functions introduced in Visual Studio 2005 */
#if defined(_MSC_VER) && _MSC_VER >= 1400 #if defined(_MSC_VER) && _MSC_VER >= 1400

0
src/common/dirent.h → src/common/dirent-win32.h
View File

10
src/common/makefile.mak
View File

@ -5,7 +5,7 @@ cfgfiles.obj \
chanopt.obj \ chanopt.obj \
ctcp.obj \ ctcp.obj \
dcc.obj \ dcc.obj \
dirent.obj \ dirent-win32.obj \
history.obj \ history.obj \
ignore.obj \ ignore.obj \
inbound.obj \ inbound.obj \
@ -27,13 +27,13 @@ userlist.obj \
util.obj \ util.obj \
xchat.obj xchat.obj
all: $(COMMON_OBJECTS) xchatcommon.lib dirent.lib all: $(COMMON_OBJECTS) xchatcommon.lib dirent-win32.lib
xchatcommon.lib: $(COMMON_OBJECTS) xchatcommon.lib: $(COMMON_OBJECTS)
lib /nologo /out:xchatcommon.lib $(COMMON_OBJECTS) lib /nologo /out:xchatcommon.lib $(COMMON_OBJECTS)
dirent.lib: dirent.obj dirent-win32.lib: dirent-win32.obj
lib /nologo /out:dirent.lib dirent.obj lib /nologo /out:dirent-win32.lib dirent-win32.obj
.c.obj:: .c.obj::
$(CC) $(CFLAGS) $(GLIB) $< $(CC) $(CFLAGS) $(GLIB) $<
@ -41,4 +41,4 @@ dirent.lib: dirent.obj
clean: clean:
@del *.obj @del *.obj
@del xchatcommon.lib @del xchatcommon.lib
@del dirent.lib @del dirent-win32.lib

4
src/common/plugin.c
View File

@ -1008,7 +1008,11 @@ xchat_get_info (xchat_plugin *ph, const char *id)
return XCHATLIBDIR; return XCHATLIBDIR;
case 0x14f51cd8: /* version */ case 0x14f51cd8: /* version */
#ifdef WIN32
return XCHAT_RELEASE; return XCHAT_RELEASE;
#else
return PACKAGE_VERSION;
#endif
case 0xdd9b1abd: /* xchatdir */ case 0xdd9b1abd: /* xchatdir */
return get_xdir_utf8 (); return get_xdir_utf8 ();

2
src/common/util.c
View File

@ -32,7 +32,7 @@
#include <sys/timeb.h> #include <sys/timeb.h>
#include <process.h> #include <process.h>
#include <io.h> #include <io.h>
#include "dirent.h" #include "dirent-win32.h"
#else #else
#include <unistd.h> #include <unistd.h>
#include <pwd.h> #include <pwd.h>

2
src/fe-gtk/about.c
View File

@ -139,7 +139,7 @@ menu_about (GtkWidget * wid, gpointer sess)
(portable_mode () ? "Yes" : "No"), (portable_mode () ? "Yes" : "No"),
get_cpu_arch () get_cpu_arch ()
#else #else
"%s\n\n" "\n%s\n\n"
"%s\n" "%s\n"
"<b>Charset</b>: %s " "<b>Charset</b>: %s "
"<b>Renderer</b>: %s\n" "<b>Renderer</b>: %s\n"

7
src/fe-gtk/fe-gtk.h
View File

@ -1,13 +1,6 @@
#include "../../config.h" #include "../../config.h"
#ifdef WIN32
/* If you're compiling this for Windows, your release is un-official
* and not condoned. Please don't use the XChat name. Make up your
* own name! */
#define DISPLAY_NAME "XChat-WDK" #define DISPLAY_NAME "XChat-WDK"
#else
#define DISPLAY_NAME "XChat"
#endif
#ifndef WIN32 #ifndef WIN32
#include <sys/types.h> #include <sys/types.h>

2
src/fe-gtk/setup.c
View File

@ -1383,7 +1383,9 @@ setup_create_color_page (void)
setup_create_other_color (_("New message:"), COL_NEW_MSG, 10, tab); setup_create_other_color (_("New message:"), COL_NEW_MSG, 10, tab);
setup_create_other_colorR (_("Away user:"), COL_AWAY, 10, tab); setup_create_other_colorR (_("Away user:"), COL_AWAY, 10, tab);
setup_create_other_color (_("Highlight:"), COL_HILIGHT, 11, tab); setup_create_other_color (_("Highlight:"), COL_HILIGHT, 11, tab);
#if defined(USE_GTKSPELL) || defined(USE_LIBSEXY)
setup_create_other_colorR (_("Spell checker:"), COL_SPELL, 11, tab); setup_create_other_colorR (_("Spell checker:"), COL_SPELL, 11, tab);
#endif
return box; return box;
} }