summary refs log tree commit diff stats
path: root/plugins/python
diff options
context:
space:
mode:
authorberkeviktor@aol.com <berkeviktor@aol.com>2011-04-16 19:33:59 +0200
committerberkeviktor@aol.com <berkeviktor@aol.com>2011-04-16 19:33:59 +0200
commit4950155eb67d219b9d0ab04728573714a01526a4 (patch)
tree41c0e519d336f477e651894ac154f77bc8e1cf84 /plugins/python
parentca434e0e7af61a9c8d911dd79eeec03789f012ae (diff)
parenta032b3b995bf33b65e575b64784edfff7236f616 (diff)
Merge with default
Diffstat (limited to 'plugins/python')
-rw-r--r--plugins/python/makefile.mak25
-rw-r--r--plugins/python/python.c6
2 files changed, 28 insertions, 3 deletions
diff --git a/plugins/python/makefile.mak b/plugins/python/makefile.mak
new file mode 100644
index 00000000..8cbba3f5
--- /dev/null
+++ b/plugins/python/makefile.mak
@@ -0,0 +1,25 @@
+include "..\..\src\makeinc.mak"
+
+DIRENTLIB = ..\..\src\common\dirent.lib
+TARGET = $(PYTHONOUTPUT)
+
+all: $(TARGET)
+
+python.def:
+	echo EXPORTS > python.def
+	echo xchat_plugin_init >> python.def
+	echo xchat_plugin_deinit >> python.def
+	echo xchat_plugin_get_info >> python.def
+
+python.obj: python.c
+	$(CC) $(CFLAGS) /I.. /Dusleep=_sleep /DPATH_MAX=255 python.c $(GLIB) /I$(PYTHONPATH)\include /DPYTHON_DLL=\"$(PYTHONLIB).dll\"
+
+$(TARGET): python.obj python.def
+	$(LINK) /dll /out:$(TARGET) $(LDFLAGS) python.obj /libpath:$(PYTHONPATH)\libs $(PYTHONLIB).lib $(DIRENTLIB) $(LIBS) /def:python.def
+
+clean:
+	del $(TARGET)
+	del *.obj
+	del python.def
+	del *.lib
+	del *.exp
diff --git a/plugins/python/python.c b/plugins/python/python.c
index fd682082..55adf989 100644
--- a/plugins/python/python.c
+++ b/plugins/python/python.c
@@ -53,10 +53,10 @@
 
 #include <glib.h>
 #include <string.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#include <dirent.h>
+#include "../../src/common/dirent.h"
+#include "../../config.h"
 
 #include "xchat-plugin.h"
 #include "Python.h"
@@ -68,7 +68,7 @@
 
 #ifdef WIN32
 #undef WITH_THREAD /* Thread support locks up xchat on Win32. */
-#define VERSION "0.8/2.4"	/* Linked to python24.dll */
+#define VERSION "0.8/2.7"	/* Linked to python27.dll */
 #else
 #define VERSION "0.8"
 #endif