From 4743dde9bf1ba94f837800977ed2c820b76f3320 Mon Sep 17 00:00:00 2001 From: Inori Date: Tue, 27 Jun 2023 02:46:53 +0800 Subject: [PATCH] change build order --- .github/workflows/build-windows.yml | 1 + GPCS4.sln | 29 +++++++++++++---------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index b7cd24c45..79a7ac041 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -95,6 +95,7 @@ jobs: - name: Upload build files + working-directory: ${{env.GITHUB_WORKSPACE}} id: upload-artifacts uses: actions/upload-artifact@v3 with: diff --git a/GPCS4.sln b/GPCS4.sln index f24bf8f7c..5f73e5453 100644 --- a/GPCS4.sln +++ b/GPCS4.sln @@ -3,37 +3,30 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.1.32414.318 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPCS4", "GPCS4\GPCS4.vcxproj", "{C6268336-3B18-41C4-AC99-18B5F8A0BF29}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rdParty", "3rdParty", "{11B1CACA-EDF7-42ED-A8F1-00E838068164}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glfw", "3rdParty\glfw\src\glfw.vcxproj", "{816CCC89-8D3A-364F-ABC2-F7CCB4D4F289}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtaudio", "3rdParty\rtaudio\msvc\rtaudio.vcxproj", "{1BE55B0D-EB4C-4DC3-91CA-CDF291307215}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zycore", "3rdParty\zydis\msvc\dependencies\zycore\Zycore.vcxproj", "{E06E2E87-82B9-4DC2-A1E9-FE371CDBAAC2}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zydis", "3rdParty\zydis\msvc\zydis\Zydis.vcxproj", "{88A23124-5640-35A0-B890-311D7A67A7D2}" - ProjectSection(ProjectDependencies) = postProject - {E06E2E87-82B9-4DC2-A1E9-FE371CDBAAC2} = {E06E2E87-82B9-4DC2-A1E9-FE371CDBAAC2} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TinyDBR", "3rdParty\tinydbr\TinyDBR.vcxproj", "{2C3AD807-FE99-4595-941C-9F45B22D8C21}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zycore", "3rdParty\zydis\msvc\dependencies\zycore\Zycore.vcxproj", "{E06E2E87-82B9-4DC2-A1E9-FE371CDBAAC2}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winpthreads", "3rdParty\winpthreads\winpthreads.vcxproj", "{DB343EA9-5200-4364-B0A4-73887F274F34}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "3rdParty\fmt\fmt.vcxproj", "{38BEFD95-33DD-47B1-8607-94B9FCAC2CA0}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPCS4", "GPCS4\GPCS4.vcxproj", "{C6268336-3B18-41C4-AC99-18B5F8A0BF29}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C6268336-3B18-41C4-AC99-18B5F8A0BF29}.Debug|x64.ActiveCfg = Debug|x64 - {C6268336-3B18-41C4-AC99-18B5F8A0BF29}.Debug|x64.Build.0 = Debug|x64 - {C6268336-3B18-41C4-AC99-18B5F8A0BF29}.Release|x64.ActiveCfg = Release|x64 - {C6268336-3B18-41C4-AC99-18B5F8A0BF29}.Release|x64.Build.0 = Release|x64 {816CCC89-8D3A-364F-ABC2-F7CCB4D4F289}.Debug|x64.ActiveCfg = Debug|x64 {816CCC89-8D3A-364F-ABC2-F7CCB4D4F289}.Debug|x64.Build.0 = Debug|x64 {816CCC89-8D3A-364F-ABC2-F7CCB4D4F289}.Release|x64.ActiveCfg = Release|x64 @@ -42,6 +35,10 @@ Global {1BE55B0D-EB4C-4DC3-91CA-CDF291307215}.Debug|x64.Build.0 = Debug|x64 {1BE55B0D-EB4C-4DC3-91CA-CDF291307215}.Release|x64.ActiveCfg = Release|x64 {1BE55B0D-EB4C-4DC3-91CA-CDF291307215}.Release|x64.Build.0 = Release|x64 + {E06E2E87-82B9-4DC2-A1E9-FE371CDBAAC2}.Debug|x64.ActiveCfg = Debug|x64 + {E06E2E87-82B9-4DC2-A1E9-FE371CDBAAC2}.Debug|x64.Build.0 = Debug|x64 + {E06E2E87-82B9-4DC2-A1E9-FE371CDBAAC2}.Release|x64.ActiveCfg = Release|x64 + {E06E2E87-82B9-4DC2-A1E9-FE371CDBAAC2}.Release|x64.Build.0 = Release|x64 {88A23124-5640-35A0-B890-311D7A67A7D2}.Debug|x64.ActiveCfg = Debug|x64 {88A23124-5640-35A0-B890-311D7A67A7D2}.Debug|x64.Build.0 = Debug|x64 {88A23124-5640-35A0-B890-311D7A67A7D2}.Release|x64.ActiveCfg = Release|x64 @@ -50,10 +47,6 @@ Global {2C3AD807-FE99-4595-941C-9F45B22D8C21}.Debug|x64.Build.0 = Debug|x64 {2C3AD807-FE99-4595-941C-9F45B22D8C21}.Release|x64.ActiveCfg = Release|x64 {2C3AD807-FE99-4595-941C-9F45B22D8C21}.Release|x64.Build.0 = Release|x64 - {E06E2E87-82B9-4DC2-A1E9-FE371CDBAAC2}.Debug|x64.ActiveCfg = Debug|x64 - {E06E2E87-82B9-4DC2-A1E9-FE371CDBAAC2}.Debug|x64.Build.0 = Debug|x64 - {E06E2E87-82B9-4DC2-A1E9-FE371CDBAAC2}.Release|x64.ActiveCfg = Release|x64 - {E06E2E87-82B9-4DC2-A1E9-FE371CDBAAC2}.Release|x64.Build.0 = Release|x64 {DB343EA9-5200-4364-B0A4-73887F274F34}.Debug|x64.ActiveCfg = Debug|x64 {DB343EA9-5200-4364-B0A4-73887F274F34}.Debug|x64.Build.0 = Debug|x64 {DB343EA9-5200-4364-B0A4-73887F274F34}.Release|x64.ActiveCfg = Release|x64 @@ -62,6 +55,10 @@ Global {38BEFD95-33DD-47B1-8607-94B9FCAC2CA0}.Debug|x64.Build.0 = Debug|x64 {38BEFD95-33DD-47B1-8607-94B9FCAC2CA0}.Release|x64.ActiveCfg = Release|x64 {38BEFD95-33DD-47B1-8607-94B9FCAC2CA0}.Release|x64.Build.0 = Release|x64 + {C6268336-3B18-41C4-AC99-18B5F8A0BF29}.Debug|x64.ActiveCfg = Debug|x64 + {C6268336-3B18-41C4-AC99-18B5F8A0BF29}.Debug|x64.Build.0 = Debug|x64 + {C6268336-3B18-41C4-AC99-18B5F8A0BF29}.Release|x64.ActiveCfg = Release|x64 + {C6268336-3B18-41C4-AC99-18B5F8A0BF29}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -69,9 +66,9 @@ Global GlobalSection(NestedProjects) = preSolution {816CCC89-8D3A-364F-ABC2-F7CCB4D4F289} = {11B1CACA-EDF7-42ED-A8F1-00E838068164} {1BE55B0D-EB4C-4DC3-91CA-CDF291307215} = {11B1CACA-EDF7-42ED-A8F1-00E838068164} + {E06E2E87-82B9-4DC2-A1E9-FE371CDBAAC2} = {11B1CACA-EDF7-42ED-A8F1-00E838068164} {88A23124-5640-35A0-B890-311D7A67A7D2} = {11B1CACA-EDF7-42ED-A8F1-00E838068164} {2C3AD807-FE99-4595-941C-9F45B22D8C21} = {11B1CACA-EDF7-42ED-A8F1-00E838068164} - {E06E2E87-82B9-4DC2-A1E9-FE371CDBAAC2} = {11B1CACA-EDF7-42ED-A8F1-00E838068164} {DB343EA9-5200-4364-B0A4-73887F274F34} = {11B1CACA-EDF7-42ED-A8F1-00E838068164} {38BEFD95-33DD-47B1-8607-94B9FCAC2CA0} = {11B1CACA-EDF7-42ED-A8F1-00E838068164} EndGlobalSection