Browse Source

changed appx to be x86 version

scott brogden 8 years ago
parent
commit
1159c2761b
3 changed files with 7 additions and 7 deletions
  1. 3 1
      Addins/DittoUtil/DittoUtil.vcxproj
  2. 3 3
      DittoSetup/BuildDitto.bld
  3. 1 3
      DittoSetup/DittoSetup_10.iss

+ 3 - 1
Addins/DittoUtil/DittoUtil.vcxproj

@@ -189,7 +189,9 @@ copy $(TargetDir)*.dll $(SolutionDir)Debug64\Addins</Command>
       <MkTypLibCompatible>false</MkTypLibCompatible>
     </Midl>
     <PostBuildEvent>
-      <Command>copy $(TargetDir)*.dll $(SolutionDir)Release\Addins</Command>
+      <Command>mkdir $(SolutionDir)Release
+mkdir $(SolutionDir)Release\Addins
+copy $(TargetDir)*.dll $(SolutionDir)Release\Addins</Command>
     </PostBuildEvent>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+ 3 - 3
DittoSetup/BuildDitto.bld

@@ -253,11 +253,11 @@ DittoSetup*]]></ExclExt>
 			<LogDetail type='11'>-1</LogDetail>
 			<PathInfo type='11'>-1</PathInfo>
 			<Recurse type='11'>-1</Recurse>
-			<Source>%workDir%\DittoSetup\Output\DittoPortable_64bit_%versionFileName%.zip</Source>
+			<Source>%workDir%\DittoSetup\Output\DittoPortable_%versionFileName%.zip</Source>
 			<SysOn type='11'>-1</SysOn>
 			<buildfailsteps type='11'>0</buildfailsteps>
 			<indent type='3'>2</indent>
-			<name>extraxt 64bit Portable</name>
+			<name>extraxt x86 Portable</name>
 		</step>
 		<step action='Write File'>
 			<BOM type='11'>-1</BOM>
@@ -344,7 +344,7 @@ DittoSetup*]]></ExclExt>
    xmlns:desktop2="http://schemas.microsoft.com/appx/manifest/desktop/windows10/2"
    IgnorableNamespaces="desktop2">
   <Identity Name="60145ScottBrogden.ditto-cp"
-    ProcessorArchitecture="x64"
+    ProcessorArchitecture="x86"
     Publisher="CN=2032816C-0EBD-4FA0-8832-B8289B21D4F4"
     Version="%version%" />
   <Properties>

+ 1 - 3
DittoSetup/DittoSetup_10.iss

@@ -72,9 +72,7 @@ Name: AddFireWallException; Description: Add Windows Firewall exception for Ditt
 #endif
 #ifndef bit64
 	Source: ..\Release\Ditto.exe; DestDir: {app}; DestName: Ditto.exe; Flags: ignoreversion; AfterInstall: AddProgramToFirewall(ExpandConstant('{app}\Ditto.exe'), 'Ditto_FromInstaller_32');
-
-
-	Source: ..\Addins\DittoUtil\Release\DittoUtil.dll; DestDir: {app}\Addins; Flags: ignoreversion
+  Source: ..\Release\Addins\DittoUtil.dll; DestDir: {app}\Addins; Flags: ignoreversion
 	Source: mfc-crt\vcredist_x86_2017.exe; Flags: dontcopy;
   Source: ..\Release\icuuc58.dll; DestDir: {app}; Flags: ignoreversion
   Source: ..\Release\icuin58.dll; DestDir: {app}; Flags: ignoreversion