diff options
Diffstat (limited to '')
| -rwxr-xr-x | makefile.w32 | 12 | ||||
| -rw-r--r-- | makefile.w32-vc | 12 |
2 files changed, 14 insertions, 10 deletions
diff --git a/makefile.w32 b/makefile.w32 index 3179420..1623ec8 100755 --- a/makefile.w32 +++ b/makefile.w32 @@ -40,21 +40,23 @@ #OPENSSL_DIR = #LZO_DIR = #DMALLOC_DIR = +#PKCS11_HELPER_DIR = + ######################################################### CC = gcc -g -O2 -Wall -Wno-unused-function -Wno-unused-variable -mno-cygwin CC_DMALLOC = gcc -g -O2 -Wall -Wno-unused-function -Wno-unused-variable -mno-cygwin -fno-inline -DDMALLOC -INCLUDE_DIRS = -I${OPENSSL_DIR}/include -I${LZO_DIR}/include +INCLUDE_DIRS = -I${OPENSSL_DIR}/include -I${LZO_DIR}/include -I${PKCS11_HELPER_DIR}/include INCLUDE_DIRS_DMALLOC = ${INCLUDE_DIRS} -I${DMALLOC_DIR} -LIBS = -llzo2 -lcrypt32 -lWinInet -lws2_32 -lgdi32 -liphlpapi -lwinmm +LIBS = -llzo2 -lcrypt32 -lWinInet -lws2_32 -lgdi32 -liphlpapi -lwinmm -lpkcs11-helper LIBS_DMALLOC = ${LIBS} -ldmalloc -LIB_DIRS = -L${OPENSSL_DIR}/out -L${LZO_DIR} +LIB_DIRS = -L${OPENSSL_DIR}/out -L${LZO_DIR} -L${PKCS11_HELPER_DIR}/lib LIB_DIRS_DMALLOC = ${LIB_DIRS} -L${DMALLOC_DIR} @@ -98,7 +100,7 @@ HEADERS = \ ntlm.h \ occ-inline.h \ occ.h \ - pkcs11.h pkcs11-helper.h cryptoki.h \ + pkcs11.h \ openvpn.h \ openvpn-plugin.h \ options.h \ @@ -154,7 +156,7 @@ OBJS = base64.o \ multi.o \ ntlm.o \ occ.o \ - pkcs11.o pkcs11-helper.o \ + pkcs11.o \ openvpn.o \ options.o \ otime.o \ diff --git a/makefile.w32-vc b/makefile.w32-vc index 92f7013..addf9da 100644 --- a/makefile.w32-vc +++ b/makefile.w32-vc @@ -22,11 +22,13 @@ OPENSSL_DYNAMIC = libeay32.lib ssleay32.lib LZO = \src\lzo-1.08.vc -INCLUDE_DIRS = -I$(OPENSSL)/include -I$(LZO)/include +PKCS11_HELPER = \src\pkcs11-helper-1.02 -LIBS = lzo.lib ws2_32.lib crypt32.lib iphlpapi.lib winmm.lib user32.lib gdi32.lib advapi32.lib wininet.lib +INCLUDE_DIRS = -I$(OPENSSL)/include -I$(LZO)/include -I$(PKCS11_HELPER)/include -LIB_DIRS = -LIBPATH:$(OPENSSL)\out -LIBPATH:$(LZO) +LIBS = lzo.lib libpkcs11-helper-1.lib ws2_32.lib crypt32.lib iphlpapi.lib winmm.lib user32.lib gdi32.lib advapi32.lib wininet.lib + +LIB_DIRS = -LIBPATH:$(OPENSSL)\out -LIBPATH:$(LZO) -LIBPATH:$(PKCS11_HELPER)\lib EXE = openvpn.exe @@ -82,7 +84,7 @@ HEADERS = \ ntlm.h \ occ-inline.h \ occ.h \ - pkcs11.h pkcs11-helper.h cryptoki.h \ + pkcs11.h \ openvpn.h \ openvpn-plugin.h \ options.h \ @@ -138,7 +140,7 @@ OBJS = base64.obj \ multi.obj \ ntlm.obj \ occ.obj \ - pkcs11.obj pkcs11-helper.obj \ + pkcs11.obj \ openvpn.obj \ options.obj \ otime.obj \ |