DTXManiaXG(Ver.K)4.00Series
修訂 | 20ce64bc86e2f65402d9060ebfdd8ea5eb407499 (tree) |
---|---|
時間 | 2019-06-16 12:42:08 |
作者 | ![]() |
Commiter | kairera0467 |
#xxxxx DTXManiaプロジェクトからDTXManiaとDTXCreatorの両方をビルドできるよう変更
#xxxxx DTXCreatorのターゲットランタイムを.NET Frameworks 4.7.1に変更
#xxxxx その他修正
@@ -1,32 +0,0 @@ | ||
1 | - | |
2 | -Microsoft Visual Studio Solution File, Format Version 12.00 | |
3 | -# Visual Studio 2013 | |
4 | -VisualStudioVersion = 12.0.31101.0 | |
5 | -MinimumVisualStudioVersion = 10.0.40219.1 | |
6 | -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DTXCreatorプロジェクト", "DTXCreatorプロジェクト.csproj", "{BAC81BCC-5689-4600-91A0-7427667500D6}" | |
7 | -EndProject | |
8 | -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FDK19", "..\FDK17プロジェクト\FDK19.csproj", "{BCD40908-F3E2-4707-BFAA-1DD99DF6357D}" | |
9 | -EndProject | |
10 | -Global | |
11 | - GlobalSection(SolutionConfigurationPlatforms) = preSolution | |
12 | - Debug|x86 = Debug|x86 | |
13 | - Release|x86 = Release|x86 | |
14 | - EndGlobalSection | |
15 | - GlobalSection(ProjectConfigurationPlatforms) = postSolution | |
16 | - {BAC81BCC-5689-4600-91A0-7427667500D6}.Debug|x86.ActiveCfg = Debug|x86 | |
17 | - {BAC81BCC-5689-4600-91A0-7427667500D6}.Debug|x86.Build.0 = Debug|x86 | |
18 | - {BAC81BCC-5689-4600-91A0-7427667500D6}.Release|x86.ActiveCfg = Release|x86 | |
19 | - {BAC81BCC-5689-4600-91A0-7427667500D6}.Release|x86.Build.0 = Release|x86 | |
20 | - {BCD40908-F3E2-4707-BFAA-1DD99DF6357D}.Debug|x86.ActiveCfg = Debug|x86 | |
21 | - {BCD40908-F3E2-4707-BFAA-1DD99DF6357D}.Debug|x86.Build.0 = Debug|x86 | |
22 | - {BCD40908-F3E2-4707-BFAA-1DD99DF6357D}.Release|x86.ActiveCfg = Release|x86 | |
23 | - {BCD40908-F3E2-4707-BFAA-1DD99DF6357D}.Release|x86.Build.0 = Release|x86 | |
24 | - EndGlobalSection | |
25 | - GlobalSection(SolutionProperties) = preSolution | |
26 | - HideSolutionNode = FALSE | |
27 | - EndGlobalSection | |
28 | - GlobalSection(SubversionScc) = preSolution | |
29 | - Svn-Managed = True | |
30 | - Manager = AnkhSVN - Subversion Support for Visual Studio | |
31 | - EndGlobalSection | |
32 | -EndGlobal |
@@ -10,7 +10,7 @@ | ||
10 | 10 | <AppDesignerFolder>Properties</AppDesignerFolder> |
11 | 11 | <RootNamespace>DTXCreator</RootNamespace> |
12 | 12 | <AssemblyName>DTXCreator</AssemblyName> |
13 | - <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion> | |
13 | + <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion> | |
14 | 14 | <FileAlignment>512</FileAlignment> |
15 | 15 | <ApplicationIcon>コード\99.リソース\DTXC.ico</ApplicationIcon> |
16 | 16 | <ApplicationManifest>DTXCreator.exe.x86.manifest</ApplicationManifest> |
@@ -57,9 +57,6 @@ | ||
57 | 57 | <Prefer32Bit>false</Prefer32Bit> |
58 | 58 | </PropertyGroup> |
59 | 59 | <ItemGroup> |
60 | - <Reference Include="SlimDXc_net20x86_Jun2010"> | |
61 | - <HintPath>..\実行時フォルダ\dll\SlimDXc_net20x86_Jun2010.dll</HintPath> | |
62 | - </Reference> | |
63 | 60 | <Reference Include="System" /> |
64 | 61 | <Reference Include="System.Data" /> |
65 | 62 | <Reference Include="System.Drawing" /> |
@@ -196,6 +193,7 @@ | ||
196 | 193 | <None Include="DTXCreator.exe.x86.manifest"> |
197 | 194 | <SubType>Designer</SubType> |
198 | 195 | </None> |
196 | + <None Include="packages.config" /> | |
199 | 197 | <None Include="Properties\Settings.settings"> |
200 | 198 | <Generator>SettingsSingleFileGenerator</Generator> |
201 | 199 | <LastGenOutput>Settings.Designer.cs</LastGenOutput> |
@@ -366,15 +364,13 @@ | ||
366 | 364 | </Target> |
367 | 365 | --> |
368 | 366 | <PropertyGroup> |
369 | - <PostBuildEvent>copy /Y "$(TargetPath)" "$(SolutionDir)..\実行時フォルダ" | |
370 | -copy /Y "$(TargetPath)".config "$(SolutionDir)..\実行時フォルダ" | |
371 | -mkdir "$(SolutionDir)..\実行時フォルダ\ja-JP" | |
372 | -copy /Y "$(TargetDir)ja-JP" "$(SolutionDir)..\実行時フォルダ\ja-JP" | |
373 | -mkdir "$(SolutionDir)..\実行時フォルダ\dll" | |
367 | + <PostBuildEvent>copy /Y "$(TargetPath)" "$(SolutionDir)\実行時フォルダ" | |
368 | +copy /Y "$(TargetPath)".config "$(SolutionDir)\実行時フォルダ" | |
369 | +mkdir "$(SolutionDir)\実行時フォルダ\ja-JP" | |
370 | +copy /Y "$(TargetDir)ja-JP" "$(SolutionDir)\実行時フォルダ\ja-JP" | |
371 | +mkdir "$(SolutionDir)\実行時フォルダ\dll" | |
374 | 372 | move /Y "$(TargetDir)\Bass.Net.dll" "$(TargetDir)dll" |
375 | 373 | move /Y "$(TargetDir)\DirectShowLib-2005.dll" "$(TargetDir)dll" |
376 | -move /Y "$(TargetDir)\FDK.dll" "$(TargetDir)dll" | |
377 | -move /Y "$(TargetDir)\SlimDXc_net20x86_Jun2010.dll" "$(TargetDir)dll" | |
378 | -</PostBuildEvent> | |
374 | +move /Y "$(TargetDir)\FDK.dll" "$(TargetDir)dll"</PostBuildEvent> | |
379 | 375 | </PropertyGroup> |
380 | 376 | </Project> |
\ No newline at end of file |
@@ -19,7 +19,7 @@ namespace DTXCreator.Properties { | ||
19 | 19 | // または Visual Studio のようなツールを使用して自動生成されました。 |
20 | 20 | // メンバーを追加または削除するには、.ResX ファイルを編集して、/str オプションと共に |
21 | 21 | // ResGen を実行し直すか、または VS プロジェクトをビルドし直します。 |
22 | - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] | |
22 | + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] | |
23 | 23 | [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] |
24 | 24 | [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] |
25 | 25 | internal class Resources { |
@@ -47,7 +47,7 @@ namespace DTXCreator.Properties { | ||
47 | 47 | } |
48 | 48 | |
49 | 49 | /// <summary> |
50 | - /// 厳密に型指定されたこのリソース クラスを使用して、すべての検索リソースに対し、 | |
50 | + /// すべてについて、現在のスレッドの CurrentUICulture プロパティをオーバーライドします | |
51 | 51 | /// 現在のスレッドの CurrentUICulture プロパティをオーバーライドします。 |
52 | 52 | /// </summary> |
53 | 53 | [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] |
@@ -1,7 +1,7 @@ | ||
1 | 1 | //------------------------------------------------------------------------------ |
2 | 2 | // <auto-generated> |
3 | 3 | // このコードはツールによって生成されました。 |
4 | -// ランタイム バージョン:4.0.30319.34209 | |
4 | +// ランタイム バージョン:4.0.30319.42000 | |
5 | 5 | // |
6 | 6 | // このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 |
7 | 7 | // コードが再生成されるときに損失したりします。 |
@@ -12,7 +12,7 @@ namespace DTXCreator.Properties { | ||
12 | 12 | |
13 | 13 | |
14 | 14 | [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] |
15 | - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] | |
15 | + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] | |
16 | 16 | internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { |
17 | 17 | |
18 | 18 | private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); |
@@ -387,7 +387,7 @@ namespace DTXCreator | ||
387 | 387 | public string PlayStartOption = "-N-1"; |
388 | 388 | public string PlayStopOption = "-S"; |
389 | 389 | // public ViewerSoundType SoundType = ( FDK.COS.bIsVistaOrLater ) ? ViewerSoundType.WASAPI : ViewerSoundType.DirectSound; |
390 | - public FDK.ESoundDeviceType SoundType = ( FDK.COS.bIsVistaOrLater ) ? FDK.ESoundDeviceType.ExclusiveWASAPI : FDK.ESoundDeviceType.DirectSound; | |
390 | + public FDK.ESoundDeviceType SoundType = ( FDK.COS.bIsVistaOrLater() ) ? FDK.ESoundDeviceType.ExclusiveWASAPI : FDK.ESoundDeviceType.DirectSound; | |
391 | 391 | public int ASIODeviceNo = 0; |
392 | 392 | public bool GRmode; |
393 | 393 | public bool TimeStretch; |
@@ -401,7 +401,7 @@ namespace DTXCreator | ||
401 | 401 | PlayStartOption = "-N-1"; |
402 | 402 | PlayStopOption = "-S"; |
403 | 403 | //SoundType = (FDK.COS.bIsVistaOrLater)? ViewerSoundType.WASAPI : ViewerSoundType.DirectSound; |
404 | - SoundType = ( FDK.COS.bIsVistaOrLater ) ? FDK.ESoundDeviceType.ExclusiveWASAPI : FDK.ESoundDeviceType.DirectSound; | |
404 | + SoundType = ( FDK.COS.bIsVistaOrLater() ) ? FDK.ESoundDeviceType.ExclusiveWASAPI : FDK.ESoundDeviceType.DirectSound; | |
405 | 405 | ASIODeviceNo = 0; |
406 | 406 | GRmode = false; |
407 | 407 | TimeStretch = false; |
@@ -233,7 +233,7 @@ namespace DTXCreator.WAV_BMP_AVI | ||
233 | 233 | { |
234 | 234 | this.tプレビュー音を停止する(); |
235 | 235 | } |
236 | - catch ( SlimDX.DirectSound.DirectSoundException ) // DTXMania終了後はDirectSoundの再初期化が必要 | |
236 | + catch ( Exception ) // DTXMania終了後はDirectSoundの再初期化が必要 | |
237 | 237 | { |
238 | 238 | tDirectSoundの解放(); |
239 | 239 | tDirectSoundの初期化(); |
@@ -74,7 +74,7 @@ namespace DTXCreator.オプション関連 | ||
74 | 74 | this.formメインフォーム.appアプリ設定.ViewerInfo.bViewerIsDTXV = cオプションダイアログ.radioButton_UseDTXViewer.Checked; |
75 | 75 | |
76 | 76 | //AppSetting.ViewerSoundType vst = ( FDK.COS.bIsVistaOrLater ) ? AppSetting.ViewerSoundType.WASAPI : AppSetting.ViewerSoundType.DirectSound; |
77 | - FDK.ESoundDeviceType vst = ( FDK.COS.bIsVistaOrLater ) ? FDK.ESoundDeviceType.ExclusiveWASAPI : FDK.ESoundDeviceType.DirectSound; | |
77 | + FDK.ESoundDeviceType vst = ( FDK.COS.bIsVistaOrLater() ) ? FDK.ESoundDeviceType.ExclusiveWASAPI : FDK.ESoundDeviceType.DirectSound; | |
78 | 78 | if ( cオプションダイアログ.radioButton_DirectSound.Checked ) |
79 | 79 | { |
80 | 80 | //vst = AppSetting.ViewerSoundType.DirectSound; |
@@ -3,17 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | ||
3 | 3 | # Visual Studio 15 |
4 | 4 | VisualStudioVersion = 15.0.28010.2046 |
5 | 5 | MinimumVisualStudioVersion = 10.0.40219.1 |
6 | -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DTXManiaプロジェクト", "DTXManiaプロジェクト.csproj", "{81BEC512-8074-4BD1-8A3C-AC73BC7BF846}" | |
6 | +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DTXManiaプロジェクト", "DTXManiaプロジェクト\DTXManiaプロジェクト.csproj", "{81BEC512-8074-4BD1-8A3C-AC73BC7BF846}" | |
7 | 7 | ProjectSection(ProjectDependencies) = postProject |
8 | 8 | {BCD40908-F3E2-4707-BFAA-1DD99DF6357D} = {BCD40908-F3E2-4707-BFAA-1DD99DF6357D} |
9 | 9 | EndProjectSection |
10 | 10 | EndProject |
11 | -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FDK19", "..\FDK17プロジェクト\FDK19.csproj", "{BCD40908-F3E2-4707-BFAA-1DD99DF6357D}" | |
11 | +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DTXCreatorプロジェクト", "DTXCreatorプロジェクト\DTXCreatorプロジェクト.csproj", "{BAC81BCC-5689-4600-91A0-7427667500D6}" | |
12 | +EndProject | |
13 | +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FDK19", "FDK17プロジェクト\FDK19.csproj", "{BCD40908-F3E2-4707-BFAA-1DD99DF6357D}" | |
12 | 14 | ProjectSection(ProjectDependencies) = postProject |
13 | 15 | {41E67409-F5EC-4216-A790-2519A7B22E51} = {41E67409-F5EC-4216-A790-2519A7B22E51} |
14 | 16 | EndProjectSection |
15 | 17 | EndProject |
16 | -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libbjxa", "..\libbjxa\libbjxa.csproj", "{41E67409-F5EC-4216-A790-2519A7B22E51}" | |
18 | +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libbjxa", "libbjxa\libbjxa.csproj", "{41E67409-F5EC-4216-A790-2519A7B22E51}" | |
17 | 19 | EndProject |
18 | 20 | Global |
19 | 21 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
@@ -29,6 +31,12 @@ Global | ||
29 | 31 | {81BEC512-8074-4BD1-8A3C-AC73BC7BF846}.Release|Any CPU.ActiveCfg = Release|x86 |
30 | 32 | {81BEC512-8074-4BD1-8A3C-AC73BC7BF846}.Release|x86.ActiveCfg = Release|x86 |
31 | 33 | {81BEC512-8074-4BD1-8A3C-AC73BC7BF846}.Release|x86.Build.0 = Release|x86 |
34 | + {BAC81BCC-5689-4600-91A0-7427667500D6}.Debug|Any CPU.ActiveCfg = Debug|x86 | |
35 | + {BAC81BCC-5689-4600-91A0-7427667500D6}.Debug|x86.ActiveCfg = Debug|x86 | |
36 | + {BAC81BCC-5689-4600-91A0-7427667500D6}.Debug|x86.Build.0 = Debug|x86 | |
37 | + {BAC81BCC-5689-4600-91A0-7427667500D6}.Release|Any CPU.ActiveCfg = Release|x86 | |
38 | + {BAC81BCC-5689-4600-91A0-7427667500D6}.Release|x86.ActiveCfg = Release|x86 | |
39 | + {BAC81BCC-5689-4600-91A0-7427667500D6}.Release|x86.Build.0 = Release|x86 | |
32 | 40 | {BCD40908-F3E2-4707-BFAA-1DD99DF6357D}.Debug|Any CPU.ActiveCfg = Debug|x86 |
33 | 41 | {BCD40908-F3E2-4707-BFAA-1DD99DF6357D}.Debug|x86.ActiveCfg = Debug|x86 |
34 | 42 | {BCD40908-F3E2-4707-BFAA-1DD99DF6357D}.Debug|x86.Build.0 = Debug|x86 |
@@ -43,7 +43,7 @@ | ||
43 | 43 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> |
44 | 44 | <DebugSymbols>true</DebugSymbols> |
45 | 45 | <OutputPath>bin\x86\Debug\</OutputPath> |
46 | - <DefineConstants>TRACE;_TEST_ENGLISH TEST_Direct3D9Ex_ WindowedFullscreen animetest BPMBar_WAM</DefineConstants> | |
46 | + <DefineConstants>DEBUG;TRACE;_TEST_ENGLISH TEST_Direct3D9Ex_ WindowedFullscreen animetest BPMBar_WAM</DefineConstants> | |
47 | 47 | <DebugType>full</DebugType> |
48 | 48 | <PlatformTarget>x86</PlatformTarget> |
49 | 49 | <ErrorReport>prompt</ErrorReport> |
@@ -276,6 +276,7 @@ | ||
276 | 276 | <Compile Include="コード\全体\CActFlushGPU.cs" /> |
277 | 277 | <Compile Include="コード\全体\CAnimationManager.cs" /> |
278 | 278 | <Compile Include="コード\全体\CConfigIni.cs" /> |
279 | + <Compile Include="コード\全体\CDebugUtil.cs" /> | |
279 | 280 | <Compile Include="コード\全体\CDTXMania.cs" /> |
280 | 281 | <Compile Include="コード\全体\CDTXVersion.cs" /> |
281 | 282 | <Compile Include="コード\全体\CPad.cs" /> |
@@ -334,12 +335,12 @@ | ||
334 | 335 | </Target> |
335 | 336 | --> |
336 | 337 | <PropertyGroup> |
337 | - <PostBuildEvent>copy /Y "$(TargetPath)" "$(SolutionDir)..\実行時フォルダ" | |
338 | -copy /Y "$(TargetPath)".config "$(SolutionDir)..\実行時フォルダ" | |
338 | + <PostBuildEvent>copy /Y "$(TargetPath)" "$(SolutionDir)\実行時フォルダ" | |
339 | +copy /Y "$(TargetPath)".config "$(SolutionDir)\実行時フォルダ" | |
339 | 340 | move /Y "$(TargetDir)Bass.Net.dll" "$(TargetDir)dll" |
340 | 341 | move /Y "$(TargetDir)DirectShowLib-2005.dll" "$(TargetDir)dll" |
341 | -move /Y "$(TargetDir)FDK.dll" "$(TargetDir)dll" | |
342 | -move /Y "$(TargetDir)SharpDX.dll" "$(TargetDir)dll" | |
342 | +move /Y "$(TargetDir)FDK.dll" "$(TargetDir)\dll" | |
343 | +move /Y "$(TargetDir)SharpDX.dll" "$(TargetDir)\dll" | |
343 | 344 | move /Y "$(TargetDir)SharpDX.*.dll" "$(TargetDir)\dll" |
344 | 345 | move /Y "$(TargetDir)libbjxa.dll" "$(TargetDir)\dll"</PostBuildEvent> |
345 | 346 | </PropertyGroup> |
@@ -784,7 +784,7 @@ namespace DTXMania | ||
784 | 784 | case (int) Ech定義.Bass_RGx: |
785 | 785 | case (int) Ech定義.Bass_RGB: |
786 | 786 | case (int) Ech定義.Bass_Wailing: |
787 | - case (int) Ech定義.Bass_WailingSound: | |
787 | + //case (int) Ech定義.Bass_WailingSound: | |
788 | 788 | case (int) Ech定義.Bass_NoChip: |
789 | 789 | return ESoundChipType.Bass; |
790 | 790 | #endregion |
@@ -47,7 +47,7 @@ | ||
47 | 47 | </DocumentationFile> |
48 | 48 | <UseVSHostingProcess>false</UseVSHostingProcess> |
49 | 49 | <NoWarn>0219</NoWarn> |
50 | - <DefineConstants>TRACE;TEST_CancelEnterCodeInAltEnter2 TEST_Direct3D9Ex_ TEST_MultiThreadedMixer_</DefineConstants> | |
50 | + <DefineConstants>DEBUG;TRACE;TEST_CancelEnterCodeInAltEnter2 TEST_Direct3D9Ex_ TEST_MultiThreadedMixer_</DefineConstants> | |
51 | 51 | <Optimize>false</Optimize> |
52 | 52 | <Prefer32Bit>false</Prefer32Bit> |
53 | 53 | </PropertyGroup> |
@@ -215,7 +215,7 @@ | ||
215 | 215 | </Target> |
216 | 216 | --> |
217 | 217 | <PropertyGroup> |
218 | - <PostBuildEvent>copy /Y "$(TargetPath)" "$(SolutionDir)..\実行時フォルダ\dll\" | |
219 | -copy /Y "$(TargetPath)" "$(SolutionDir)bin\x86\Debug\dll\"</PostBuildEvent> | |
218 | + <PostBuildEvent>copy /Y "$(TargetPath)" "$(SolutionDir)\実行時フォルダ\dll\" | |
219 | +copy /Y "$(TargetPath)" "$(SolutionDir)\DTXManiaプロジェクト\bin\x86\Debug\dll\"</PostBuildEvent> | |
220 | 220 | </PropertyGroup> |
221 | 221 | </Project> |
\ No newline at end of file |
@@ -50,7 +50,7 @@ | ||
50 | 50 | </ItemGroup> |
51 | 51 | <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
52 | 52 | <PropertyGroup> |
53 | - <PostBuildEvent>copy /y $(TargetPath) $(SolutionDir)..\実行時フォルダ\dll | |
54 | -copy /y $(TargetPath) $(SolutionDir)bin\x86\Debug\dll</PostBuildEvent> | |
53 | + <PostBuildEvent>copy /y $(TargetPath) $(SolutionDir)\実行時フォルダ\dll | |
54 | +copy /y $(TargetPath) $(SolutionDir)\DTXManiaプロジェクト\bin\x86\Debug\dll</PostBuildEvent> | |
55 | 55 | </PropertyGroup> |
56 | 56 | </Project> |
\ No newline at end of file |