From a1f491af25b6ff552a24929d01c638e4381fef6a Mon Sep 17 00:00:00 2001 From: Perfare Date: Sat, 29 Sep 2018 00:48:35 +0800 Subject: [PATCH] modify project --- AssetStudio.sln | 54 +-- AssetStudio/AssetStudio-x86.csproj | 309 ------------------ AssetStudio/AssetStudio.csproj | 47 ++- AssetStudio/Classes/AudioClip.cs | 1 - .../{Library => Libraries}/FMOD LICENSE.TXT | 0 .../OpenTK.GLControl.dll | Bin AssetStudio/{Library => Libraries}/OpenTK.dll | Bin .../SharpDX.Mathematics.dll | Bin .../{Library => Libraries}/SharpDX.dll | Bin .../{Library => Libraries}/System.Half.dll | Bin .../{Library => Libraries}/astcenc.exe | Bin .../{Library => Libraries}/brotli_license.txt | 0 .../{Library => Libraries}/crunch_license.txt | 0 AssetStudio/{Library => Libraries}/dnlib.dll | Bin .../texgenpack_license.txt | 0 .../{Library => Libraries}/x64/PVRTexLib.dll | Bin .../x64/PVRTexLibWrapper.dll | Bin .../x64/TextureConverter.dll | Bin .../x64/TextureConverterWrapper.dll | Bin .../{Library => Libraries}/x64/crunch.dll | Bin .../x64/crunchunity.dll | Bin .../{Library => Libraries}/x64/fmod.dll | Bin .../{Library => Libraries}/x64/libfbxsdk.dll | Bin .../{Library => Libraries}/x64/texgenpack.dll | Bin .../{Library => Libraries}/x86/PVRTexLib.dll | Bin .../x86/PVRTexLibWrapper.dll | Bin .../x86/TextureConverter.dll | Bin .../x86/TextureConverterWrapper.dll | Bin .../{Library => Libraries}/x86/crunch.dll | Bin .../x86/crunchunity.dll | Bin .../{Library => Libraries}/x86/fmod.dll | Bin .../{Library => Libraries}/x86/libfbxsdk.dll | Bin .../{Library => Libraries}/x86/texgenpack.dll | Bin AssetStudio/Library/OpenTK License.txt | 52 --- AssetStudioFBX/AssetStudioFBX-x86.vcxproj | 103 ------ .../AssetStudioFBX-x86.vcxproj.filters | 29 -- AssetStudioFBX/AssetStudioFBX.vcxproj | 61 +++- AssetStudioUtility/AssetStudioUtility.csproj | 2 +- 38 files changed, 119 insertions(+), 539 deletions(-) delete mode 100644 AssetStudio/AssetStudio-x86.csproj rename AssetStudio/{Library => Libraries}/FMOD LICENSE.TXT (100%) rename AssetStudio/{Library => Libraries}/OpenTK.GLControl.dll (100%) rename AssetStudio/{Library => Libraries}/OpenTK.dll (100%) rename AssetStudio/{Library => Libraries}/SharpDX.Mathematics.dll (100%) rename AssetStudio/{Library => Libraries}/SharpDX.dll (100%) rename AssetStudio/{Library => Libraries}/System.Half.dll (100%) rename AssetStudio/{Library => Libraries}/astcenc.exe (100%) rename AssetStudio/{Library => Libraries}/brotli_license.txt (100%) rename AssetStudio/{Library => Libraries}/crunch_license.txt (100%) rename AssetStudio/{Library => Libraries}/dnlib.dll (100%) rename AssetStudio/{Library => Libraries}/texgenpack_license.txt (100%) rename AssetStudio/{Library => Libraries}/x64/PVRTexLib.dll (100%) rename AssetStudio/{Library => Libraries}/x64/PVRTexLibWrapper.dll (100%) rename AssetStudio/{Library => Libraries}/x64/TextureConverter.dll (100%) rename AssetStudio/{Library => Libraries}/x64/TextureConverterWrapper.dll (100%) rename AssetStudio/{Library => Libraries}/x64/crunch.dll (100%) rename AssetStudio/{Library => Libraries}/x64/crunchunity.dll (100%) rename AssetStudio/{Library => Libraries}/x64/fmod.dll (100%) rename AssetStudio/{Library => Libraries}/x64/libfbxsdk.dll (100%) rename AssetStudio/{Library => Libraries}/x64/texgenpack.dll (100%) rename AssetStudio/{Library => Libraries}/x86/PVRTexLib.dll (100%) rename AssetStudio/{Library => Libraries}/x86/PVRTexLibWrapper.dll (100%) rename AssetStudio/{Library => Libraries}/x86/TextureConverter.dll (100%) rename AssetStudio/{Library => Libraries}/x86/TextureConverterWrapper.dll (100%) rename AssetStudio/{Library => Libraries}/x86/crunch.dll (100%) rename AssetStudio/{Library => Libraries}/x86/crunchunity.dll (100%) rename AssetStudio/{Library => Libraries}/x86/fmod.dll (100%) rename AssetStudio/{Library => Libraries}/x86/libfbxsdk.dll (100%) rename AssetStudio/{Library => Libraries}/x86/texgenpack.dll (100%) delete mode 100644 AssetStudio/Library/OpenTK License.txt delete mode 100644 AssetStudioFBX/AssetStudioFBX-x86.vcxproj delete mode 100644 AssetStudioFBX/AssetStudioFBX-x86.vcxproj.filters diff --git a/AssetStudio.sln b/AssetStudio.sln index 10c86ca..c93f0f4 100644 --- a/AssetStudio.sln +++ b/AssetStudio.sln @@ -5,40 +5,42 @@ VisualStudioVersion = 15.0.27130.2024 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssetStudio", "AssetStudio\AssetStudio.csproj", "{24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssetStudio-x86", "AssetStudio\AssetStudio-x86.csproj", "{F5E07FB2-95E4-417F-943F-D439D9A03BBA}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssetStudioFBX", "AssetStudioFBX\AssetStudioFBX.vcxproj", "{4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssetStudioUtility", "AssetStudioUtility\AssetStudioUtility.csproj", "{9131C403-7FE8-444D-9AF5-5FE5DF76FF24}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssetStudioFBX-x86", "AssetStudioFBX\AssetStudioFBX-x86.vcxproj", "{276DE52E-3FFE-4C3D-9076-62BCB7A5B991}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Debug|Any CPU.ActiveCfg = Debug|x64 - {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Debug|Any CPU.Build.0 = Debug|x64 - {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Release|Any CPU.ActiveCfg = Release|x64 - {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Release|Any CPU.Build.0 = Release|x64 - {F5E07FB2-95E4-417F-943F-D439D9A03BBA}.Debug|Any CPU.ActiveCfg = Debug|x86 - {F5E07FB2-95E4-417F-943F-D439D9A03BBA}.Debug|Any CPU.Build.0 = Debug|x86 - {F5E07FB2-95E4-417F-943F-D439D9A03BBA}.Release|Any CPU.ActiveCfg = Release|x86 - {F5E07FB2-95E4-417F-943F-D439D9A03BBA}.Release|Any CPU.Build.0 = Release|x86 - {4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}.Debug|Any CPU.ActiveCfg = Debug|x64 - {4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}.Debug|Any CPU.Build.0 = Debug|x64 - {4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}.Release|Any CPU.ActiveCfg = Release|x64 - {4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}.Release|Any CPU.Build.0 = Release|x64 - {9131C403-7FE8-444D-9AF5-5FE5DF76FF24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9131C403-7FE8-444D-9AF5-5FE5DF76FF24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9131C403-7FE8-444D-9AF5-5FE5DF76FF24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9131C403-7FE8-444D-9AF5-5FE5DF76FF24}.Release|Any CPU.Build.0 = Release|Any CPU - {276DE52E-3FFE-4C3D-9076-62BCB7A5B991}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {276DE52E-3FFE-4C3D-9076-62BCB7A5B991}.Debug|Any CPU.Build.0 = Debug|Win32 - {276DE52E-3FFE-4C3D-9076-62BCB7A5B991}.Release|Any CPU.ActiveCfg = Release|Win32 - {276DE52E-3FFE-4C3D-9076-62BCB7A5B991}.Release|Any CPU.Build.0 = Release|Win32 + {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Debug|x64.ActiveCfg = Debug|x64 + {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Debug|x64.Build.0 = Debug|x64 + {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Debug|x86.ActiveCfg = Debug|x86 + {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Debug|x86.Build.0 = Debug|x86 + {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Release|x64.ActiveCfg = Release|x64 + {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Release|x64.Build.0 = Release|x64 + {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Release|x86.ActiveCfg = Release|x86 + {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Release|x86.Build.0 = Release|x86 + {4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}.Debug|x64.ActiveCfg = Debug|x64 + {4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}.Debug|x64.Build.0 = Debug|x64 + {4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}.Debug|x86.ActiveCfg = Debug|Win32 + {4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}.Debug|x86.Build.0 = Debug|Win32 + {4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}.Release|x64.ActiveCfg = Release|x64 + {4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}.Release|x64.Build.0 = Release|x64 + {4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}.Release|x86.ActiveCfg = Release|Win32 + {4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}.Release|x86.Build.0 = Release|Win32 + {9131C403-7FE8-444D-9AF5-5FE5DF76FF24}.Debug|x64.ActiveCfg = Debug|Any CPU + {9131C403-7FE8-444D-9AF5-5FE5DF76FF24}.Debug|x64.Build.0 = Debug|Any CPU + {9131C403-7FE8-444D-9AF5-5FE5DF76FF24}.Debug|x86.ActiveCfg = Debug|Any CPU + {9131C403-7FE8-444D-9AF5-5FE5DF76FF24}.Debug|x86.Build.0 = Debug|Any CPU + {9131C403-7FE8-444D-9AF5-5FE5DF76FF24}.Release|x64.ActiveCfg = Release|Any CPU + {9131C403-7FE8-444D-9AF5-5FE5DF76FF24}.Release|x64.Build.0 = Release|Any CPU + {9131C403-7FE8-444D-9AF5-5FE5DF76FF24}.Release|x86.ActiveCfg = Release|Any CPU + {9131C403-7FE8-444D-9AF5-5FE5DF76FF24}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/AssetStudio/AssetStudio-x86.csproj b/AssetStudio/AssetStudio-x86.csproj deleted file mode 100644 index 322c814..0000000 --- a/AssetStudio/AssetStudio-x86.csproj +++ /dev/null @@ -1,309 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {F5E07FB2-95E4-417F-943F-D439D9A03BBA} - WinExe - Properties - AssetStudio - AssetStudio - v4.0 - - - 512 - false - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - - - Resources\as.ico - - - OnBuildSuccess - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - - - - Library\dnlib.dll - False - - - False - Library\OpenTK.dll - False - - - False - Library\OpenTK.GLControl.dll - False - - - Library\SharpDX.Mathematics.dll - False - - - - - False - Library\System.Half.dll - False - - - - - - - - - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Form - - - AssetStudioForm.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - ExportOptions.cs - - - - - - - Component - - - - - - - - - - - - - - - - - - - - - - - - - - - AssetStudioForm.cs - Designer - - - ExportOptions.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - False - Microsoft .NET Framework 4 Client Profile %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - - False - Windows Installer 4.5 - true - - - - - - - - {276de52e-3ffe-4c3d-9076-62bcb7a5b991} - AssetStudioFBX-x86 - - - {9131c403-7fe8-444d-9af5-5fe5df76ff24} - AssetStudioUtility - - - - - - - - xcopy /y "$(ProjectDir)Library" "$(TargetDir)" -xcopy /y "$(ProjectDir)Library\$(PlatformName)" "$(TargetDir)" - - - \ No newline at end of file diff --git a/AssetStudio/AssetStudio.csproj b/AssetStudio/AssetStudio.csproj index cef5687..4ba2be2 100644 --- a/AssetStudio/AssetStudio.csproj +++ b/AssetStudio/AssetStudio.csproj @@ -54,30 +54,45 @@ OnBuildSuccess + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + - Library\dnlib.dll + Libraries\dnlib.dll False - - False - Library\OpenTK.dll + + Libraries\OpenTK.dll False - - False - Library\OpenTK.GLControl.dll + + Libraries\OpenTK.GLControl.dll False - Library\SharpDX.Mathematics.dll + Libraries\SharpDX.Mathematics.dll False - - False - Library\System.Half.dll + + Libraries\System.Half.dll False @@ -283,6 +298,9 @@ + + + {4f8ef5ef-732b-49cf-9eb3-b23e19ae6267} @@ -293,13 +311,10 @@ AssetStudioUtility - - - - xcopy /y "$(ProjectDir)Library" "$(TargetDir)" -xcopy /y "$(ProjectDir)Library\$(PlatformName)" "$(TargetDir)" + xcopy /y "$(ProjectDir)Libraries" "$(TargetDir)" +xcopy /y "$(ProjectDir)Libraries\$(PlatformName)" "$(TargetDir)"