gemini support soon

git-svn-id: file:///raid/svn-main/nishi-libw3/trunk@200 d27a3e52-49c5-7645-884c-6793ebffc270

diff --git a/Library/Gemini.c b/Library/Gemini.c
new file mode 100644 (file)
index 0000000..d7e6857
--- /dev/null
+++ b/Library/Gemini.c
@@ -0,0 +1,5 @@
+/* $Id$ */
+#include "W3Gemini.h"
+
+void __W3_Gemini_Request(struct W3* w3){
+}

diff --git a/Library/Makefile b/Library/Makefile
index cebef7f3aa0c0e25cd8e02731f0e3db5b7e0c166..f7a659244e7b6dbb4e220f7d1c35c315cf1c0848 100644 (file)
--- a/Library/Makefile
+++ b/Library/Makefile
@@ -6,6 +6,9 @@ OBJS = ./Core.o ./Util.o ./DNS.o ./HTTP.o ./Gopher.o ./POP3.o ./File.o ./URL.o .
 ifeq ($(TCL),YES)
 OBJS += ./Tcl.o
 endif
+ifeq ($(SSL),YES)
+OBJS += ./Gemini.o
+endif
 
 ifeq ($(WINDOWS),YES)
 ./w3.dll: $(OBJS)

diff --git a/Library/W3Gemini.h b/Library/W3Gemini.h
new file mode 100644 (file)
index 0000000..c4508a1
--- /dev/null
+++ b/Library/W3Gemini.h
@@ -0,0 +1,17 @@
+/* $Id$ */
+#ifndef __W3GEMINI_H__
+#define __W3GEMINI_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "W3Core.h"
+
+void __W3_Gemini_Request(struct W3* w3);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

diff --git a/Makefile b/Makefile
index 081446f5f5b7f5bdd900a860c07e9fdddaa1a55b..7234eb3533c6e900e33b549b1d4d226957a8d566 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -86,7 +86,7 @@ ALL := ./Library/w3.dll ./Example
 all: ./Library/W3Version.h ./w3.pc $(ALL)
 
 ./Library/w3.dll:
-       $(MAKE) -C ./Library CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" WINDOWS=YES WINARCH=$(WINARCH) TCL=$(TCL)
+       $(MAKE) -C ./Library CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" WINDOWS=YES WINARCH=$(WINARCH) TCL=$(TCL) SSL=$(SSL)
 
 ./Example: ./Library/w3.dll
        $(MAKE) -C ./Example CC=$(CC) TCL=$(TCL) TCL_LIBS="$(TCL_LIBS)" TCL_CFLAGS="$(TCL_CFLAGS)" examples SUFFIX=.exe
@@ -103,10 +103,10 @@ ALL := ./Library/libw3.so ./Library/libw3.a ./Example
 all: ./Library/W3Version.h ./w3.pc $(ALL)
 
 ./Library/libw3.so:
-       $(MAKE) -C ./Library CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" TCL=$(TCL) ./libw3.so
+       $(MAKE) -C ./Library CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" TCL=$(TCL) SSL=$(SSL) ./libw3.so
 
 ./Library/libw3.a:
-       $(MAKE) -C ./Library CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" TCL=$(TCL) ./libw3.a
+       $(MAKE) -C ./Library CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" TCL=$(TCL) SSL=$(SSL) ./libw3.a
 
 ./Example: ./Library/libw3.so
        $(MAKE) -C ./Example CC=$(CC) TCL_LIBS="$(TCL_LIBS)" TCL_CFLAGS="$(TCL_CFLAGS)" TCL=$(TCL) examples

diff --git a/W3Version.h.p b/W3Version.h.p
index b047f48794575733b73148cdd93111a6f2cdb066..d9d972211b37d11d8f7626462729376c1258edb9 100644 (file)
--- a/W3Version.h.p
+++ b/W3Version.h.p
@@ -6,7 +6,7 @@
 extern "C" {
 #endif
 
-#define LIBW3_VERSION "2.4C" \
+#define LIBW3_VERSION "2.5" \
 SUFFIX
 
 #ifdef __cplusplus