X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util-src%2FMakefile.win;h=7b14109776a174b3fae19581d2ef46a9ddfb0195;hb=b9b20aa3f85ac7d9c5a8b0cce21b5b490969ceaf;hp=d76aaccb84f3f16ba3a948638bbdf9676ac2c257;hpb=50c074c71bbe2569d6b7e888fe2c8c0d284fd9a4;p=prosody.git

diff --git a/util-src/Makefile.win b/util-src/Makefile.win
index d76aaccb..7b141097 100644
--- a/util-src/Makefile.win
+++ b/util-src/Makefile.win
@@ -1,7 +1,7 @@
 
 LUA_PATH=$(LUA_DEV)
-IDN_PATH=.\libidn-1.9
-OPENSSL_PATH=.\openssl-0.9.8i
+IDN_PATH=..\..\libidn-1.15
+OPENSSL_PATH=..\..\openssl-0.9.8k
 
 LUA_INCLUDE=$(LUA_PATH)\include
 LUA_LIB=$(LUA_PATH)\lib\lua5.1.lib
@@ -12,18 +12,27 @@ IDN_INCLUDE2=$(IDN_PATH)\win32\include
 OPENSSL_LIB=$(OPENSSL_PATH)\out32dll\libeay32.lib
 OPENSSL_INCLUDE=$(OPENSSL_PATH)\include
 
-all: encodings.dll hashes.dll
+CL=cl /LD /MD /nologo
 
-install: encodings.dll hashes.dll
+all: encodings.dll hashes.dll windows.dll
+
+install: encodings.dll hashes.dll windows.dll
 	copy /Y *.dll ..\util\
 
 clean:
-	del encodings.dll encodings.exp encodings.lib encodings.obj
-	del hashes.dll hashes.exp hashes.lib hashes.obj
+	del encodings.dll encodings.exp encodings.lib encodings.obj encodings.dll.manifest
+	del hashes.dll hashes.exp hashes.lib hashes.obj hashes.dll.manifest
+	del windows.dll windows.exp windows.lib windows.obj windows.dll.manifest
 
 encodings.dll: encodings.c
-	cl /LD /nologo encodings.c /I"$(LUA_INCLUDE)" /I"$(IDN_INCLUDE1)" /I"$(IDN_INCLUDE2)" /link "$(LUA_LIB)" "$(IDN_LIB)" /export:luaopen_util_encodings
+	$(CL) encodings.c /I"$(LUA_INCLUDE)" /I"$(IDN_INCLUDE1)" /I"$(IDN_INCLUDE2)" /link "$(LUA_LIB)" "$(IDN_LIB)" /export:luaopen_util_encodings
+	del encodings.exp encodings.lib encodings.obj encodings.dll.manifest
 
 hashes.dll: hashes.c
-	cl /LD /nologo hashes.c /I"$(LUA_INCLUDE)" /I"$(OPENSSL_INCLUDE)" /link "$(LUA_LIB)" "$(OPENSSL_LIB)" /export:luaopen_util_hashes
+	$(CL) hashes.c /I"$(LUA_INCLUDE)" /I"$(OPENSSL_INCLUDE)" /link "$(LUA_LIB)" "$(OPENSSL_LIB)" /export:luaopen_util_hashes
+	del hashes.exp hashes.lib hashes.obj hashes.dll.manifest
+
+windows.dll: windows.c
+	$(CL) windows.c /I"$(LUA_INCLUDE)" /link "$(LUA_LIB)" dnsapi.lib /export:luaopen_util_windows
+	del windows.exp windows.lib windows.obj windows.dll.manifest