TAG200 2023/07/07

All プロジェクトの整理 Compiler **(マクロシフト)コマンドの機能拡張。
kuma4649 · Jul 7, 2023 · 51a7120 · 51a7120
1 parent 79dbc70
commit 51a7120
Show file tree

Hide file tree

Showing 40 changed files with 320 additions and 398 deletions.
diff --git a/CHANGE.txt b/CHANGE.txt
@@ -1,4 +1,10 @@
 �X�V����
+TAG200 2023/07/07
+  All
+  �v���W�F�N�g�̐���
+  Compiler
+    **(�}�N���V�t�g)�R�}���h�̋@�\�g���B
+
 TAG199 2023/04/23 2nd
   Compiler&Driver
     EX(�X���b�g�w��)�R�}���h�̋@�\�g���B

diff --git a/Common_NET5/Common_NET5.csproj → Common_NET5/Common_NET6.csproj b/Common_NET5/Common_NET5.csproj → Common_NET5/Common_NET6.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>mucomDotNETCommon</AssemblyName>
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
     <Configurations>Debug;Release;Debug64</Configurations>

diff --git a/Compiler_NET5/Compiler_NET5.csproj → Compiler_NET5/Compiler_NET6.csproj b/Compiler_NET5/Compiler_NET5.csproj → Compiler_NET5/Compiler_NET6.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>mucomDotNETCompiler</AssemblyName>
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
     <Configurations>Debug;Release;Debug64</Configurations>
@@ -78,7 +78,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Common_NET5\Common_NET5.csproj" />
+    <ProjectReference Include="..\Common_NET5\Common_NET6.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Console_NET5/Console_NET5.csproj → Console_NET5/Console_NET6.csproj b/Console_NET5/Console_NET5.csproj → Console_NET5/Console_NET6.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>mucomDotNETConsole</AssemblyName>
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
     <Configurations>Debug;Release;Debug64</Configurations>
@@ -32,8 +32,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Common_NET5\Common_NET5.csproj" />
-    <ProjectReference Include="..\Compiler_NET5\Compiler_NET5.csproj" />
+    <ProjectReference Include="..\Common_NET5\Common_NET6.csproj" />
+    <ProjectReference Include="..\Compiler_NET5\Compiler_NET6.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Console_NET5/Properties/launchSettings.json b/Console_NET5/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Console_NET5": {
       "commandName": "Project",
-      "commandLineArgs": "D:\\bootcamp\\FM音源\\data\\自作\\test\\grad.muc",
+      "commandLineArgs": "D:\\bootcamp\\FM音源\\data\\自作\\test\\macroShift.muc",
       "nativeDebugging": true
     }
   }

diff --git a/Driver_NET5/Driver_NET5.csproj → Driver_NET5/Driver_NET6.csproj b/Driver_NET5/Driver_NET5.csproj → Driver_NET5/Driver_NET6.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>mucomDotNETDriver</AssemblyName>
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
     <Configurations>Debug;Release;Debug64</Configurations>
@@ -61,7 +61,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Common_NET5\Common_NET5.csproj" />
+    <ProjectReference Include="..\Common_NET5\Common_NET6.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FolderStructure.txt b/FolderStructure.txt
@@ -0,0 +1,40 @@
+
+
+*��vdll
+Common
+ Platform Framework       OS      Release build path
+ -------------------------------------------------------------------------
+ AnyCPU   .NETStandard2.1 Any     .\mucomDotNETCommon\bin\Release\netstandard2.1
+ AnyCPU   .NET6           Any     .\Common_NET5\bin\Release\net6.0
+
+Compiler
+ AnyCPU   .NETStandard2.1 Any     .\mucomDotNETCompiler\bin\Release\netstandard2.1
+ AnyCPU   .NET6           Any     .\Compiler_NET5\bin\Release\net6.0
+
+Driver
+ AnyCPU   .NETStandard2.1 Any     .\mucomDotNETDriver\bin\Release\netstandard2.1
+ AnyCPU   .NET6           Any     .\Driver_NET5\bin\Release\net6.0
+
+
+*���ӃA�v��
+Console
+ AnyCPU   .NETCoreApp3.1  Any     .\mucomDotNETConsole\bin\Release\netcoreapp3.1
+ AnyCPU   .NET6           Any     .\Console_NET5\bin\Release\net6.0
+
+PCMTool
+ AnyCPU   .NETCoreApp3.1  Any     .\PCMTool\bin\Release\netcoreapp3.1
+ AnyCPU   .NET6           Any     .\PCMTool_NET5\bin\Release\net6.0
+
+Player
+ x86      .NET6           Windows .\mucomDotNETPlayer\bin\Release\net6.0-windows
+ x64      .NET6           Windows .\Player64\bin\Release\net6.0-windows
+
+Vgm
+ AnyCPU   .NETCoreApp3.1  Any     .\Vgm\bin\Release\netcoreapp3.1
+ AnyCPU   .NET6           Any     .\Vgm_NET5\bin\Release\net6.0
+
+Wav
+ AnyCPU   .NETCoreApp3.1  Any     .\Wav\bin\Release\netcoreapp3.1
+ AnyCPU   .NET6           Any     .\Wav_NET5\bin\Release\net6.0
+
+
diff --git a/MML.txt b/MML.txt
@@ -391,6 +391,24 @@ mucomDotNET
 --�R�}���h--
 
 
+-�}�N���V�t�g
+�R�}���h
+    **
+����
+  **n
+�l�͈̔�
+    n : �V�t�g�l
+�g�p�\�ȃp�[�g
+    �S��
+���e
+    mml���Ń}�N�����w�肵���ۂɁA���̃}�N���ԍ��ւ��̃R�}���h�Ŏw�肵���l�����Z���܂��B
+    ���ʁA���ۂɉ��t�����}�N���́A���̎w��l���������ꂽ�ԍ��ɂȂ�܂��B
+�Q�l
+    macroShift.muc
+mub�t�@�C���ł̃t�H�[�}�b�g
+      -
+
+
 -���F��`
 �R�}���h
     @M

diff --git a/PCMTool.bat b/PCMTool.bat
@@ -1,2 +1,2 @@
-"%~dp0\PCMTool\PCMTool.exe" "%1"
+"%~dp0\NET6\PCMTool.exe" "%1"
 pause
diff --git a/PCMTool/PCMTool.csproj b/PCMTool/PCMTool.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Configurations>Debug;Release;Debug64</Configurations>
     <Platforms>AnyCPU;x64;x86</Platforms>
   </PropertyGroup>

diff --git a/PCMTool_NET5/PCMTool_NET5.csproj → PCMTool_NET5/PCMTool_NET6.csproj b/PCMTool_NET5/PCMTool_NET5.csproj → PCMTool_NET5/PCMTool_NET6.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>PCMTool</AssemblyName>
     <RootNamespace>PCMTool</RootNamespace>
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
@@ -54,7 +54,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Compiler_NET5\Compiler_NET5.csproj" />
+    <ProjectReference Include="..\Compiler_NET5\Compiler_NET6.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Player64/Player64.csproj b/Player64/Player64.csproj
diff --git a/Player64/Player64_NET6.csproj b/Player64/Player64_NET6.csproj
@@ -0,0 +1,70 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>mucomDotNETPlayer</RootNamespace>
+    <AssemblyName>mucomDotNETPlayer</AssemblyName>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <AssemblyTitle>Player64</AssemblyTitle>
+    <Product>Player64</Product>
+    <Copyright>Copyright ©  2021</Copyright>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <FileVersion>1.0.0.0</FileVersion>
+    <StartupObject>mucomDotNET.Player.Program</StartupObject>
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <OutputPath>bin\x64\Debug\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="MDSound, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>lib\MDSound.dll</HintPath>
+    </Reference>
+    <Reference Include="musicDriverInterface">
+      <HintPath>..\lib\musicDriverInterface.dll</HintPath>
+    </Reference>
+    <Reference Include="RealChipCtlWrap">
+      <HintPath>lib\RealChipCtlWrap.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\mucomDotNETPlayer\Program.cs">
+      <Link>Program.cs</Link>
+    </Compile>
+    <Compile Include="..\mucomDotNETPlayer\RSoundChip.cs">
+      <Link>RSoundChip.cs</Link>
+    </Compile>
+    <Compile Include="..\mucomDotNETPlayer\SChipType.cs">
+      <Link>SChipType.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="lib\c86ctl.dll" />
+    <Content Include="lib\fmgenmodule.dll" />
+    <Content Include="lib\MDSound.dll" />
+    <Content Include="lib\RealChipCtlWrap.dll" />
+    <Content Include="lib\RealChipCtlWrap.pdb" />
+    <Content Include="lib\scci.dll" />
+    <Content Include="lib\scciconfig.exe" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\mucomDotNETCommon\Common.csproj" />
+    <ProjectReference Include="..\mucomDotNETDriver\Driver.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="NAudio" Version="2.0.1" />
+    <PackageReference Include="NAudio.Asio" Version="2.0.0" />
+    <PackageReference Include="NAudio.Core" Version="2.0.0" />
+    <PackageReference Include="NAudio.Midi" Version="2.0.1" />
+    <PackageReference Include="NAudio.Wasapi" Version="2.0.0" />
+    <PackageReference Include="NAudio.WinForms" Version="2.0.1" />
+    <PackageReference Include="NAudio.WinMM" Version="2.0.1" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
+  </ItemGroup>
+</Project>