# HG changeset patch # User Waqas Hussain <waqas20@gmail.com> # Date 1227804571 -18000 # Node ID 722f63c70a7712ab67b8a97fdef1781457fcd478 # Parent 4089b62b510cd0493ffb55703394f94229e498cb Makefile now works on windows with Microsoft's compiler diff -r 4089b62b510c -r 722f63c70a77 util-src/Makefile --- a/util-src/Makefile Thu Nov 27 21:47:13 2008 +0500 +++ b/util-src/Makefile Thu Nov 27 21:49:31 2008 +0500 @@ -1,3 +1,7 @@ + +!IFDEF WINDIR +!INCLUDE Makefile.win +!ELSE LUA_INCLUDE=/usr/include/lua5.1 LUA_LIB=lua5.1 @@ -22,3 +26,4 @@ hashes.so: hashes.c gcc -shared hashes.c -I$(LUA_INCLUDE) -l$(LUA_LIB) -l$(OPENSSL_LIB) -o hashes.so +!ENDIF diff -r 4089b62b510c -r 722f63c70a77 util-src/Makefile.win --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-src/Makefile.win Thu Nov 27 21:49:31 2008 +0500 @@ -0,0 +1,29 @@ + +LUA_PATH=$(LUA_DEV) +IDN_PATH=.\libidn-1.9 +OPENSSL_PATH=.\openssl-0.9.8i + +LUA_INCLUDE=$(LUA_PATH)\include +LUA_LIB=$(LUA_PATH)\lib\lua5.1.lib + +IDN_LIB=$(IDN_PATH)\win32\lib\libidn.lib +IDN_INCLUDE1=$(IDN_PATH)\lib +IDN_INCLUDE2=$(IDN_PATH)\win32\include +OPENSSL_LIB=$(OPENSSL_PATH)\out32dll\libeay32.lib +OPENSSL_INCLUDE=$(OPENSSL_PATH)\include + +all: encodings.dll hashes.dll + +install: encodings.dll hashes.dll + copy /Y *.dll ..\util\ + +clean: + del encodings.dll encodings.exp encodings.lib encodings.obj + del hashes.dll hashes.exp hashes.lib hashes.obj + +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 + +hashes.dll: hashes.c + cl /LD /nologo hashes.c /I"$(LUA_INCLUDE)" /I"$(OPENSSL_INCLUDE)" /link "$(LUA_LIB)" "$(OPENSSL_LIB)" /export:luaopen_util_hashes +