Fixed build issues - fixes #51

mika76 · Jun 3, 2019 · 8cc835c · 8cc835c · deergod1 · Jul 24, 2019
1 parent 1558489
commit 8cc835c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/Mamesaver.sln b/Mamesaver.sln
@@ -30,8 +30,8 @@ Global
 		{720F7E49-8C21-43F8-8946-8D16D68BF839}.Repack|Any CPU.Build.0 = Repack|Any CPU
 		{896ED757-66C2-4C7E-9323-FC5D9CC7B7D2}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{896ED757-66C2-4C7E-9323-FC5D9CC7B7D2}.Release|Any CPU.ActiveCfg = Release|x86
-		{896ED757-66C2-4C7E-9323-FC5D9CC7B7D2}.Release|Any CPU.Build.0 = Release|x86
-		{896ED757-66C2-4C7E-9323-FC5D9CC7B7D2}.Repack|Any CPU.ActiveCfg = Release|x86
+		{896ED757-66C2-4C7E-9323-FC5D9CC7B7D2}.Repack|Any CPU.ActiveCfg = Repack|x86
+		{896ED757-66C2-4C7E-9323-FC5D9CC7B7D2}.Repack|Any CPU.Build.0 = Repack|x86
 		{98F0D731-FC1C-4659-8EEB-7489331621D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{98F0D731-FC1C-4659-8EEB-7489331621D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{98F0D731-FC1C-4659-8EEB-7489331621D6}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/Mamesaver/Mamesaver.csproj b/Mamesaver/Mamesaver.csproj
@@ -314,6 +314,7 @@
   </Target>
   <Target Name="CreateScreensaver" AfterTargets="CleanReferenceCopyLocalPaths">
     <Message Text="Creating screensaver" Importance="High" />
-    <Exec Command="copy $(TargetPath) $(TargetDir)\$(TargetName).scr" />
+    <Delete Files="$(TargetDir)$(TargetName).scr" />
+    <Copy SourceFiles="$(TargetDir)$(TargetName).exe" DestinationFiles="$(TargetDir)$(TargetName).scr" OverwriteReadOnlyFiles="true" />
   </Target>
 </Project>
diff --git a/MamesaverDeploy/MamesaverDeploy.wixproj b/MamesaverDeploy/MamesaverDeploy.wixproj
@@ -8,7 +8,8 @@
     <OutputName>Mamesaver</OutputName>
     <OutputType>Package</OutputType>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
-    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>  </PropertyGroup>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <OutputPath>bin\Debug\</OutputPath>
     <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
@@ -18,8 +19,25 @@
     <OutputPath>bin\Release\</OutputPath>
     <IntermediateOutputPath>obj\Release\</IntermediateOutputPath>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Repack' ">
+    <OutputPath>bin\Repack\</OutputPath>
+    <IntermediateOutputPath>obj\Repack\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Repack|x86' ">
+    <OutputPath>bin\Repack\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="MamesaverDeploy.wxs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Mamesaver\Mamesaver.csproj">
+      <Name>Mamesaver</Name>
+      <Project>{720f7e49-8c21-43f8-8946-8d16d68bf839}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
 </Project>
diff --git a/MamesaverDeploy/MamesaverDeploy.wxs b/MamesaverDeploy/MamesaverDeploy.wxs
@@ -13,7 +13,7 @@
       <Directory Id="SystemFolder">
 
         <Component Id="ProductComponent" Guid="e7ac086a-a6bc-4115-af4c-0a7f1aa2bd0f">
-          <File Id="Mamesaver" Name="Mamesaver.scr" Source="..\..\..\Mamesaver\bin\Release\Mamesaver.scr" />
+          <File Id="Mamesaver" Name="$(var.Mamesaver.TargetName).scr" Source="$(var.Mamesaver.TargetDir)$(var.Mamesaver.TargetName).scr" DiskId="1" />
         </Component>
 
       </Directory>