Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Commit d985a25

Browse files
danielcrennadanielcrenna
committed
fix build, switch to sub-modules
1 parent bf46d87 commit d985a25

File tree

12 files changed

+96
-90
lines changed

12 files changed

+96
-90
lines changed

‎.gitconfig

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# git config --local include.path ../.gitconfig
2+
[filter "tabspace"]
3+
smudge = unexpand --tabs=4 --first-only
4+
clean = expand --tabs=4 --initial

‎.gitmodules

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[submodule "ThirdParty/FNA"]
2+
path = ThirdParty/FNA
3+
url = [email protected]:FNA-XNA/FNA.git
4+
[submodule "ThirdParty/fnalibs"]
5+
path = ThirdParty/fnalibs
6+
url = [email protected]:conatuscreative/fnalibs.git

‎Pixel3D.FNA.sln

+63-83
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
99
README.md = README.md
1010
EndProjectSection
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNA", "..\FNA\FNA.csproj", "{35253CE1-C864-4CD3-8249-4D1319748E8F}"
13-
EndProject
1412
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pixel3D.AssetManagement", "src\Pixel3D.AssetManagement\Pixel3D.AssetManagement.csproj", "{550E1BFF-47BE-4B1E-9B11-2A1784519626}"
1513
EndProject
1614
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pixel3D.Audio", "src\Pixel3D.Audio\Pixel3D.Audio.csproj", "{52F63851-9353-44BE-BBBE-A4A92C353D14}"
@@ -37,15 +35,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pixel3D.Editing", "src\Pixe
3735
EndProject
3836
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pixel3D.UI", "src\Pixel3D.UI\Pixel3D.UI.csproj", "{0B11FD3D-6224-4683-8D9F-A5DE7112FD8A}"
3937
EndProject
40-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platform", "Platform", "{2E983101-F55E-4B28-9EB4-4700256FD982}"
38+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platform (FNA)", "Platform (FNA)", "{2E983101-F55E-4B28-9EB4-4700256FD982}"
4139
EndProject
42-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pixel3D.FNA", "src\Pixel3D.FNA\Pixel3D.FNA.csproj", "{23F36F16-472E-4884-BAFC-C75DD47D36D9}"
40+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CRTSim", "src\CRTSim\CRTSim.csproj", "{C648B5A1-DD73-4605-99E7-9C660CAB610A}"
4341
EndProject
44-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pixel3D.Pipeline.FNA", "src\Pixel3D.Pipeline.FNA\Pixel3D.Pipeline.FNA.csproj", "{E91B356E-F2C2-49E0-A9BB-E93BA1F9F409}"
42+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pixel3D", "src\Pixel3D\Pixel3D.csproj", "{07FD0040-3F93-4F5A-8941-932C0C6916B9}"
4543
EndProject
46-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pixel3D.ActorManagement.FNA", "src\Pixel3D.ActorManagement.FNA\Pixel3D.ActorManagement.FNA.csproj", "{C191543F-2FB0-4B3C-8578-244BAE55088E}"
44+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pixel3D.ActorManagement", "src\Pixel3D.ActorManagement\Pixel3D.ActorManagement.csproj", "{79DA4715-1D63-42C8-A6A9-1E007D9F21D8}"
4745
EndProject
48-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CRTSim", "src\CRTSim\CRTSim.csproj", "{C648B5A1-DD73-4605-99E7-9C660CAB610A}"
46+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNA", "ThirdParty\FNA\FNA.csproj", "{35253CE1-C864-4CD3-8249-4D1319748E8F}"
4947
EndProject
5048
Global
5149
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -60,24 +58,6 @@ Global
6058
Retail|x86 = Retail|x86
6159
EndGlobalSection
6260
GlobalSection(ProjectConfigurationPlatforms) = postSolution
63-
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
64-
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
65-
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|x64.ActiveCfg = Debug|x64
66-
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|x64.Build.0 = Debug|x64
67-
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|x86.ActiveCfg = Debug|x86
68-
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|x86.Build.0 = Debug|x86
69-
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
70-
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|Any CPU.Build.0 = Release|Any CPU
71-
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|x64.ActiveCfg = Release|x64
72-
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|x64.Build.0 = Release|x64
73-
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|x86.ActiveCfg = Release|x86
74-
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|x86.Build.0 = Release|x86
75-
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Retail|Any CPU.ActiveCfg = Release|Any CPU
76-
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Retail|Any CPU.Build.0 = Release|Any CPU
77-
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Retail|x64.ActiveCfg = Release|x64
78-
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Retail|x64.Build.0 = Release|x64
79-
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Retail|x86.ActiveCfg = Release|x86
80-
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Retail|x86.Build.0 = Release|x86
8161
{550E1BFF-47BE-4B1E-9B11-2A1784519626}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8262
{550E1BFF-47BE-4B1E-9B11-2A1784519626}.Debug|Any CPU.Build.0 = Debug|Any CPU
8363
{550E1BFF-47BE-4B1E-9B11-2A1784519626}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -312,60 +292,6 @@ Global
312292
{0B11FD3D-6224-4683-8D9F-A5DE7112FD8A}.Retail|x64.Build.0 = Retail|Any CPU
313293
{0B11FD3D-6224-4683-8D9F-A5DE7112FD8A}.Retail|x86.ActiveCfg = Retail|Any CPU
314294
{0B11FD3D-6224-4683-8D9F-A5DE7112FD8A}.Retail|x86.Build.0 = Retail|Any CPU
315-
{23F36F16-472E-4884-BAFC-C75DD47D36D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
316-
{23F36F16-472E-4884-BAFC-C75DD47D36D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
317-
{23F36F16-472E-4884-BAFC-C75DD47D36D9}.Debug|x64.ActiveCfg = Debug|Any CPU
318-
{23F36F16-472E-4884-BAFC-C75DD47D36D9}.Debug|x64.Build.0 = Debug|Any CPU
319-
{23F36F16-472E-4884-BAFC-C75DD47D36D9}.Debug|x86.ActiveCfg = Debug|Any CPU
320-
{23F36F16-472E-4884-BAFC-C75DD47D36D9}.Debug|x86.Build.0 = Debug|Any CPU
321-
{23F36F16-472E-4884-BAFC-C75DD47D36D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
322-
{23F36F16-472E-4884-BAFC-C75DD47D36D9}.Release|Any CPU.Build.0 = Release|Any CPU
323-
{23F36F16-472E-4884-BAFC-C75DD47D36D9}.Release|x64.ActiveCfg = Release|Any CPU
324-
{23F36F16-472E-4884-BAFC-C75DD47D36D9}.Release|x64.Build.0 = Release|Any CPU
325-
{23F36F16-472E-4884-BAFC-C75DD47D36D9}.Release|x86.ActiveCfg = Release|Any CPU
326-
{23F36F16-472E-4884-BAFC-C75DD47D36D9}.Release|x86.Build.0 = Release|Any CPU
327-
{23F36F16-472E-4884-BAFC-C75DD47D36D9}.Retail|Any CPU.ActiveCfg = Retail|Any CPU
328-
{23F36F16-472E-4884-BAFC-C75DD47D36D9}.Retail|Any CPU.Build.0 = Retail|Any CPU
329-
{23F36F16-472E-4884-BAFC-C75DD47D36D9}.Retail|x64.ActiveCfg = Retail|Any CPU
330-
{23F36F16-472E-4884-BAFC-C75DD47D36D9}.Retail|x64.Build.0 = Retail|Any CPU
331-
{23F36F16-472E-4884-BAFC-C75DD47D36D9}.Retail|x86.ActiveCfg = Retail|Any CPU
332-
{23F36F16-472E-4884-BAFC-C75DD47D36D9}.Retail|x86.Build.0 = Retail|Any CPU
333-
{E91B356E-F2C2-49E0-A9BB-E93BA1F9F409}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
334-
{E91B356E-F2C2-49E0-A9BB-E93BA1F9F409}.Debug|Any CPU.Build.0 = Debug|Any CPU
335-
{E91B356E-F2C2-49E0-A9BB-E93BA1F9F409}.Debug|x64.ActiveCfg = Debug|Any CPU
336-
{E91B356E-F2C2-49E0-A9BB-E93BA1F9F409}.Debug|x64.Build.0 = Debug|Any CPU
337-
{E91B356E-F2C2-49E0-A9BB-E93BA1F9F409}.Debug|x86.ActiveCfg = Debug|Any CPU
338-
{E91B356E-F2C2-49E0-A9BB-E93BA1F9F409}.Debug|x86.Build.0 = Debug|Any CPU
339-
{E91B356E-F2C2-49E0-A9BB-E93BA1F9F409}.Release|Any CPU.ActiveCfg = Release|Any CPU
340-
{E91B356E-F2C2-49E0-A9BB-E93BA1F9F409}.Release|Any CPU.Build.0 = Release|Any CPU
341-
{E91B356E-F2C2-49E0-A9BB-E93BA1F9F409}.Release|x64.ActiveCfg = Release|Any CPU
342-
{E91B356E-F2C2-49E0-A9BB-E93BA1F9F409}.Release|x64.Build.0 = Release|Any CPU
343-
{E91B356E-F2C2-49E0-A9BB-E93BA1F9F409}.Release|x86.ActiveCfg = Release|Any CPU
344-
{E91B356E-F2C2-49E0-A9BB-E93BA1F9F409}.Release|x86.Build.0 = Release|Any CPU
345-
{E91B356E-F2C2-49E0-A9BB-E93BA1F9F409}.Retail|Any CPU.ActiveCfg = Retail|Any CPU
346-
{E91B356E-F2C2-49E0-A9BB-E93BA1F9F409}.Retail|Any CPU.Build.0 = Retail|Any CPU
347-
{E91B356E-F2C2-49E0-A9BB-E93BA1F9F409}.Retail|x64.ActiveCfg = Retail|Any CPU
348-
{E91B356E-F2C2-49E0-A9BB-E93BA1F9F409}.Retail|x64.Build.0 = Retail|Any CPU
349-
{E91B356E-F2C2-49E0-A9BB-E93BA1F9F409}.Retail|x86.ActiveCfg = Retail|Any CPU
350-
{E91B356E-F2C2-49E0-A9BB-E93BA1F9F409}.Retail|x86.Build.0 = Retail|Any CPU
351-
{C191543F-2FB0-4B3C-8578-244BAE55088E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
352-
{C191543F-2FB0-4B3C-8578-244BAE55088E}.Debug|Any CPU.Build.0 = Debug|Any CPU
353-
{C191543F-2FB0-4B3C-8578-244BAE55088E}.Debug|x64.ActiveCfg = Debug|Any CPU
354-
{C191543F-2FB0-4B3C-8578-244BAE55088E}.Debug|x64.Build.0 = Debug|Any CPU
355-
{C191543F-2FB0-4B3C-8578-244BAE55088E}.Debug|x86.ActiveCfg = Debug|Any CPU
356-
{C191543F-2FB0-4B3C-8578-244BAE55088E}.Debug|x86.Build.0 = Debug|Any CPU
357-
{C191543F-2FB0-4B3C-8578-244BAE55088E}.Release|Any CPU.ActiveCfg = Release|Any CPU
358-
{C191543F-2FB0-4B3C-8578-244BAE55088E}.Release|Any CPU.Build.0 = Release|Any CPU
359-
{C191543F-2FB0-4B3C-8578-244BAE55088E}.Release|x64.ActiveCfg = Release|Any CPU
360-
{C191543F-2FB0-4B3C-8578-244BAE55088E}.Release|x64.Build.0 = Release|Any CPU
361-
{C191543F-2FB0-4B3C-8578-244BAE55088E}.Release|x86.ActiveCfg = Release|Any CPU
362-
{C191543F-2FB0-4B3C-8578-244BAE55088E}.Release|x86.Build.0 = Release|Any CPU
363-
{C191543F-2FB0-4B3C-8578-244BAE55088E}.Retail|Any CPU.ActiveCfg = Retail|Any CPU
364-
{C191543F-2FB0-4B3C-8578-244BAE55088E}.Retail|Any CPU.Build.0 = Retail|Any CPU
365-
{C191543F-2FB0-4B3C-8578-244BAE55088E}.Retail|x64.ActiveCfg = Retail|Any CPU
366-
{C191543F-2FB0-4B3C-8578-244BAE55088E}.Retail|x64.Build.0 = Retail|Any CPU
367-
{C191543F-2FB0-4B3C-8578-244BAE55088E}.Retail|x86.ActiveCfg = Retail|Any CPU
368-
{C191543F-2FB0-4B3C-8578-244BAE55088E}.Retail|x86.Build.0 = Retail|Any CPU
369295
{C648B5A1-DD73-4605-99E7-9C660CAB610A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
370296
{C648B5A1-DD73-4605-99E7-9C660CAB610A}.Debug|Any CPU.Build.0 = Debug|Any CPU
371297
{C648B5A1-DD73-4605-99E7-9C660CAB610A}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -384,17 +310,71 @@ Global
384310
{C648B5A1-DD73-4605-99E7-9C660CAB610A}.Retail|x64.Build.0 = Release|Any CPU
385311
{C648B5A1-DD73-4605-99E7-9C660CAB610A}.Retail|x86.ActiveCfg = Release|Any CPU
386312
{C648B5A1-DD73-4605-99E7-9C660CAB610A}.Retail|x86.Build.0 = Release|Any CPU
313+
{07FD0040-3F93-4F5A-8941-932C0C6916B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
314+
{07FD0040-3F93-4F5A-8941-932C0C6916B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
315+
{07FD0040-3F93-4F5A-8941-932C0C6916B9}.Debug|x64.ActiveCfg = Debug|Any CPU
316+
{07FD0040-3F93-4F5A-8941-932C0C6916B9}.Debug|x64.Build.0 = Debug|Any CPU
317+
{07FD0040-3F93-4F5A-8941-932C0C6916B9}.Debug|x86.ActiveCfg = Debug|Any CPU
318+
{07FD0040-3F93-4F5A-8941-932C0C6916B9}.Debug|x86.Build.0 = Debug|Any CPU
319+
{07FD0040-3F93-4F5A-8941-932C0C6916B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
320+
{07FD0040-3F93-4F5A-8941-932C0C6916B9}.Release|Any CPU.Build.0 = Release|Any CPU
321+
{07FD0040-3F93-4F5A-8941-932C0C6916B9}.Release|x64.ActiveCfg = Release|Any CPU
322+
{07FD0040-3F93-4F5A-8941-932C0C6916B9}.Release|x64.Build.0 = Release|Any CPU
323+
{07FD0040-3F93-4F5A-8941-932C0C6916B9}.Release|x86.ActiveCfg = Release|Any CPU
324+
{07FD0040-3F93-4F5A-8941-932C0C6916B9}.Release|x86.Build.0 = Release|Any CPU
325+
{07FD0040-3F93-4F5A-8941-932C0C6916B9}.Retail|Any CPU.ActiveCfg = Retail|Any CPU
326+
{07FD0040-3F93-4F5A-8941-932C0C6916B9}.Retail|Any CPU.Build.0 = Retail|Any CPU
327+
{07FD0040-3F93-4F5A-8941-932C0C6916B9}.Retail|x64.ActiveCfg = Retail|Any CPU
328+
{07FD0040-3F93-4F5A-8941-932C0C6916B9}.Retail|x64.Build.0 = Retail|Any CPU
329+
{07FD0040-3F93-4F5A-8941-932C0C6916B9}.Retail|x86.ActiveCfg = Retail|Any CPU
330+
{07FD0040-3F93-4F5A-8941-932C0C6916B9}.Retail|x86.Build.0 = Retail|Any CPU
331+
{79DA4715-1D63-42C8-A6A9-1E007D9F21D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
332+
{79DA4715-1D63-42C8-A6A9-1E007D9F21D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
333+
{79DA4715-1D63-42C8-A6A9-1E007D9F21D8}.Debug|x64.ActiveCfg = Debug|Any CPU
334+
{79DA4715-1D63-42C8-A6A9-1E007D9F21D8}.Debug|x64.Build.0 = Debug|Any CPU
335+
{79DA4715-1D63-42C8-A6A9-1E007D9F21D8}.Debug|x86.ActiveCfg = Debug|Any CPU
336+
{79DA4715-1D63-42C8-A6A9-1E007D9F21D8}.Debug|x86.Build.0 = Debug|Any CPU
337+
{79DA4715-1D63-42C8-A6A9-1E007D9F21D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
338+
{79DA4715-1D63-42C8-A6A9-1E007D9F21D8}.Release|Any CPU.Build.0 = Release|Any CPU
339+
{79DA4715-1D63-42C8-A6A9-1E007D9F21D8}.Release|x64.ActiveCfg = Release|Any CPU
340+
{79DA4715-1D63-42C8-A6A9-1E007D9F21D8}.Release|x64.Build.0 = Release|Any CPU
341+
{79DA4715-1D63-42C8-A6A9-1E007D9F21D8}.Release|x86.ActiveCfg = Release|Any CPU
342+
{79DA4715-1D63-42C8-A6A9-1E007D9F21D8}.Release|x86.Build.0 = Release|Any CPU
343+
{79DA4715-1D63-42C8-A6A9-1E007D9F21D8}.Retail|Any CPU.ActiveCfg = Retail|Any CPU
344+
{79DA4715-1D63-42C8-A6A9-1E007D9F21D8}.Retail|Any CPU.Build.0 = Retail|Any CPU
345+
{79DA4715-1D63-42C8-A6A9-1E007D9F21D8}.Retail|x64.ActiveCfg = Retail|Any CPU
346+
{79DA4715-1D63-42C8-A6A9-1E007D9F21D8}.Retail|x64.Build.0 = Retail|Any CPU
347+
{79DA4715-1D63-42C8-A6A9-1E007D9F21D8}.Retail|x86.ActiveCfg = Retail|Any CPU
348+
{79DA4715-1D63-42C8-A6A9-1E007D9F21D8}.Retail|x86.Build.0 = Retail|Any CPU
349+
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
350+
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
351+
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|x64.ActiveCfg = Debug|x64
352+
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|x64.Build.0 = Debug|x64
353+
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|x86.ActiveCfg = Debug|x86
354+
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|x86.Build.0 = Debug|x86
355+
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
356+
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|Any CPU.Build.0 = Release|Any CPU
357+
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|x64.ActiveCfg = Release|x64
358+
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|x64.Build.0 = Release|x64
359+
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|x86.ActiveCfg = Release|x86
360+
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|x86.Build.0 = Release|x86
361+
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Retail|Any CPU.ActiveCfg = Release|Any CPU
362+
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Retail|Any CPU.Build.0 = Release|Any CPU
363+
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Retail|x64.ActiveCfg = Release|x64
364+
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Retail|x64.Build.0 = Release|x64
365+
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Retail|x86.ActiveCfg = Release|x86
366+
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Retail|x86.Build.0 = Release|x86
387367
EndGlobalSection
388368
GlobalSection(SolutionProperties) = preSolution
389369
HideSolutionNode = FALSE
390370
EndGlobalSection
391371
GlobalSection(NestedProjects) = preSolution
392-
{35253CE1-C864-4CD3-8249-4D1319748E8F} = {2E983101-F55E-4B28-9EB4-4700256FD982}
372+
{52F63851-9353-44BE-BBBE-A4A92C353D14} = {2E983101-F55E-4B28-9EB4-4700256FD982}
393373
{8FCAC036-3C4D-4021-8591-C1F1DE09F226} = {2E983101-F55E-4B28-9EB4-4700256FD982}
394-
{23F36F16-472E-4884-BAFC-C75DD47D36D9} = {2E983101-F55E-4B28-9EB4-4700256FD982}
395-
{E91B356E-F2C2-49E0-A9BB-E93BA1F9F409} = {2E983101-F55E-4B28-9EB4-4700256FD982}
396-
{C191543F-2FB0-4B3C-8578-244BAE55088E} = {2E983101-F55E-4B28-9EB4-4700256FD982}
397374
{C648B5A1-DD73-4605-99E7-9C660CAB610A} = {2E983101-F55E-4B28-9EB4-4700256FD982}
375+
{07FD0040-3F93-4F5A-8941-932C0C6916B9} = {2E983101-F55E-4B28-9EB4-4700256FD982}
376+
{79DA4715-1D63-42C8-A6A9-1E007D9F21D8} = {2E983101-F55E-4B28-9EB4-4700256FD982}
377+
{35253CE1-C864-4CD3-8249-4D1319748E8F} = {2E983101-F55E-4B28-9EB4-4700256FD982}
398378
EndGlobalSection
399379
GlobalSection(ExtensibilityGlobals) = postSolution
400380
SolutionGuid = {E2785EB1-1CEF-47F7-A35D-2C8C78834469}

‎ThirdParty/FNA

Submodule FNA added at 5ac67ce

‎ThirdParty/fnalibs

Submodule fnalibs added at 6936ffe

‎src/CRTSim/CRTSim.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<ProjectReference Include="..\..\..\FNA\FNA.csproj" />
8+
<ProjectReference Include="..\..\ThirdParty\FNA\FNA.csproj" />
99
</ItemGroup>
1010

1111
</Project>

‎src/Pixel3D.ActorManagement/Pixel3D.ActorManagement.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18+
<ProjectReference Include="..\..\ThirdParty\FNA\FNA.csproj" />
1819
<ProjectReference Include="..\Pixel3D.Audio\Pixel3D.Audio.csproj" />
1920
<ProjectReference Include="..\Pixel3D.StateManagement\Pixel3D.StateManagement.csproj" />
2021
<ProjectReference Include="..\Pixel3D.Strings\Pixel3D.Strings.csproj" />

‎src/Pixel3D.Audio/Pixel3D.Audio.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<ProjectReference Include="..\..\..\FNA\FNA.csproj" />
22+
<ProjectReference Include="..\..\ThirdParty\FNA\FNA.csproj" />
2323
<ProjectReference Include="..\Pixel3D.Common\Pixel3D.Common.csproj" />
2424
<ProjectReference Include="..\Pixel3D\Pixel3D.csproj" />
2525
</ItemGroup>

‎src/Pixel3D.Engine.FNA/Pixel3D.Engine.FNA.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
</PropertyGroup>
2424

2525
<ItemGroup>
26-
<ProjectReference Include="..\..\..\FNA\FNA.csproj" />
27-
<ProjectReference Include="..\Pixel3D.ActorManagement.FNA\Pixel3D.ActorManagement.FNA.csproj" />
26+
<ProjectReference Include="..\..\ThirdParty\FNA\FNA.csproj" />
27+
<ProjectReference Include="..\Pixel3D.ActorManagement\Pixel3D.ActorManagement.csproj" />
2828
<ProjectReference Include="..\Pixel3D.AssetManagement\Pixel3D.AssetManagement.csproj" />
2929
<ProjectReference Include="..\Pixel3D.Audio\Pixel3D.Audio.csproj" />
3030
<ProjectReference Include="..\Pixel3D.Common\Pixel3D.Common.csproj" />
31-
<ProjectReference Include="..\Pixel3D.FNA\Pixel3D.FNA.csproj" />
3231
<ProjectReference Include="..\Pixel3D.LoopRecorder\Pixel3D.LoopRecorder.csproj" />
3332
<ProjectReference Include="..\Pixel3D.Serialization\Pixel3D.Serialization.csproj" />
33+
<ProjectReference Include="..\Pixel3D\Pixel3D.csproj" />
3434
</ItemGroup>
3535

3636
</Project>

‎src/Pixel3D.UI/Pixel3D.UI.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<ProjectReference Include="..\Pixel3D.ActorManagement.FNA\Pixel3D.ActorManagement.FNA.csproj" />
21+
<ProjectReference Include="..\Pixel3D.ActorManagement\Pixel3D.ActorManagement.csproj" />
2222
<ProjectReference Include="..\Pixel3D.Audio\Pixel3D.Audio.csproj" />
2323
<ProjectReference Include="..\Pixel3D.Strings\Pixel3D.Strings.csproj" />
2424
</ItemGroup>

‎src/Pixel3D/Pixel3D.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</PropertyGroup>
3737

3838
<ItemGroup>
39-
<ProjectReference Include="..\..\..\FNA\FNA.csproj" />
39+
<ProjectReference Include="..\..\ThirdParty\FNA\FNA.csproj" />
4040
<ProjectReference Include="..\CRTSim\CRTSim.csproj" />
4141
<ProjectReference Include="..\Pixel3D.Common\Pixel3D.Common.csproj" />
4242
</ItemGroup>

‎update.cmd

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
@ECHO OFF
2+
3+
REM use .gitconfig for this repository
4+
git config --local include.path /.gitconfig
5+
6+
REM first time use
7+
git submodule update --init --recursive
8+
9+
REM switch all submodules to master
10+
git submodule foreach git checkout master
11+
12+
REM update all submodules to use tips of master branches
13+
git submodule foreach git pull origin master

0 commit comments

Comments
 (0)