Skip to content

Commit 2a787ec

Browse files
blepblep
committed
Moved Visual Studio projects file under makefiles/vs71 to allow usage of multiple versions on the same source tree.
1 parent 86ccb76 commit 2a787ec

3 files changed

Lines changed: 15 additions & 10 deletions

File tree

‎makefiles/vs71/jsoncpp.sln‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
11
Microsoft Visual Studio Solution File, Format Version 8.00
2-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_json", "..\..\src\lib_json\lib_json.vcproj", "{B84F7231-16CE-41D8-8C08-7B523FF4225B}"
2+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_json", "lib_json.vcproj", "{B84F7231-16CE-41D8-8C08-7B523FF4225B}"
33
ProjectSection(ProjectDependencies) = postProject
44
EndProjectSection
55
EndProject
6-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsontest", "..\..\src\jsontestrunner\jsontest.vcproj", "{25AF2DD2-D396-4668-B188-488C33B8E620}"
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsontest", "jsontest.vcproj", "{25AF2DD2-D396-4668-B188-488C33B8E620}"
77
ProjectSection(ProjectDependencies) = postProject
88
{B84F7231-16CE-41D8-8C08-7B523FF4225B} = {B84F7231-16CE-41D8-8C08-7B523FF4225B}
99
EndProjectSection
1010
EndProject
1111
Global
1212
GlobalSection(SolutionConfiguration) = preSolution
1313
Debug = Debug
14+
dummy = dummy
1415
Release = Release
1516
EndGlobalSection
1617
GlobalSection(ProjectConfiguration) = postSolution
1718
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Debug.ActiveCfg = Debug|Win32
1819
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Debug.Build.0 = Debug|Win32
20+
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.dummy.ActiveCfg = dummy|Win32
21+
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.dummy.Build.0 = dummy|Win32
1922
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Release.ActiveCfg = Release|Win32
2023
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Release.Build.0 = Release|Win32
2124
{25AF2DD2-D396-4668-B188-488C33B8E620}.Debug.ActiveCfg = Debug|Win32
2225
{25AF2DD2-D396-4668-B188-488C33B8E620}.Debug.Build.0 = Debug|Win32
26+
{25AF2DD2-D396-4668-B188-488C33B8E620}.dummy.ActiveCfg = Debug|Win32
27+
{25AF2DD2-D396-4668-B188-488C33B8E620}.dummy.Build.0 = Debug|Win32
2328
{25AF2DD2-D396-4668-B188-488C33B8E620}.Release.ActiveCfg = Release|Win32
2429
{25AF2DD2-D396-4668-B188-488C33B8E620}.Release.Build.0 = Release|Win32
2530
EndGlobalSection

src/jsontestrunner/jsontest.vcproj renamed to makefiles/vs71/jsontest.vcproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
</References>
112112
<Files>
113113
<File
114-
RelativePath=".\main.cpp">
114+
RelativePath="..\..\src\jsontestrunner\main.cpp">
115115
</File>
116116
</Files>
117117
<Globals>

src/lib_json/lib_json.vcproj renamed to makefiles/vs71/lib_json.vcproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -179,25 +179,25 @@
179179
RelativePath="..\..\include\json\json.h">
180180
</File>
181181
<File
182-
RelativePath=".\json_batchallocator.h">
182+
RelativePath="..\..\src\lib_json\json_batchallocator.h">
183183
</File>
184184
<File
185-
RelativePath=".\json_internalarray.inl">
185+
RelativePath="..\..\src\lib_json\json_internalarray.inl">
186186
</File>
187187
<File
188-
RelativePath=".\json_internalmap.inl">
188+
RelativePath="..\..\src\lib_json\json_internalmap.inl">
189189
</File>
190190
<File
191-
RelativePath=".\json_reader.cpp">
191+
RelativePath="..\..\src\lib_json\json_reader.cpp">
192192
</File>
193193
<File
194-
RelativePath=".\json_value.cpp">
194+
RelativePath="..\..\src\lib_json\json_value.cpp">
195195
</File>
196196
<File
197-
RelativePath=".\json_valueiterator.inl">
197+
RelativePath="..\..\src\lib_json\json_valueiterator.inl">
198198
</File>
199199
<File
200-
RelativePath=".\json_writer.cpp">
200+
RelativePath="..\..\src\lib_json\json_writer.cpp">
201201
</File>
202202
<File
203203
RelativePath="..\..\include\json\reader.h">

0 commit comments

Comments
 (0)