Added support for MSVC debugging of openvpn.exe in settings.in:

  # Build debugging version of openvpn.exe
  !define PRODUCT_OPENVPN_DEBUG

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@6283 e7ae566f-a301-0410-adde-c780ea21d3b5

diff --git a/win/config.py b/win/config.py
index 67c1d82e2c54129c1f8820c3828795e762f67b4d..cf38cac17318b53be503c4cbf37bc4670c192a8b 100644 (file)
--- a/win/config.py
+++ b/win/config.py
@@ -9,6 +9,7 @@ def main(config):
                out_fn=home_fn('msvc.mak'),\r
                quote_begin='@',\r
                quote_end='@',\r
+               if_prefix='!',\r
                head_comment='# %s\n\n' % autogen)\r
 \r
 # if we are run directly, and not loaded as a module\r

diff --git a/win/msvc.mak.in b/win/msvc.mak.in
index 3f8102af1bc2d14cc365603cd91e6bb7bd37e006..5d94a6eb99285c837dcff6e7298f7922c3d76803 100644 (file)
--- a/win/msvc.mak.in
+++ b/win/msvc.mak.in
@@ -23,17 +23,22 @@ LIB_DIRS = -LIBPATH:$(OPENSSL)\lib -LIBPATH:$(LZO)\lib
 EXE = openvpn.exe\r
 \r
 CPP=cl.exe\r
-CPP_ARG_COMMON=/nologo /W3 /O2 -DWIN32 -DWIN32_LEAN_AND_MEAN -D_CONSOLE -D_MBCS -D_CRT_SECURE_NO_DEPRECATE $(INCLUDE_DIRS) /FD /c\r
-# release:\r
-CPP_PROJ=$(CPP_ARG_COMMON) /MD -DNDEBUG\r
-# debug:\r
-#CPP_PROJ=$(CPP_ARG_COMMON) /MDd /Zi /Od -D_DEBUG\r
+CPP_ARG_COMMON=/nologo /W3 -DWIN32 -DWIN32_LEAN_AND_MEAN -D_CONSOLE -D_MBCS -D_CRT_SECURE_NO_DEPRECATE $(INCLUDE_DIRS) /FD /c\r
 \r
 LINK32=link.exe\r
-# release:\r
-LINK32_FLAGS=/nologo /subsystem:console /incremental:no /out:"$(EXE)"\r
+\r
+!ifdef PRODUCT_OPENVPN_DEBUG\r
 # debug:\r
+CPP_PROJ=$(CPP_ARG_COMMON) /MD /Z7\r
+LINK32_FLAGS=/nologo /subsystem:console /incremental:no /opt:ref /opt:icf /debug /out:"$(EXE)"\r
+# old debug:\r
+#CPP_PROJ=$(CPP_ARG_COMMON) /MDd /Zi /Od -D_DEBUG\r
 #LINK32_FLAGS=/nologo /subsystem:console /incremental:no /debug /out:"$(EXE)"\r
+!else\r
+# release:\r
+CPP_PROJ=$(CPP_ARG_COMMON) /O2 /MD -DNDEBUG\r
+LINK32_FLAGS=/nologo /subsystem:console /incremental:no /out:"$(EXE)"\r
+!endif\r
 \r
 # HEADERS and OBJS definitions, automatically generated\r
 @HEADERS_OBJS@\r

diff --git a/win/settings.in b/win/settings.in
index 044834ab5fef31e04a8edd6bc5e143fc99065c20..0e1bb1cb94b68063f935b8e106916214306a7be4 100644 (file)
--- a/win/settings.in
+++ b/win/settings.in
@@ -40,6 +40,9 @@
 # Build debugging version of TAP driver
 ;!define PRODUCT_TAP_DEBUG
 
+# Build debugging version of openvpn.exe
+;!define PRODUCT_OPENVPN_DEBUG
+
 # DDK path -- currently Windows 7 WDK
 !define DDK_PATH "c:/winddk/7600.16385.1"
 ;!define DDK_PATH "c:/winddk/6001.18002"