[commit] r2548 - trunk/Install

[GMESRC Repository Notifications]

Author: ksmyth
Date: Thu Oct  9 12:40:46 2014
New Revision: 2548

Log:
Fix C:\Users\kevin\Documents\GME not being set, regression from 2545

Modified:
   trunk/Install/GME_bin.wxs

Modified: trunk/Install/GME_bin.wxs
==============================================================================
--- trunk/Install/GME_bin.wxs	Wed Oct  8 14:01:03 2014	(r2547)
+++ trunk/Install/GME_bin.wxs	Thu Oct  9 12:40:46 2014	(r2548)
@@ -43,8 +43,8 @@
           <RegistryValue Name='Version' Type='string' Value='$(var.VERSIONSTR)' />
         </RegistryKey>
         <RegistryKey Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\App Paths\GME.exe'>
-          <RegistryValue Type='string' Value='[INSTALLDIR]GME.exe'/>
-          <RegistryValue Name='Path' Type='string' Value='[INSTALLDIR]'/>
+          <RegistryValue Type='string' Value='[INSTALLDIR$(sys.BUILDARCH)]GME.exe'/>
+          <RegistryValue Name='Path' Type='string' Value='[INSTALLDIR$(sys.BUILDARCH)]'/>
         </RegistryKey>
 
         <ProgId Id='GME.mgafile$(sys.BUILDARCH)' Description='GME project file'>
@@ -71,7 +71,7 @@
         <Registry Id='GME.mgafile_desc' Root='HKCR' Key='GME.mgafile' Action='write' Type='string' Value='GME model file' />
         <Registry Id='GME.xmefile_desc' Root='HKCR' Key='GME.xmefile' Action='write' Type='string' Value='GME XML model file' />
         <Registry Id='GME.xmefile_icon' Root='HKCR' Key='GME.xmefile\DefaultIcon' Action='write' Type='string' Value='[#GME.exe$(sys.BUILDARCH)],5' />
-        <Environment Id="GME_ROOT" Action="set" System="yes" Name="GME_ROOT" Value="[INSTALLDIR]" />
+        <Environment Id="GME_ROOT" Action="set" System="yes" Name="GME_ROOT" Value="[INSTALLDIR$(sys.BUILDARCH)]" />
         <RemoveFolder Id='RemoveShortcutFolder' On='uninstall' Directory='ShortcutFolder'/>
         <?endif?>
       </Component>