diff options
| author | James H. Hill <hilljh82@gmail.com> | 2010-01-02 16:38:33 +0000 |
|---|---|---|
| committer | James H. Hill <hilljh82@gmail.com> | 2010-01-02 16:38:33 +0000 |
| commit | 95c25eef9f5c102b318f946acebbf16e8fcbd944 (patch) | |
| tree | d011fa2c3a5444a97fff28bd28cf3f372d02ddb2 | |
| parent | 5c692ad1c376d39bd001285a30138e465b41e04d (diff) | |
| download | MPC-95c25eef9f5c102b318f946acebbf16e8fcbd944.tar.gz | |
Sat Jan 2 16:37:15 UTC 2010 James H. Hill <hillj at cs dot iupui dot edu>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | config/odbc.mpb | 2 | ||||
| -rw-r--r-- | templates/wix.mpd | 10 |
3 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Sat Jan 2 16:37:15 UTC 2010 James H. Hill <hillj at cs dot iupui dot edu> + + * config/odbc.mpb: + + Fixed comment in iODBC section. + Mon Dec 21 18:55:57 UTC 2009 Chad Elliott <elliott_c@ociweb.com> * modules/AutomakeWorkspaceCreator.pm: diff --git a/config/odbc.mpb b/config/odbc.mpb index b1873dd0..58e91f6a 100644 --- a/config/odbc.mpb +++ b/config/odbc.mpb @@ -26,7 +26,7 @@ feature(unixodbc) { } feature(iodbc) { - // Support for UnixODBC (http://www.iodbc.org). This is one + // Support for iODBC (http://www.iodbc.org). This is one // variant of porting ODBC to non-Windows systems. avoids += unixodbc diff --git a/templates/wix.mpd b/templates/wix.mpd index dac6cb07..6a7f40e6 100644 --- a/templates/wix.mpd +++ b/templates/wix.mpd @@ -10,11 +10,19 @@ <Component Id="<%project_name%>" Guid="<%guid%>"> <%marker(component_top)%> -<%if(sharedname || staticname || exename)%> +<%if(install_binary(1))%> <File Id="file.<%project_name%>" Name="<%if(type_is_dynamic)%><%sharedname%>.dll<%else%><%exename%>.exe<%endif%>" Source="<%source_directory%>/<%if(type_is_dynamic)%><%sharedname%>.dll<%else%><%exename%>.exe<%endif%>" DiskId="<%diskid(1)%>" /> <%endif%> +<%if(install_resources)%> +<%foreach(resource_files)%> + <File Id="file.resource.<%resource_file%>" Name="<%resource_file%>" + Source="<%full_path(resource_file)%>" + DiskId="<%diskid(1)%>" /> + +<%endfor%> +<%endif%> <%if(gme_install)%> <!-- registry information for GME component --> |