diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2006-06-13 17:02:28 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2006-06-13 17:02:28 +0000 |
| commit | 14a4962ab06743b36481aca9481758a3dd92b035 (patch) | |
| tree | 18e18f55f585a6d7b4a089b9eded04debb8e1c3e /makefile.w32-vc | |
| parent | 838911cc424dcc0c03db1e9b256965976068c1a1 (diff) | |
| download | openvpn-14a4962ab06743b36481aca9481758a3dd92b035.tar.gz openvpn-14a4962ab06743b36481aca9481758a3dd92b035.tar.xz openvpn-14a4962ab06743b36481aca9481758a3dd92b035.zip | |
-r 1026:1032
https://svn.openvpn.net/projects/openvpn/contrib/alon/BETA21/openvpn
Changes:
1. Updated makefile.w32-vc to include lladdr.*, updated
linkage libraries.
2. Modified lladdr.c to be compiled under visual C.
3. Added retry counter to PKCS#11 PIN hook.
4. Modified PKCS#11 PIN retry loop to return correct error
code when PIN is incorrect.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1038 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'makefile.w32-vc')
| -rw-r--r-- | makefile.w32-vc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/makefile.w32-vc b/makefile.w32-vc index f92dbb3..d3dac0b 100644 --- a/makefile.w32-vc +++ b/makefile.w32-vc @@ -24,7 +24,7 @@ LZO = \src\lzo-1.08.vc INCLUDE_DIRS = -I$(OPENSSL)/include -I$(LZO)/include -LIBS = lzo.lib ws2_32.lib crypt32.lib iphlpapi.lib winmm.lib gdi32.lib advapi32.lib wininet.lib +LIBS = lzo.lib ws2_32.lib crypt32.lib iphlpapi.lib winmm.lib user32.lib advapi32.lib wininet.lib LIB_DIRS = -LIBPATH:$(OPENSSL)\out -LIBPATH:$(LZO) @@ -108,6 +108,7 @@ HEADERS = \ syshead.h \ thread.h \ tun.h \ + lladdr.h \ win32.h OBJS = base64.obj \ @@ -160,6 +161,7 @@ OBJS = base64.obj \ status.obj \ thread.obj \ tun.obj \ + lladdr.obj \ win32.obj dynamic : $(OBJS) |