diff --git a/Aegisub.sln b/Aegisub.sln index 9208962f3..c51d63646 100644 --- a/Aegisub.sln +++ b/Aegisub.sln @@ -16,6 +16,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiconv", "aegisub\build\l EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresrc", "aegisub\build\libresrc\libresrc.vcxproj", "{BD00D65F-24DA-4784-8860-3B972EA125FC}" ProjectSection(ProjectDependencies) = postProject + {0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC} = {0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC} {08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8} = {08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8} EndProjectSection EndProject diff --git a/aegisub/build/Aegisub/Aegisub.vcxproj b/aegisub/build/Aegisub/Aegisub.vcxproj index 1dcd680ed..98b3f421c 100644 --- a/aegisub/build/Aegisub/Aegisub.vcxproj +++ b/aegisub/build/Aegisub/Aegisub.vcxproj @@ -56,7 +56,7 @@ {c832eaf3-860d-4373-a02c-933626b47a5e} - + {aa137613-96a1-4388-8905-71345b4f8f87} @@ -86,9 +86,6 @@ {7b56955d-5162-4698-aa5b-47484edc8783} - - {0518d6c0-7bf6-4fd1-91fb-191bd10db2ac} - diff --git a/aegisub/build/libresrc/libresrc.vcxproj b/aegisub/build/libresrc/libresrc.vcxproj index c0689e8dd..72a08ff56 100644 --- a/aegisub/build/libresrc/libresrc.vcxproj +++ b/aegisub/build/libresrc/libresrc.vcxproj @@ -41,13 +41,19 @@ $(MSBuildThisFileDirectory)..\..\src\libresrc\ - - copy "$(SrcDir)default_config_win.json" "$(SrcDir)default_config_platform.json" - + + + + + @@ -59,18 +65,11 @@ bitmap.h + - - - {08af2bcc-fcdd-4f0e-8b41-59a6e634f2e8} - - - {0518d6c0-7bf6-4fd1-91fb-191bd10db2ac} - - - \ No newline at end of file + diff --git a/aegisub/build/respack/Aegisub.ResPack.targets b/aegisub/build/respack/Aegisub.ResPack.targets index a9adb02b1..f109bbe35 100644 --- a/aegisub/build/respack/Aegisub.ResPack.targets +++ b/aegisub/build/respack/Aegisub.ResPack.targets @@ -42,7 +42,7 @@ DependsOnTargets="PrepareForBuild" Condition="'@(ResPack)' != ''" Inputs="@(ResPack)" - Outputs="%(ResPack.OutputDir)%(ResPack.OutputName);%(ResPack.OutputDir)%(Respack.OutputHeader')" + Outputs="%(ResPack.OutputDir)%(ResPack.OutputName);%(ResPack.OutputDir)%(Respack.OutputHeader)" >