summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--docs/templates/vc10.txt2
-rw-r--r--templates/vc10.mpd2
3 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 87a79e20..bbf94d0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 17 11:59:48 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * docs/templates/vc10.txt:
+ * templates/vc10.mpd:
+ Added debug_cmd_args and debug_work_dir as template variables
+
Mon Feb 17 11:45:32 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* templates/nmake.mpd:
diff --git a/docs/templates/vc10.txt b/docs/templates/vc10.txt
index 6455d1ad..2889a116 100644
--- a/docs/templates/vc10.txt
+++ b/docs/templates/vc10.txt
@@ -31,8 +31,10 @@ cpu_defines = Macros that are specific to a particular CPU platform.
createhotpatchableimage = Prepares an image for hotpatching (Enabled, X86Image, X64Image, ItaniumImage).
culture = Resource compiler option for the culture as a decimal language id (default 1033 = en-US).
dataexecutionprevention = Marks an executable as having been tested to be compatible with Windows Data Execution Prevention feature.
+debug_cmd_args = Commandline arguments that have to be set before debugging
debug_format = Specifies the type of debugging information generated by the compiler.
debug_prj = This is an internally used template variable to determine if the configuration originated as "Debug". In the event that the 'optimize' template variable is overridden, debug_prj allows the correct run-time library to be chosen.
+debug_work_dir = Default working directory during debugging
defines = Macros that are specific to a particular configuration.
delayloaddlls = List of DLLs (semicolon-separated) to delay load.
disablelanguageextensions = Compiler option for disabling language extensions.
diff --git a/templates/vc10.mpd b/templates/vc10.mpd
index 52162c71..42ec6154 100644
--- a/templates/vc10.mpd
+++ b/templates/vc10.mpd
@@ -94,6 +94,8 @@
<TargetName Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%if(type_is_dynamic)%><%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%else%><%if(type_is_static)%><%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%else%><%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%><%endif%><%endif%></TargetName>
<%if(type_is_static && staticname && !compares(lib_ext, .lib))%>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%lib_ext%></TargetExt>
+ <LocalDebuggerCommandArguments Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%marker(debug_cmd_args)%></LocalDebuggerCommandArguments>
+ <LocalDebuggerWorkingDirectory Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%if(debug_work_dir)%><%debug_work_dir%><%else%>$(OutDir)<%endif%></LocalDebuggerWorkingDirectory>
<%else%>
<%if(!type_is_static)%>
<%if(exename || sharedname || staticname)%>