Removed custom plat var, disabled wixpdb

riverar · Jan 27, 2015 · b939c45 · b939c45
1 parent 3271add
commit b939c45
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/code/installer/Installer.wixproj b/code/installer/Installer.wixproj
@@ -13,7 +13,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>..\..\bin\x86\debug\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>Debug;platform=x86</DefineConstants>
+    <DefineConstants>Debug;</DefineConstants>
     <LinkerAdditionalOptions>-ext WixUtilExtension -ext WixUIExtension</LinkerAdditionalOptions>
     <WixVariables>
     </WixVariables>
@@ -29,15 +29,17 @@
     <LinkerAdditionalOptions>-ext WixUtilExtension -ext WixUIExtension -cultures:en-us</LinkerAdditionalOptions>
     <WixVariables>
     </WixVariables>
-    <DefineConstants>platform=x86</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <SuppressAllWarnings>False</SuppressAllWarnings>
     <Pedantic>True</Pedantic>
     <SuppressIces>ICE03</SuppressIces>
+    <SuppressPdbOutput>True</SuppressPdbOutput>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <OutputPath>..\..\bin\x64\debug\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>Debug;platform=x64</DefineConstants>
+    <DefineConstants>Debug;</DefineConstants>
     <LinkerAdditionalOptions>-ext WixUtilExtension -ext WixUIExtension</LinkerAdditionalOptions>
     <WixVariables>
     </WixVariables>
@@ -53,11 +55,13 @@
     <LinkerAdditionalOptions>-ext WixUtilExtension -ext WixUIExtension -cultures:en-us</LinkerAdditionalOptions>
     <WixVariables>
     </WixVariables>
-    <DefineConstants>platform=x64</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <SuppressAllWarnings>False</SuppressAllWarnings>
     <Pedantic>True</Pedantic>
     <SuppressIces>ICE03</SuppressIces>
     <SuppressValidation>False</SuppressValidation>
+    <SuppressPdbOutput>True</SuppressPdbOutput>
   </PropertyGroup>
   <ItemGroup>
     <None Include="Conditions.wxs" />

diff --git a/code/installer/Product.wxs b/code/installer/Product.wxs
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
-  <?if $(var.platform)="x64" ?>
+  <?if $(var.Platform) = x64 ?>
     <?define platformalt = amd64 ?>
     <?define systemfolder = System64Folder ?>
   <?else?>
     <?define platformalt = x86 ?>
     <?define systemfolder = SystemFolder ?>
-  <?endif?>
+  <?endif?> 
 
   <Product Id="*" Name="UxStyle" Language="1033" Version="0.2.4.1" Manufacturer="The Within Network, LLC" UpgradeCode="D6C38ADD-C2C7-42E8-BC0F-81FD70947B03">
 
@@ -21,12 +21,12 @@
 
     <Directory Id="TARGETDIR" Name="SourceDir">
 
-      <Merge Id="msvc11_crt" DiskId="1" Language="1033" SourceFile="msm\Microsoft_VC120_CRT_$(var.platform).msm" />
+      <Merge Id="msvc11_crt" DiskId="1" Language="1033" SourceFile="msm\Microsoft_VC120_CRT_$(var.Platform).msm" />
 
       <Directory Id="WindowsFolder" Name="Windows">
 
         <Component>
-          <File Source="..\..\bin\$(var.platform)\$(var.Configuration)\unsignedthemes.exe" />
+          <File Source="..\..\bin\$(var.Platform)\$(var.Configuration)\unsignedthemes.exe" />
 
           <ServiceInstall Id="UnsignedThemes_ServiceInstall" Name="UnsignedThemes" Type="ownProcess" LoadOrderGroup="AudioGroup" Start="auto" DisplayName="Unsigned Themes"
                           Description="Enables the use of unsigned third-party themes." ErrorControl="ignore" />
@@ -41,7 +41,7 @@
           <Directory Id="Drivers" Name="Drivers">
 
             <Component>
-              <File Source="..\..\bin\driver\$(var.platformalt)\uxstyle.sys" />
+              <File Source="..\..\bin\driver\$(var.platformalt)\elytsxu.sys" />
             </Component>
 
           </Directory>
@@ -52,7 +52,7 @@
     <Feature Id="Core" Title="Unsigned Themes Service" Level="1">
       <MergeRef Id="msvc11_crt" />
 
-      <ComponentRef Id="uxstyle.sys" />
+      <ComponentRef Id="elytsxu.sys" />
       <ComponentRef Id="unsignedthemes.exe" />
     </Feature>