Compile for x86 and other changes

libertyernie · Apr 26, 2015 · 84b8de6 · 84b8de6
1 parent fbb208e
commit 84b8de6
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 22 deletions.
diff --git a/BrawlManagerLib/BrawlManagerLib.csproj b/BrawlManagerLib/BrawlManagerLib.csproj
@@ -49,10 +49,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BrawlLib, Version=0.21.5511.36882, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\Desktop\BrawlHacks\BrawlBox\BrawlLib.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -151,6 +147,12 @@
       <DependentUpon>TextBoxDialog.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\brawltools\BrawlLib\BrawlLib.csproj">
+      <Project>{462d0bbf-ce82-405b-8848-2f91e9e14c55}</Project>
+      <Name>BrawlLib</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>

diff --git a/SSSEditor/SSSEditor.csproj b/SSSEditor/SSSEditor.csproj
@@ -54,10 +54,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BrawlLib, Version=0.21.5485.34141, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\Desktop\BrawlHacks\BrawlBox\BrawlLib.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -148,6 +144,10 @@
     <Content Include="uparr.png" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\brawltools\BrawlLib\BrawlLib.csproj">
+      <Project>{462d0bbf-ce82-405b-8848-2f91e9e14c55}</Project>
+      <Name>BrawlLib</Name>
+    </ProjectReference>
     <ProjectReference Include="..\BrawlManagerLib\BrawlManagerLib.csproj">
       <Project>{b5d693d8-3952-44f9-8952-8c1af74f0634}</Project>
       <Name>BrawlManagerLib</Name>

diff --git a/SSSEditor/SSSEditor.txt b/SSSEditor/SSSEditor.txt
@@ -18,7 +18,10 @@ Changes in 3.5.1:
 	* GCT files with no Custom SSS code will no longer be corrupted when saving
 	* SSS Editor will remove any GCT metadata saved by BrawlBox when saving
 	  (instead of leaving invalid data behind)
+	* Progress window waits half a second to close (avoids having it appear
+	  and not go away)
 	* Built against BrawlLib 0.22b (Brawlbox 0.75b)
+	* All files compiled for x86 (32-bit)
 
 Changes in 3.5:
 	* Progress windows added while loading the SSS

diff --git a/SSSEditor/SSSEditorForm.cs b/SSSEditor/SSSEditorForm.cs
@@ -6,6 +6,8 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace SSSEditor {
@@ -66,7 +68,7 @@ public partial class SSSEditorForm : Form {
 
 			tabControl1.Selecting += (o, e) => {
 				if (e.TabPage == tabDefinitions || e.TabPage == tabSSS1 || e.TabPage == tabSSS2) {
-					new System.Threading.Tasks.Task(() => {
+					new Task(() => {
 						ProgressWindow pw = new ProgressWindow();
 						StagePairControl.GlobalProgressWindow = pw;
 						pw.MaxValue = e.TabPage.Controls[0].Controls.Count;
@@ -76,10 +78,13 @@ public partial class SSSEditorForm : Form {
 			};
 
 			tabControl1.SelectedIndexChanged += (o, e) => {
-				if (StagePairControl.GlobalProgressWindow != null) {
-					StagePairControl.GlobalProgressWindow.BeginInvoke(new Action(StagePairControl.GlobalProgressWindow.Close));
-					StagePairControl.GlobalProgressWindow = null;
-				}
+				new Task(() => {
+					Thread.Sleep(500);
+					if (StagePairControl.GlobalProgressWindow != null) {
+						StagePairControl.GlobalProgressWindow.BeginInvoke(new Action(StagePairControl.GlobalProgressWindow.Close));
+						StagePairControl.GlobalProgressWindow = null;
+					}
+				}).Start();
 			};
 		}
 

diff --git a/SongManager/BrawlSongManager.txt b/SongManager/BrawlSongManager.txt
@@ -12,6 +12,7 @@ Changes in 3.5.1:
 	* Song Manager will remove any GCT metadata saved by BrawlBox when saving
 	  (instead of leaving invalid data behind)
 	* Built against BrawlLib 0.22b (Brawlbox 0.75b)
+	* All files compiled for x86 (32-bit)
 
 Changes in 3.5:
 	* New feature: import/export all custom songs along with volume and title

diff --git a/SongManager/SongManager.csproj b/SongManager/SongManager.csproj
@@ -71,10 +71,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BrawlLib, Version=0.21.5485.34141, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\Desktop\BrawlHacks\BrawlBox\BrawlLib.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -166,6 +162,10 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\brawltools\BrawlLib\BrawlLib.csproj">
+      <Project>{462d0bbf-ce82-405b-8848-2f91e9e14c55}</Project>
+      <Name>BrawlLib</Name>
+    </ProjectReference>
     <ProjectReference Include="..\BrawlManagerLib\BrawlManagerLib.csproj">
       <Project>{b5d693d8-3952-44f9-8952-8c1af74f0634}</Project>
       <Name>BrawlManagerLib</Name>

diff --git a/StageManager/BrawlStageManager.txt b/StageManager/BrawlStageManager.txt
@@ -9,7 +9,9 @@ hacks.) It can also add PAT0 entries for expansion stages (with an automated
 process) and change certain PAT0 entries (through a special dialog.)
 
 Changes in 3.5.1:
+	* common5/sc_selmap is no longer loaded twice on startup
 	* Built against BrawlLib 0.22b (Brawlbox 0.75b)
+	* All files compiled for x86 (32-bit)
 
 Changes in 3.5:
 	* "Draw solid color over Prevbase edge" now has a Project M 3.5 version.

diff --git a/StageManager/PortraitViewer.cs b/StageManager/PortraitViewer.cs
@@ -160,7 +160,7 @@ public partial class PortraitViewer : UserControl {
 				}
 			}
 
-			UpdateDirectory();
+			//UpdateDirectory();
 		}
 
 		#region Core public methods

diff --git a/StageManager/StageManager.csproj b/StageManager/StageManager.csproj
@@ -71,10 +71,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BrawlLib, Version=0.21.5511.36882, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\Desktop\BrawlHacks\BrawlBox\BrawlLib.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -273,11 +269,18 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\brawltools\BrawlLib\BrawlLib.csproj">
+      <Project>{462d0bbf-ce82-405b-8848-2f91e9e14c55}</Project>
+      <Name>BrawlLib</Name>
+    </ProjectReference>
     <ProjectReference Include="..\BrawlManagerLib\BrawlManagerLib.csproj">
       <Project>{b5d693d8-3952-44f9-8952-8c1af74f0634}</Project>
       <Name>BrawlManagerLib</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <WCFMetadata Include="Service References\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>