diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2006-11-01 00:07:21 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2006-11-01 00:07:21 +0000 |
| commit | 1d89886e00a36788cf16d1c5de9cca224074edcf (patch) | |
| tree | 4a377c091d927368dcde5678f8e6157aca333f03 /makefile.w32-vc | |
| parent | 23459088101f33c894d0628a311d125d4a7bb11a (diff) | |
| download | openvpn-1d89886e00a36788cf16d1c5de9cca224074edcf.tar.gz openvpn-1d89886e00a36788cf16d1c5de9cca224074edcf.tar.xz openvpn-1d89886e00a36788cf16d1c5de9cca224074edcf.zip | |
Merged Alon's branch:v2.1_rc1
svn merge -r1322:1392 https://svn.openvpn.net/projects/openvpn/contrib/alon/21rc/openvpn .
Version 2.1_rc1 released
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1420 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'makefile.w32-vc')
| -rw-r--r-- | makefile.w32-vc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/makefile.w32-vc b/makefile.w32-vc index d3dac0b..92f7013 100644 --- a/makefile.w32-vc +++ b/makefile.w32-vc @@ -24,17 +24,18 @@ 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 user32.lib advapi32.lib wininet.lib +LIBS = lzo.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) EXE = openvpn.exe CPP=cl.exe +CPP_ARG_COMMON=/nologo /W3 /G5 /O2 -DWIN32 -DWIN32_LEAN_AND_MEAN -D_CONSOLE -D_MBCS -D_CRT_SECURE_NO_DEPRECATE $(INCLUDE_DIRS) /FD /c # release: -CPP_PROJ=/nologo /MD /W3 /G5 /O2 -DNDEBUG -DWIN32 -DWIN32_LEAN_AND_MEAN -D_CONSOLE -D_MBCS $(INCLUDE_DIRS) /FD /c +CPP_PROJ=$(CPP_ARG_COMMON) /MD -DNDEBUG # debug: -#CPP_PROJ=/nologo /MDd /W3 /G5 /Zi /Od -D_DEBUG -DWIN32 -DWIN32_LEAN_AND_MEAN -D_CONSOLE -D_MBCS $(INCLUDE_DIRS) /FD /c +#CPP_PROJ=$(CPP_ARG_COMMON) /MDd /Zi /Od -D_DEBUG LINK32=link.exe # release: |