fix dylib load

git-svn-id: file:///raid/svn-personal/tewi/trunk@25 8739d7e6-ffea-ec47-b151-bdff447c6205

diff --git a/Makefile b/Makefile
index 490eddbe334a3de22a1196df2c94a84d1f8062f7..423bb44a255f459e04cb29158dee7bd0822c9e35 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,8 @@ PWD = `pwd`
 PLATFORM = generic
 PREFIX = /usr/local
 
+include Platform/$(PLATFORM).mk
+
 FLAGS = PWD=$(PWD) PLATFORM=$(PLATFORM) PREFIX=$(PREFIX)
 
 .PHONY: all format clean ./Server ./Common ./Module

diff --git a/Platform/win64.mk b/Platform/win64.mk
index 0871d401ee9928fbec7d6b27f3a98313255c13f1..b353c38ec41d859c378c3f24cd105ab03cea8b02 100644 (file)
--- a/Platform/win64.mk
+++ b/Platform/win64.mk
@@ -1,5 +1,7 @@
 # $Id$
 
+PREFIX = C:/Tewi
+
 CC = x86_64-w64-mingw32-gcc
 AR = x86_64-w64-mingw32-ar
 CFLAGS = -g -std=c99 -DPREFIX=\"$(PREFIX)\" -I $(PWD)/Common -I $(PWD)/openssl/include

diff --git a/Server/module.c b/Server/module.c
index c7fda36779d80baa0190ae0c02d22e7178e30ef0..f4e6db76bd0ca28a9b0a1545e3aca7f16bcc3b8f 100644 (file)
--- a/Server/module.c
+++ b/Server/module.c
@@ -27,7 +27,7 @@ void* tw_module_load(const char* path) {
 #ifdef __MINGW32__
        lib = LoadLibraryA(path);
 #else
-       lib = dlopen(path, DL_LAZY);
+       lib = dlopen(path, RTLD_LAZY);
 #endif
        if(lib == NULL) {
                cm_log("Module", "Could not load %s", path);

diff --git a/example.conf b/example.conf
index 8e0ec305ae4ba431b4be5240b844d3742c662e4b..a40fbbea0727fa4bd0bb3e3ad3581098c11a7aa4 100644 (file)
--- a/example.conf
+++ b/example.conf
@@ -3,8 +3,9 @@
 
 #LoadModule /home/nishi/SVN/tewi/trunk/Module/mod_example.so
 
-Listen 80
-ListenSSL 443
+Listen 8000
+#Listen 80
+#ListenSSL 443
 
 SSLKey key.pem
 SSLCertificate cert.pem