summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames H. Hill <hilljh82@gmail.com>2011-12-17 21:41:33 +0000
committerJames H. Hill <hilljh82@gmail.com>2011-12-17 21:41:33 +0000
commita21102c834ca8534e7ace9bf68b294455df4ec66 (patch)
tree89644ee4fb14623aaba2523faca4a8b34984d308
parent7c153aaef26f0ab582b353007a7be7b982010acc (diff)
downloadMPC-a21102c834ca8534e7ace9bf68b294455df4ec66.tar.gz
Sat Dec 17 21:40:53 UTC 2011 James H. Hill <hillj at cs dot iupui dot edu>
-rw-r--r--ChangeLog7
-rw-r--r--templates/wix.mpd2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 210d5266..f12bab11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Dec 17 21:40:53 UTC 2011 James H. Hill <hillj at cs dot iupui dot edu>
+
+ * templates/wix.mpd:
+
+ Added support for using the use_lib_modifier setting for
+ the non-extended template.
+
Sat Dec 17 21:11:08 UTC 2011 James H. Hill <hillj at cs dot iupui dot edu>
* config/udm.mpb:
diff --git a/templates/wix.mpd b/templates/wix.mpd
index 3a740e5b..9ce76b2c 100644
--- a/templates/wix.mpd
+++ b/templates/wix.mpd
@@ -152,7 +152,7 @@
<Component Id="<%project_name%><%foreach(name, install_location)%>.<%name%><%endfor%>.<%if(type_is_dynamic)%><%normalize(sharedname)%>.dll<%else%><%normalize(exename)%>.exe<%endif%>" Guid="*">
<File Id="<%project_name%>_<%if(type_is_dynamic)%><%normalize(sharedname)%>_dll<%else%><%normalize(exename)%>_exe<%endif%>"
Name="<%if(type_is_dynamic)%><%sharedname%>.dll<%else%><%exename%>.exe<%endif%>"
- Source="<%source_directory%>/<%if(type_is_dynamic)%><%sharedname%>.dll<%else%><%exename%>.exe<%endif%>"
+ Source="<%source_directory%>/<%if(type_is_dynamic)%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.dll<%else%><%exename%>.exe<%endif%>"
DiskId="<%diskid(1)%>" />
</Component>
<%foreach(name, install_location)%>