Skip to content

Commit 3345da4

Browse files
Merge pull request #3262 from csnv/feature/sln-cleanup
Use a single solution file for MVSC
2 parents 9579794 + 573a26f commit 3345da4

40 files changed

+17
-6720
lines changed

.gitignore

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,14 @@ Thumbs.db
134134
/tools/doxygen/Makefile
135135
/tools/doxygen/docs
136136

137-
# /vcproj-*
138-
/vcproj-*/*.user
139-
/vcproj-*/char-server
140-
/vcproj-*/login-server
141-
/vcproj-*/map-server
142-
/vcproj-*/api-server
143-
/vcproj-*/mapcache
144-
/vcproj-*/plugin-*/
137+
# /vcproj
138+
/vcproj/*.user
139+
/vcproj/char-server
140+
/vcproj/login-server
141+
/vcproj/map-server
142+
/vcproj/api-server
143+
/vcproj/mapcache
144+
/vcproj/plugin-*
145145

146146
# ccache
147147
/.ccache/

Hercules-15.sln

Lines changed: 0 additions & 67 deletions
This file was deleted.

Hercules-16.sln

Lines changed: 0 additions & 67 deletions
This file was deleted.

Hercules-17.sln renamed to Hercules.sln

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.0.31903.59
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server", "vcproj-17\char-server.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}"
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server", "vcproj\char-server.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}"
77
EndProject
8-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server", "vcproj-17\login-server.vcxproj", "{D356871D-58E1-450B-967A-E5E9646175AF}"
8+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server", "vcproj\login-server.vcxproj", "{D356871D-58E1-450B-967A-E5E9646175AF}"
99
EndProject
10-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server", "vcproj-17\map-server.vcxproj", "{D356871D-58E1-450B-967A-E6E9646175AF}"
10+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server", "vcproj\map-server.vcxproj", "{D356871D-58E1-450B-967A-E6E9646175AF}"
1111
EndProject
12-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-sample", "vcproj-17\plugin-sample.vcxproj", "{E64C56D3-CDFB-483B-900B-A62D216B6D2F}"
12+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-sample", "vcproj\plugin-sample.vcxproj", "{E64C56D3-CDFB-483B-900B-A62D216B6D2F}"
1313
EndProject
14-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-HPMHooking_map", "vcproj-17\plugin-HPMHooking_map.vcxproj", "{745D4A8C-6A68-4721-A43A-D81BF59860A1}"
14+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-HPMHooking_map", "vcproj\plugin-HPMHooking_map.vcxproj", "{745D4A8C-6A68-4721-A43A-D81BF59860A1}"
1515
EndProject
16-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-HPMHooking_char", "vcproj-17\plugin-HPMHooking_char.vcxproj", "{D495824D-24D3-4623-A28C-4CA506084A09}"
16+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-HPMHooking_char", "vcproj\plugin-HPMHooking_char.vcxproj", "{D495824D-24D3-4623-A28C-4CA506084A09}"
1717
EndProject
18-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-HPMHooking_login", "vcproj-17\plugin-HPMHooking_login.vcxproj", "{544AD8E8-0309-49DE-9F8D-F9FEA24D92F1}"
18+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-HPMHooking_login", "vcproj\plugin-HPMHooking_login.vcxproj", "{544AD8E8-0309-49DE-9F8D-F9FEA24D92F1}"
1919
EndProject
20-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "api-server", "vcproj-17\api-server.vcxproj", "{4960B7C9-D943-4EB6-A5ED-9A38ED1F437C}"
20+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "api-server", "vcproj\api-server.vcxproj", "{4960B7C9-D943-4EB6-A5ED-9A38ED1F437C}"
2121
EndProject
22-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-HPMHooking_api", "vcproj-17\plugin-HPMHooking_api.vcxproj", "{69D5A06C-67C9-4EB1-BA5A-A001AE69838B}"
22+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-HPMHooking_api", "vcproj\plugin-HPMHooking_api.vcxproj", "{69D5A06C-67C9-4EB1-BA5A-A001AE69838B}"
2323
EndProject
2424
Global
2525
GlobalSection(SolutionConfigurationPlatforms) = preSolution

0 commit comments

Comments
 (0)