enabled the x64 and x32 release build for WiX installer, and tweaked …

…the output path slightly
sylikc · Mar 12, 2022 · 4f0a84e · 4f0a84e
1 parent 738bec0
commit 4f0a84e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/JPEGView.Setup/JPEGView.Setup.wixproj b/JPEGView.Setup/JPEGView.Setup.wixproj
@@ -10,12 +10,12 @@
     <OutputType>Package</OutputType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
@@ -68,6 +68,9 @@
   <ItemGroup>
     <Content Include="res\License.rtf" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="res\" />
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">

diff --git a/JPEGView.sln b/JPEGView.sln
@@ -52,7 +52,9 @@ Global
 		{A24D997C-CDFA-431F-96DD-4C414DAED38D}.Debug|x64.ActiveCfg = Debug|x64
 		{A24D997C-CDFA-431F-96DD-4C414DAED38D}.Debug|x64.Build.0 = Debug|x64
 		{A24D997C-CDFA-431F-96DD-4C414DAED38D}.Release|Win32.ActiveCfg = Release|x86
-		{A24D997C-CDFA-431F-96DD-4C414DAED38D}.Release|x64.ActiveCfg = Release|x86
+		{A24D997C-CDFA-431F-96DD-4C414DAED38D}.Release|Win32.Build.0 = Release|x86
+		{A24D997C-CDFA-431F-96DD-4C414DAED38D}.Release|x64.ActiveCfg = Release|x64
+		{A24D997C-CDFA-431F-96DD-4C414DAED38D}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE