diff --git a/Code/DanBias.sln b/Code/DanBias.sln index 1335db2f..80a76dea 100644 --- a/Code/DanBias.sln +++ b/Code/DanBias.sln @@ -3,45 +3,47 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OysterGraphics", "OysterGraphics\OysterGraphics.vcxproj", "{0EC83E64-230E-48EF-B08C-6AC9651B4F82}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OysterMath", "OysterMath\OysterMath.vcxproj", "{F10CBC03-9809-4CBA-95D8-327C287B18EE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OysterPhysics3D", "OysterPhysics3D\OysterPhysics3D.vcxproj", "{4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sound", "Sound\Sound.vcxproj", "{34D6295A-00DD-4B1A-8258-97DA2818EC26}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowManager", "WindowManager\WindowManager.vcxproj", "{35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Input", "Input\Input.vcxproj", "{7E3990D2-3D94-465C-B58D-64A74B3ECF9B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Misc", "Misc\Misc.vcxproj", "{2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Network", "Network", "{C27B926E-B3EF-4990-8822-47580E43A0BE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetworkDependencies", "Network\NetworkDependencies\NetworkDependencies.vcxproj", "{C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GamePhysics", "GamePhysics\GamePhysics.vcxproj", "{104FA3E9-94D9-4E1D-A941-28A03BC8A095}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DanBiasGame", "Game\DanBiasGame\DanBiasGame.vcxproj", "{2A1BC987-AF42-4500-802D-89CD32FC1309}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Game", "Game", "{20720CA7-795C-45AD-A302-9383A6DD503A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameLogic", "Game\GameLogic\GameLogic.vcxproj", "{B1195BB9-B3A5-47F0-906C-8DEA384D1520}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DanBiasLauncher", "Game\DanBiasLauncher\DanBiasLauncher.vcxproj", "{8690FDDF-C5B7-4C42-A337-BD5243F29B85}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetworkAPI", "Network\NetworkAPI\NetworkAPI.vcxproj", "{460D625F-2AC9-4559-B809-0BA89CEAEDF4}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameProtocols", "Game\GameProtocols\GameProtocols.vcxproj", "{DA2AA800-ED64-4649-8B3B-E7F1E3968B78}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameServer", "Game\GameServer\GameServer.vcxproj", "{143BD516-20A1-4890-A3E4-F8BFD02220E7}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Physics", "Physics", "{0D86E569-9C74-47F0-BDB2-390C0C9A084B}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Physics", "Physics", "{F156EEBC-0195-4020-8700-4433208DE12B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CLIStandaloneServer", "CLIStandaloneServer\CLIStandaloneServer.vcxproj", "{C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GamePhysics", "Physics\GamePhysics\GamePhysics.vcxproj", "{C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Stand Alone Server", "Stand Alone Server", "{9CCCBB44-303F-44AE-B99C-4165AD894DBD}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OysterPhysics3D", "Physics\OysterPhysics3D\OysterPhysics3D.vcxproj", "{3EA5F14D-2A71-4588-A69D-87C4571C580F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StandAloneLauncher", "StandAloneLauncher\StandAloneLauncher.csproj", "{604A12A7-07BF-4482-BDF3-7101C811F121}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{1322B12B-5E37-448A-AAAF-F637460DCB23}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Input", "Misc\Input\Input.vcxproj", "{7E3990D2-3D94-465C-B58D-64A74B3ECF9B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OysterMath", "Misc\OysterMath\OysterMath.vcxproj", "{F10CBC03-9809-4CBA-95D8-327C287B18EE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowManager", "Misc\WindowManager\WindowManager.vcxproj", "{35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LanServer", "LanServer", "{C83A6FAD-E71F-4B1E-9D63-E93E61DDC012}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StandAloneLauncher", "Game\LanServer\StandAloneLauncher\StandAloneLauncher.csproj", "{604A12A7-07BF-4482-BDF3-7101C811F121}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CLIStandaloneServer", "Game\LanServer\CLIStandaloneServer\CLIStandaloneServer.vcxproj", "{C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameLauncher", "Game\GameLauncher\GameLauncher.vcxproj", "{8690FDDF-C5B7-4C42-A337-BD5243F29B85}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameClient", "Game\GameClient\GameClient.vcxproj", "{2A1BC987-AF42-4500-802D-89CD32FC1309}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utilities", "Misc\Utilities\Utilities.vcxproj", "{2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -49,18 +51,22 @@ Global Debug|Mixed Platforms = Debug|Mixed Platforms Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 MinSizeRel|Any CPU = MinSizeRel|Any CPU MinSizeRel|Mixed Platforms = MinSizeRel|Mixed Platforms MinSizeRel|Win32 = MinSizeRel|Win32 MinSizeRel|x64 = MinSizeRel|x64 + MinSizeRel|x86 = MinSizeRel|x86 Release|Any CPU = Release|Any CPU Release|Mixed Platforms = Release|Mixed Platforms Release|Win32 = Release|Win32 Release|x64 = Release|x64 + Release|x86 = Release|x86 RelWithDebInfo|Any CPU = RelWithDebInfo|Any CPU RelWithDebInfo|Mixed Platforms = RelWithDebInfo|Mixed Platforms RelWithDebInfo|Win32 = RelWithDebInfo|Win32 RelWithDebInfo|x64 = RelWithDebInfo|x64 + RelWithDebInfo|x86 = RelWithDebInfo|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Debug|Any CPU.ActiveCfg = Debug|Win32 @@ -70,6 +76,8 @@ Global {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Debug|Win32.Build.0 = Debug|Win32 {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Debug|x64.ActiveCfg = Debug|x64 {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Debug|x64.Build.0 = Debug|x64 + {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Debug|x86.ActiveCfg = Debug|Win32 + {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Debug|x86.Build.0 = Debug|Win32 {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 @@ -77,6 +85,8 @@ Global {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.MinSizeRel|Win32.Build.0 = Release|Win32 {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.MinSizeRel|x64.ActiveCfg = Release|x64 {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.MinSizeRel|x64.Build.0 = Release|x64 + {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.MinSizeRel|x86.ActiveCfg = Release|Win32 + {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.MinSizeRel|x86.Build.0 = Release|Win32 {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Release|Any CPU.ActiveCfg = Release|Win32 {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Release|Mixed Platforms.Build.0 = Release|Win32 @@ -84,6 +94,8 @@ Global {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Release|Win32.Build.0 = Release|Win32 {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Release|x64.ActiveCfg = Release|x64 {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Release|x64.Build.0 = Release|x64 + {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Release|x86.ActiveCfg = Release|Win32 + {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Release|x86.Build.0 = Release|Win32 {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 @@ -91,62 +103,8 @@ Global {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.RelWithDebInfo|Win32.Build.0 = Release|Win32 {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.RelWithDebInfo|x64.ActiveCfg = Release|x64 {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.RelWithDebInfo|x64.Build.0 = Release|x64 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|Win32.ActiveCfg = Debug|Win32 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|Win32.Build.0 = Debug|Win32 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|x64.ActiveCfg = Debug|x64 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|x64.Build.0 = Debug|x64 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.MinSizeRel|Win32.ActiveCfg = Release|Win32 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.MinSizeRel|Win32.Build.0 = Release|Win32 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.MinSizeRel|x64.ActiveCfg = Release|x64 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.MinSizeRel|x64.Build.0 = Release|x64 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|Any CPU.ActiveCfg = Release|Win32 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|Mixed Platforms.Build.0 = Release|Win32 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|Win32.ActiveCfg = Release|Win32 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|Win32.Build.0 = Release|Win32 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|x64.ActiveCfg = Release|x64 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|x64.Build.0 = Release|x64 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.RelWithDebInfo|Win32.Build.0 = Release|Win32 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.RelWithDebInfo|x64.ActiveCfg = Release|x64 - {F10CBC03-9809-4CBA-95D8-327C287B18EE}.RelWithDebInfo|x64.Build.0 = Release|x64 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.Debug|Win32.ActiveCfg = Debug|Win32 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.Debug|Win32.Build.0 = Debug|Win32 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.Debug|x64.ActiveCfg = Debug|x64 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.Debug|x64.Build.0 = Debug|x64 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.MinSizeRel|Win32.ActiveCfg = Release|Win32 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.MinSizeRel|Win32.Build.0 = Release|Win32 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.MinSizeRel|x64.ActiveCfg = Release|x64 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.MinSizeRel|x64.Build.0 = Release|x64 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.Release|Any CPU.ActiveCfg = Release|Win32 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.Release|Mixed Platforms.Build.0 = Release|Win32 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.Release|Win32.ActiveCfg = Release|Win32 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.Release|Win32.Build.0 = Release|Win32 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.Release|x64.ActiveCfg = Release|x64 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.Release|x64.Build.0 = Release|x64 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.RelWithDebInfo|Win32.Build.0 = Release|Win32 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.RelWithDebInfo|x64.ActiveCfg = Release|x64 - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8}.RelWithDebInfo|x64.Build.0 = Release|x64 + {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.RelWithDebInfo|x86.ActiveCfg = Release|Win32 + {0EC83E64-230E-48EF-B08C-6AC9651B4F82}.RelWithDebInfo|x86.Build.0 = Release|Win32 {34D6295A-00DD-4B1A-8258-97DA2818EC26}.Debug|Any CPU.ActiveCfg = Debug|Win32 {34D6295A-00DD-4B1A-8258-97DA2818EC26}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {34D6295A-00DD-4B1A-8258-97DA2818EC26}.Debug|Mixed Platforms.Build.0 = Debug|Win32 @@ -154,6 +112,8 @@ Global {34D6295A-00DD-4B1A-8258-97DA2818EC26}.Debug|Win32.Build.0 = Debug|Win32 {34D6295A-00DD-4B1A-8258-97DA2818EC26}.Debug|x64.ActiveCfg = Debug|x64 {34D6295A-00DD-4B1A-8258-97DA2818EC26}.Debug|x64.Build.0 = Debug|x64 + {34D6295A-00DD-4B1A-8258-97DA2818EC26}.Debug|x86.ActiveCfg = Debug|Win32 + {34D6295A-00DD-4B1A-8258-97DA2818EC26}.Debug|x86.Build.0 = Debug|Win32 {34D6295A-00DD-4B1A-8258-97DA2818EC26}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 {34D6295A-00DD-4B1A-8258-97DA2818EC26}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 {34D6295A-00DD-4B1A-8258-97DA2818EC26}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 @@ -161,6 +121,8 @@ Global {34D6295A-00DD-4B1A-8258-97DA2818EC26}.MinSizeRel|Win32.Build.0 = Release|Win32 {34D6295A-00DD-4B1A-8258-97DA2818EC26}.MinSizeRel|x64.ActiveCfg = Release|x64 {34D6295A-00DD-4B1A-8258-97DA2818EC26}.MinSizeRel|x64.Build.0 = Release|x64 + {34D6295A-00DD-4B1A-8258-97DA2818EC26}.MinSizeRel|x86.ActiveCfg = Release|Win32 + {34D6295A-00DD-4B1A-8258-97DA2818EC26}.MinSizeRel|x86.Build.0 = Release|Win32 {34D6295A-00DD-4B1A-8258-97DA2818EC26}.Release|Any CPU.ActiveCfg = Release|Win32 {34D6295A-00DD-4B1A-8258-97DA2818EC26}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {34D6295A-00DD-4B1A-8258-97DA2818EC26}.Release|Mixed Platforms.Build.0 = Release|Win32 @@ -168,6 +130,8 @@ Global {34D6295A-00DD-4B1A-8258-97DA2818EC26}.Release|Win32.Build.0 = Release|Win32 {34D6295A-00DD-4B1A-8258-97DA2818EC26}.Release|x64.ActiveCfg = Release|x64 {34D6295A-00DD-4B1A-8258-97DA2818EC26}.Release|x64.Build.0 = Release|x64 + {34D6295A-00DD-4B1A-8258-97DA2818EC26}.Release|x86.ActiveCfg = Release|Win32 + {34D6295A-00DD-4B1A-8258-97DA2818EC26}.Release|x86.Build.0 = Release|Win32 {34D6295A-00DD-4B1A-8258-97DA2818EC26}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 {34D6295A-00DD-4B1A-8258-97DA2818EC26}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 {34D6295A-00DD-4B1A-8258-97DA2818EC26}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 @@ -175,90 +139,8 @@ Global {34D6295A-00DD-4B1A-8258-97DA2818EC26}.RelWithDebInfo|Win32.Build.0 = Release|Win32 {34D6295A-00DD-4B1A-8258-97DA2818EC26}.RelWithDebInfo|x64.ActiveCfg = Release|x64 {34D6295A-00DD-4B1A-8258-97DA2818EC26}.RelWithDebInfo|x64.Build.0 = Release|x64 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Debug|Win32.ActiveCfg = Debug|Win32 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Debug|Win32.Build.0 = Debug|Win32 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Debug|x64.ActiveCfg = Debug|x64 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Debug|x64.Build.0 = Debug|x64 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.MinSizeRel|Win32.ActiveCfg = Release|Win32 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.MinSizeRel|Win32.Build.0 = Release|Win32 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.MinSizeRel|x64.ActiveCfg = Release|x64 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.MinSizeRel|x64.Build.0 = Release|x64 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Release|Any CPU.ActiveCfg = Release|Win32 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Release|Mixed Platforms.Build.0 = Release|Win32 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Release|Win32.ActiveCfg = Release|Win32 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Release|Win32.Build.0 = Release|Win32 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Release|x64.ActiveCfg = Release|x64 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Release|x64.Build.0 = Release|x64 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.RelWithDebInfo|Win32.Build.0 = Release|Win32 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.RelWithDebInfo|x64.ActiveCfg = Release|x64 - {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.RelWithDebInfo|x64.Build.0 = Release|x64 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Debug|Win32.ActiveCfg = Debug|Win32 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Debug|Win32.Build.0 = Debug|Win32 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Debug|x64.ActiveCfg = Debug|x64 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Debug|x64.Build.0 = Debug|x64 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.MinSizeRel|Win32.ActiveCfg = Release|Win32 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.MinSizeRel|Win32.Build.0 = Release|Win32 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.MinSizeRel|x64.ActiveCfg = Release|x64 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.MinSizeRel|x64.Build.0 = Release|x64 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Release|Any CPU.ActiveCfg = Release|Win32 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Release|Mixed Platforms.Build.0 = Release|Win32 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Release|Win32.ActiveCfg = Release|Win32 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Release|Win32.Build.0 = Release|Win32 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Release|x64.ActiveCfg = Release|x64 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Release|x64.Build.0 = Release|x64 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.RelWithDebInfo|Win32.Build.0 = Release|Win32 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.RelWithDebInfo|x64.ActiveCfg = Release|x64 - {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.RelWithDebInfo|x64.Build.0 = Release|x64 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|Win32.ActiveCfg = Debug|Win32 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|Win32.Build.0 = Debug|Win32 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|x64.ActiveCfg = Debug|x64 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|x64.Build.0 = Debug|x64 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.MinSizeRel|Win32.ActiveCfg = Release|Win32 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.MinSizeRel|Win32.Build.0 = Release|Win32 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.MinSizeRel|x64.ActiveCfg = Release|x64 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.MinSizeRel|x64.Build.0 = Release|x64 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|Any CPU.ActiveCfg = Release|Win32 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|Mixed Platforms.Build.0 = Release|Win32 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|Win32.ActiveCfg = Release|Win32 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|Win32.Build.0 = Release|Win32 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|x64.ActiveCfg = Release|x64 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|x64.Build.0 = Release|x64 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.RelWithDebInfo|Win32.Build.0 = Release|Win32 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.RelWithDebInfo|x64.ActiveCfg = Release|x64 - {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.RelWithDebInfo|x64.Build.0 = Release|x64 + {34D6295A-00DD-4B1A-8258-97DA2818EC26}.RelWithDebInfo|x86.ActiveCfg = Release|Win32 + {34D6295A-00DD-4B1A-8258-97DA2818EC26}.RelWithDebInfo|x86.Build.0 = Release|Win32 {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Debug|Any CPU.ActiveCfg = Debug|Win32 {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Debug|Mixed Platforms.Build.0 = Debug|Win32 @@ -266,10 +148,14 @@ Global {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Debug|Win32.Build.0 = Debug|Win32 {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Debug|x64.ActiveCfg = Debug|x64 {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Debug|x64.Build.0 = Debug|x64 + {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Debug|x86.ActiveCfg = Debug|Win32 + {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Debug|x86.Build.0 = Debug|Win32 {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.MinSizeRel|Win32.ActiveCfg = Release|Win32 {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.MinSizeRel|x64.ActiveCfg = Release|x64 + {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.MinSizeRel|x86.ActiveCfg = Release|Win32 + {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.MinSizeRel|x86.Build.0 = Release|Win32 {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Release|Any CPU.ActiveCfg = Release|Win32 {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Release|Mixed Platforms.Build.0 = Release|Win32 @@ -277,66 +163,14 @@ Global {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Release|Win32.Build.0 = Release|Win32 {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Release|x64.ActiveCfg = Release|x64 {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Release|x64.Build.0 = Release|x64 + {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Release|x86.ActiveCfg = Release|Win32 + {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Release|x86.Build.0 = Release|Win32 {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.RelWithDebInfo|x64.ActiveCfg = Release|x64 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.Debug|Win32.ActiveCfg = Debug|Win32 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.Debug|Win32.Build.0 = Debug|Win32 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.Debug|x64.ActiveCfg = Debug|x64 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.Debug|x64.Build.0 = Debug|x64 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.MinSizeRel|Win32.ActiveCfg = Release|Win32 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.MinSizeRel|Win32.Build.0 = Release|Win32 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.MinSizeRel|x64.ActiveCfg = Release|x64 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.MinSizeRel|x64.Build.0 = Release|x64 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.Release|Any CPU.ActiveCfg = Release|Win32 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.Release|Mixed Platforms.Build.0 = Release|Win32 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.Release|Win32.ActiveCfg = Release|Win32 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.Release|Win32.Build.0 = Release|Win32 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.Release|x64.ActiveCfg = Release|x64 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.Release|x64.Build.0 = Release|x64 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.RelWithDebInfo|Win32.Build.0 = Release|Win32 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.RelWithDebInfo|x64.ActiveCfg = Release|x64 - {104FA3E9-94D9-4E1D-A941-28A03BC8A095}.RelWithDebInfo|x64.Build.0 = Release|x64 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.Debug|Win32.ActiveCfg = Debug|Win32 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.Debug|Win32.Build.0 = Debug|Win32 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.Debug|x64.ActiveCfg = Debug|x64 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.Debug|x64.Build.0 = Debug|x64 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.MinSizeRel|Win32.ActiveCfg = Release|Win32 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.MinSizeRel|Win32.Build.0 = Release|Win32 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.MinSizeRel|x64.ActiveCfg = Release|x64 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.MinSizeRel|x64.Build.0 = Release|x64 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.Release|Any CPU.ActiveCfg = Release|Win32 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.Release|Mixed Platforms.Build.0 = Release|Win32 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.Release|Win32.ActiveCfg = Release|Win32 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.Release|Win32.Build.0 = Release|Win32 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.Release|x64.ActiveCfg = Release|x64 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.Release|x64.Build.0 = Release|x64 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.RelWithDebInfo|Win32.Build.0 = Release|Win32 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.RelWithDebInfo|x64.ActiveCfg = Release|x64 - {2A1BC987-AF42-4500-802D-89CD32FC1309}.RelWithDebInfo|x64.Build.0 = Release|x64 + {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.RelWithDebInfo|x86.ActiveCfg = Release|Win32 + {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.RelWithDebInfo|x86.Build.0 = Release|Win32 {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Debug|Any CPU.ActiveCfg = Debug|Win32 {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Debug|Mixed Platforms.Build.0 = Debug|Win32 @@ -344,6 +178,8 @@ Global {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Debug|Win32.Build.0 = Debug|Win32 {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Debug|x64.ActiveCfg = Debug|x64 {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Debug|x64.Build.0 = Debug|x64 + {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Debug|x86.ActiveCfg = Debug|Win32 + {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Debug|x86.Build.0 = Debug|Win32 {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 @@ -351,6 +187,8 @@ Global {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.MinSizeRel|Win32.Build.0 = Release|Win32 {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.MinSizeRel|x64.ActiveCfg = Release|x64 {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.MinSizeRel|x64.Build.0 = Release|x64 + {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.MinSizeRel|x86.ActiveCfg = Release|Win32 + {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.MinSizeRel|x86.Build.0 = Release|Win32 {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Release|Any CPU.ActiveCfg = Release|Win32 {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Release|Mixed Platforms.Build.0 = Release|Win32 @@ -358,6 +196,8 @@ Global {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Release|Win32.Build.0 = Release|Win32 {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Release|x64.ActiveCfg = Release|x64 {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Release|x64.Build.0 = Release|x64 + {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Release|x86.ActiveCfg = Release|Win32 + {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Release|x86.Build.0 = Release|Win32 {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 @@ -365,34 +205,8 @@ Global {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.RelWithDebInfo|Win32.Build.0 = Release|Win32 {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.RelWithDebInfo|x64.ActiveCfg = Release|x64 {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.RelWithDebInfo|x64.Build.0 = Release|x64 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Debug|Win32.ActiveCfg = Debug|Win32 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Debug|Win32.Build.0 = Debug|Win32 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Debug|x64.ActiveCfg = Debug|x64 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Debug|x64.Build.0 = Debug|x64 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.MinSizeRel|Win32.ActiveCfg = Release|Win32 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.MinSizeRel|Win32.Build.0 = Release|Win32 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.MinSizeRel|x64.ActiveCfg = Release|x64 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.MinSizeRel|x64.Build.0 = Release|x64 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Release|Any CPU.ActiveCfg = Release|Win32 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Release|Mixed Platforms.Build.0 = Release|Win32 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Release|Win32.ActiveCfg = Release|Win32 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Release|Win32.Build.0 = Release|Win32 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Release|x64.ActiveCfg = Release|x64 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Release|x64.Build.0 = Release|x64 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.RelWithDebInfo|Win32.Build.0 = Release|Win32 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.RelWithDebInfo|x64.ActiveCfg = Release|x64 - {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.RelWithDebInfo|x64.Build.0 = Release|x64 + {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.RelWithDebInfo|x86.ActiveCfg = Release|Win32 + {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.RelWithDebInfo|x86.Build.0 = Release|Win32 {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.Debug|Any CPU.ActiveCfg = Debug|Win32 {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.Debug|Mixed Platforms.Build.0 = Debug|Win32 @@ -400,6 +214,8 @@ Global {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.Debug|Win32.Build.0 = Debug|Win32 {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.Debug|x64.ActiveCfg = Debug|x64 {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.Debug|x64.Build.0 = Debug|x64 + {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.Debug|x86.ActiveCfg = Debug|Win32 + {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.Debug|x86.Build.0 = Debug|Win32 {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 @@ -407,6 +223,8 @@ Global {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.MinSizeRel|Win32.Build.0 = Release|Win32 {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.MinSizeRel|x64.ActiveCfg = Release|x64 {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.MinSizeRel|x64.Build.0 = Release|x64 + {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.MinSizeRel|x86.ActiveCfg = Release|Win32 + {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.MinSizeRel|x86.Build.0 = Release|Win32 {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.Release|Any CPU.ActiveCfg = Release|Win32 {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.Release|Mixed Platforms.Build.0 = Release|Win32 @@ -414,6 +232,8 @@ Global {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.Release|Win32.Build.0 = Release|Win32 {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.Release|x64.ActiveCfg = Release|x64 {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.Release|x64.Build.0 = Release|x64 + {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.Release|x86.ActiveCfg = Release|Win32 + {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.Release|x86.Build.0 = Release|Win32 {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 @@ -421,6 +241,8 @@ Global {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.RelWithDebInfo|Win32.Build.0 = Release|Win32 {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.RelWithDebInfo|x64.ActiveCfg = Release|x64 {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.RelWithDebInfo|x64.Build.0 = Release|x64 + {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.RelWithDebInfo|x86.ActiveCfg = Release|Win32 + {460D625F-2AC9-4559-B809-0BA89CEAEDF4}.RelWithDebInfo|x86.Build.0 = Release|Win32 {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.Debug|Any CPU.ActiveCfg = Debug|Win32 {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.Debug|Mixed Platforms.Build.0 = Debug|Win32 @@ -428,6 +250,8 @@ Global {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.Debug|Win32.Build.0 = Debug|Win32 {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.Debug|x64.ActiveCfg = Debug|x64 {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.Debug|x64.Build.0 = Debug|x64 + {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.Debug|x86.ActiveCfg = Debug|Win32 + {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.Debug|x86.Build.0 = Debug|Win32 {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 @@ -435,6 +259,8 @@ Global {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.MinSizeRel|Win32.Build.0 = Release|Win32 {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.MinSizeRel|x64.ActiveCfg = Release|x64 {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.MinSizeRel|x64.Build.0 = Release|x64 + {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.MinSizeRel|x86.ActiveCfg = Release|Win32 + {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.MinSizeRel|x86.Build.0 = Release|Win32 {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.Release|Any CPU.ActiveCfg = Release|Win32 {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.Release|Mixed Platforms.Build.0 = Release|Win32 @@ -442,6 +268,8 @@ Global {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.Release|Win32.Build.0 = Release|Win32 {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.Release|x64.ActiveCfg = Release|x64 {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.Release|x64.Build.0 = Release|x64 + {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.Release|x86.ActiveCfg = Release|Win32 + {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.Release|x86.Build.0 = Release|Win32 {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 @@ -449,6 +277,8 @@ Global {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.RelWithDebInfo|Win32.Build.0 = Release|Win32 {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.RelWithDebInfo|x64.ActiveCfg = Release|x64 {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.RelWithDebInfo|x64.Build.0 = Release|x64 + {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.RelWithDebInfo|x86.ActiveCfg = Release|Win32 + {DA2AA800-ED64-4649-8B3B-E7F1E3968B78}.RelWithDebInfo|x86.Build.0 = Release|Win32 {143BD516-20A1-4890-A3E4-F8BFD02220E7}.Debug|Any CPU.ActiveCfg = Debug|Win32 {143BD516-20A1-4890-A3E4-F8BFD02220E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {143BD516-20A1-4890-A3E4-F8BFD02220E7}.Debug|Mixed Platforms.Build.0 = Debug|Win32 @@ -456,6 +286,8 @@ Global {143BD516-20A1-4890-A3E4-F8BFD02220E7}.Debug|Win32.Build.0 = Debug|Win32 {143BD516-20A1-4890-A3E4-F8BFD02220E7}.Debug|x64.ActiveCfg = Debug|x64 {143BD516-20A1-4890-A3E4-F8BFD02220E7}.Debug|x64.Build.0 = Debug|x64 + {143BD516-20A1-4890-A3E4-F8BFD02220E7}.Debug|x86.ActiveCfg = Debug|Win32 + {143BD516-20A1-4890-A3E4-F8BFD02220E7}.Debug|x86.Build.0 = Debug|Win32 {143BD516-20A1-4890-A3E4-F8BFD02220E7}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 {143BD516-20A1-4890-A3E4-F8BFD02220E7}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 {143BD516-20A1-4890-A3E4-F8BFD02220E7}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 @@ -463,6 +295,8 @@ Global {143BD516-20A1-4890-A3E4-F8BFD02220E7}.MinSizeRel|Win32.Build.0 = Release|Win32 {143BD516-20A1-4890-A3E4-F8BFD02220E7}.MinSizeRel|x64.ActiveCfg = Release|x64 {143BD516-20A1-4890-A3E4-F8BFD02220E7}.MinSizeRel|x64.Build.0 = Release|x64 + {143BD516-20A1-4890-A3E4-F8BFD02220E7}.MinSizeRel|x86.ActiveCfg = Release|Win32 + {143BD516-20A1-4890-A3E4-F8BFD02220E7}.MinSizeRel|x86.Build.0 = Release|Win32 {143BD516-20A1-4890-A3E4-F8BFD02220E7}.Release|Any CPU.ActiveCfg = Release|Win32 {143BD516-20A1-4890-A3E4-F8BFD02220E7}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {143BD516-20A1-4890-A3E4-F8BFD02220E7}.Release|Mixed Platforms.Build.0 = Release|Win32 @@ -470,6 +304,8 @@ Global {143BD516-20A1-4890-A3E4-F8BFD02220E7}.Release|Win32.Build.0 = Release|Win32 {143BD516-20A1-4890-A3E4-F8BFD02220E7}.Release|x64.ActiveCfg = Release|x64 {143BD516-20A1-4890-A3E4-F8BFD02220E7}.Release|x64.Build.0 = Release|x64 + {143BD516-20A1-4890-A3E4-F8BFD02220E7}.Release|x86.ActiveCfg = Release|Win32 + {143BD516-20A1-4890-A3E4-F8BFD02220E7}.Release|x86.Build.0 = Release|Win32 {143BD516-20A1-4890-A3E4-F8BFD02220E7}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 {143BD516-20A1-4890-A3E4-F8BFD02220E7}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 {143BD516-20A1-4890-A3E4-F8BFD02220E7}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 @@ -477,6 +313,228 @@ Global {143BD516-20A1-4890-A3E4-F8BFD02220E7}.RelWithDebInfo|Win32.Build.0 = Release|Win32 {143BD516-20A1-4890-A3E4-F8BFD02220E7}.RelWithDebInfo|x64.ActiveCfg = Release|x64 {143BD516-20A1-4890-A3E4-F8BFD02220E7}.RelWithDebInfo|x64.Build.0 = Release|x64 + {143BD516-20A1-4890-A3E4-F8BFD02220E7}.RelWithDebInfo|x86.ActiveCfg = Release|Win32 + {143BD516-20A1-4890-A3E4-F8BFD02220E7}.RelWithDebInfo|x86.Build.0 = Release|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.Debug|Win32.ActiveCfg = Debug|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.Debug|Win32.Build.0 = Debug|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.Debug|x64.ActiveCfg = Debug|x64 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.Debug|x64.Build.0 = Debug|x64 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.Debug|x86.ActiveCfg = Debug|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.Debug|x86.Build.0 = Debug|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.MinSizeRel|Win32.ActiveCfg = Release|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.MinSizeRel|Win32.Build.0 = Release|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.MinSizeRel|x64.ActiveCfg = Release|x64 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.MinSizeRel|x64.Build.0 = Release|x64 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.MinSizeRel|x86.ActiveCfg = Release|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.MinSizeRel|x86.Build.0 = Release|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.Release|Any CPU.ActiveCfg = Release|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.Release|Mixed Platforms.Build.0 = Release|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.Release|Win32.ActiveCfg = Release|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.Release|Win32.Build.0 = Release|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.Release|x64.ActiveCfg = Release|x64 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.Release|x64.Build.0 = Release|x64 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.Release|x86.ActiveCfg = Release|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.Release|x86.Build.0 = Release|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.RelWithDebInfo|Win32.Build.0 = Release|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.RelWithDebInfo|x64.ActiveCfg = Release|x64 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.RelWithDebInfo|x64.Build.0 = Release|x64 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.RelWithDebInfo|x86.ActiveCfg = Release|Win32 + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4}.RelWithDebInfo|x86.Build.0 = Release|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.Debug|Win32.ActiveCfg = Debug|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.Debug|Win32.Build.0 = Debug|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.Debug|x64.ActiveCfg = Debug|x64 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.Debug|x64.Build.0 = Debug|x64 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.Debug|x86.ActiveCfg = Debug|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.Debug|x86.Build.0 = Debug|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.MinSizeRel|Win32.ActiveCfg = Release|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.MinSizeRel|Win32.Build.0 = Release|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.MinSizeRel|x64.ActiveCfg = Release|x64 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.MinSizeRel|x64.Build.0 = Release|x64 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.MinSizeRel|x86.ActiveCfg = Release|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.MinSizeRel|x86.Build.0 = Release|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.Release|Any CPU.ActiveCfg = Release|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.Release|Mixed Platforms.Build.0 = Release|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.Release|Win32.ActiveCfg = Release|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.Release|Win32.Build.0 = Release|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.Release|x64.ActiveCfg = Release|x64 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.Release|x64.Build.0 = Release|x64 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.Release|x86.ActiveCfg = Release|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.Release|x86.Build.0 = Release|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.RelWithDebInfo|Win32.Build.0 = Release|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.RelWithDebInfo|x64.ActiveCfg = Release|x64 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.RelWithDebInfo|x64.Build.0 = Release|x64 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.RelWithDebInfo|x86.ActiveCfg = Release|Win32 + {3EA5F14D-2A71-4588-A69D-87C4571C580F}.RelWithDebInfo|x86.Build.0 = Release|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Debug|Win32.ActiveCfg = Debug|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Debug|Win32.Build.0 = Debug|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Debug|x64.ActiveCfg = Debug|x64 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Debug|x64.Build.0 = Debug|x64 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Debug|x86.ActiveCfg = Debug|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Debug|x86.Build.0 = Debug|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.MinSizeRel|Win32.ActiveCfg = Release|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.MinSizeRel|Win32.Build.0 = Release|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.MinSizeRel|x64.ActiveCfg = Release|x64 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.MinSizeRel|x64.Build.0 = Release|x64 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.MinSizeRel|x86.ActiveCfg = Release|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.MinSizeRel|x86.Build.0 = Release|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Release|Any CPU.ActiveCfg = Release|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Release|Mixed Platforms.Build.0 = Release|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Release|Win32.ActiveCfg = Release|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Release|Win32.Build.0 = Release|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Release|x64.ActiveCfg = Release|x64 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Release|x64.Build.0 = Release|x64 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Release|x86.ActiveCfg = Release|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Release|x86.Build.0 = Release|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.RelWithDebInfo|Win32.Build.0 = Release|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.RelWithDebInfo|x64.ActiveCfg = Release|x64 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.RelWithDebInfo|x64.Build.0 = Release|x64 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.RelWithDebInfo|x86.ActiveCfg = Release|Win32 + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.RelWithDebInfo|x86.Build.0 = Release|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|Win32.ActiveCfg = Debug|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|Win32.Build.0 = Debug|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|x64.ActiveCfg = Debug|x64 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|x64.Build.0 = Debug|x64 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|x86.ActiveCfg = Debug|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|x86.Build.0 = Debug|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.MinSizeRel|Win32.ActiveCfg = Release|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.MinSizeRel|Win32.Build.0 = Release|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.MinSizeRel|x64.ActiveCfg = Release|x64 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.MinSizeRel|x64.Build.0 = Release|x64 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.MinSizeRel|x86.ActiveCfg = Release|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.MinSizeRel|x86.Build.0 = Release|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|Any CPU.ActiveCfg = Release|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|Mixed Platforms.Build.0 = Release|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|Win32.ActiveCfg = Release|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|Win32.Build.0 = Release|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|x64.ActiveCfg = Release|x64 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|x64.Build.0 = Release|x64 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|x86.ActiveCfg = Release|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|x86.Build.0 = Release|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.RelWithDebInfo|Win32.Build.0 = Release|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.RelWithDebInfo|x64.ActiveCfg = Release|x64 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.RelWithDebInfo|x64.Build.0 = Release|x64 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.RelWithDebInfo|x86.ActiveCfg = Release|Win32 + {F10CBC03-9809-4CBA-95D8-327C287B18EE}.RelWithDebInfo|x86.Build.0 = Release|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Debug|Win32.ActiveCfg = Debug|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Debug|Win32.Build.0 = Debug|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Debug|x64.ActiveCfg = Debug|x64 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Debug|x64.Build.0 = Debug|x64 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Debug|x86.ActiveCfg = Debug|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Debug|x86.Build.0 = Debug|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.MinSizeRel|Win32.ActiveCfg = Release|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.MinSizeRel|Win32.Build.0 = Release|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.MinSizeRel|x64.ActiveCfg = Release|x64 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.MinSizeRel|x64.Build.0 = Release|x64 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.MinSizeRel|x86.ActiveCfg = Release|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.MinSizeRel|x86.Build.0 = Release|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Release|Any CPU.ActiveCfg = Release|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Release|Mixed Platforms.Build.0 = Release|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Release|Win32.ActiveCfg = Release|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Release|Win32.Build.0 = Release|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Release|x64.ActiveCfg = Release|x64 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Release|x64.Build.0 = Release|x64 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Release|x86.ActiveCfg = Release|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.Release|x86.Build.0 = Release|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.RelWithDebInfo|Win32.Build.0 = Release|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.RelWithDebInfo|x64.ActiveCfg = Release|x64 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.RelWithDebInfo|x64.Build.0 = Release|x64 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.RelWithDebInfo|x86.ActiveCfg = Release|Win32 + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1}.RelWithDebInfo|x86.Build.0 = Release|Win32 + {604A12A7-07BF-4482-BDF3-7101C811F121}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {604A12A7-07BF-4482-BDF3-7101C811F121}.Debug|Any CPU.Build.0 = Debug|Any CPU + {604A12A7-07BF-4482-BDF3-7101C811F121}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.Debug|Win32.ActiveCfg = Debug|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.Debug|Win32.Build.0 = Debug|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.Debug|x64.ActiveCfg = Debug|x64 + {604A12A7-07BF-4482-BDF3-7101C811F121}.Debug|x64.Build.0 = Debug|x64 + {604A12A7-07BF-4482-BDF3-7101C811F121}.Debug|x86.ActiveCfg = Debug|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.Debug|x86.Build.0 = Debug|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU + {604A12A7-07BF-4482-BDF3-7101C811F121}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU + {604A12A7-07BF-4482-BDF3-7101C811F121}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.MinSizeRel|Mixed Platforms.Build.0 = Release|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.MinSizeRel|Win32.ActiveCfg = Release|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.MinSizeRel|Win32.Build.0 = Release|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.MinSizeRel|x64.ActiveCfg = Release|x64 + {604A12A7-07BF-4482-BDF3-7101C811F121}.MinSizeRel|x64.Build.0 = Release|x64 + {604A12A7-07BF-4482-BDF3-7101C811F121}.MinSizeRel|x86.ActiveCfg = Release|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.MinSizeRel|x86.Build.0 = Release|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.Release|Any CPU.ActiveCfg = Release|Any CPU + {604A12A7-07BF-4482-BDF3-7101C811F121}.Release|Any CPU.Build.0 = Release|Any CPU + {604A12A7-07BF-4482-BDF3-7101C811F121}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.Release|Mixed Platforms.Build.0 = Release|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.Release|Win32.ActiveCfg = Release|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.Release|Win32.Build.0 = Release|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.Release|x64.ActiveCfg = Release|x64 + {604A12A7-07BF-4482-BDF3-7101C811F121}.Release|x64.Build.0 = Release|x64 + {604A12A7-07BF-4482-BDF3-7101C811F121}.Release|x86.ActiveCfg = Release|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.Release|x86.Build.0 = Release|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {604A12A7-07BF-4482-BDF3-7101C811F121}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {604A12A7-07BF-4482-BDF3-7101C811F121}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.RelWithDebInfo|Win32.ActiveCfg = Release|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.RelWithDebInfo|Win32.Build.0 = Release|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.RelWithDebInfo|x64.ActiveCfg = Release|x64 + {604A12A7-07BF-4482-BDF3-7101C811F121}.RelWithDebInfo|x64.Build.0 = Release|x64 + {604A12A7-07BF-4482-BDF3-7101C811F121}.RelWithDebInfo|x86.ActiveCfg = Release|x86 + {604A12A7-07BF-4482-BDF3-7101C811F121}.RelWithDebInfo|x86.Build.0 = Release|x86 {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.Debug|Any CPU.ActiveCfg = Debug|Win32 {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.Debug|Mixed Platforms.Build.0 = Debug|Win32 @@ -484,12 +542,17 @@ Global {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.Debug|Win32.Build.0 = Debug|Win32 {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.Debug|x64.ActiveCfg = Debug|x64 {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.Debug|x64.Build.0 = Debug|x64 + {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.Debug|x86.ActiveCfg = Debug|Win32 + {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.Debug|x86.Build.0 = Debug|Win32 {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.MinSizeRel|Win32.ActiveCfg = Release|Win32 {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.MinSizeRel|Win32.Build.0 = Release|Win32 - {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.MinSizeRel|x64.ActiveCfg = Release|Win32 + {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.MinSizeRel|x64.ActiveCfg = Release|x64 + {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.MinSizeRel|x64.Build.0 = Release|x64 + {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.MinSizeRel|x86.ActiveCfg = Release|Win32 + {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.MinSizeRel|x86.Build.0 = Release|Win32 {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.Release|Any CPU.ActiveCfg = Release|Win32 {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.Release|Mixed Platforms.Build.0 = Release|Win32 @@ -497,40 +560,125 @@ Global {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.Release|Win32.Build.0 = Release|Win32 {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.Release|x64.ActiveCfg = Release|x64 {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.Release|x64.Build.0 = Release|x64 + {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.Release|x86.ActiveCfg = Release|Win32 + {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.Release|x86.Build.0 = Release|Win32 {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.RelWithDebInfo|Win32.Build.0 = Release|Win32 - {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.RelWithDebInfo|x64.ActiveCfg = Release|Win32 - {604A12A7-07BF-4482-BDF3-7101C811F121}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {604A12A7-07BF-4482-BDF3-7101C811F121}.Debug|Any CPU.Build.0 = Debug|Any CPU - {604A12A7-07BF-4482-BDF3-7101C811F121}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {604A12A7-07BF-4482-BDF3-7101C811F121}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {604A12A7-07BF-4482-BDF3-7101C811F121}.Debug|Win32.ActiveCfg = Debug|x86 - {604A12A7-07BF-4482-BDF3-7101C811F121}.Debug|Win32.Build.0 = Debug|x86 - {604A12A7-07BF-4482-BDF3-7101C811F121}.Debug|x64.ActiveCfg = Debug|x64 - {604A12A7-07BF-4482-BDF3-7101C811F121}.Debug|x64.Build.0 = Debug|x64 - {604A12A7-07BF-4482-BDF3-7101C811F121}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU - {604A12A7-07BF-4482-BDF3-7101C811F121}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU - {604A12A7-07BF-4482-BDF3-7101C811F121}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Any CPU - {604A12A7-07BF-4482-BDF3-7101C811F121}.MinSizeRel|Mixed Platforms.Build.0 = Release|Any CPU - {604A12A7-07BF-4482-BDF3-7101C811F121}.MinSizeRel|Win32.ActiveCfg = Release|Any CPU - {604A12A7-07BF-4482-BDF3-7101C811F121}.MinSizeRel|x64.ActiveCfg = Release|Any CPU - {604A12A7-07BF-4482-BDF3-7101C811F121}.Release|Any CPU.ActiveCfg = Release|Any CPU - {604A12A7-07BF-4482-BDF3-7101C811F121}.Release|Any CPU.Build.0 = Release|Any CPU - {604A12A7-07BF-4482-BDF3-7101C811F121}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {604A12A7-07BF-4482-BDF3-7101C811F121}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {604A12A7-07BF-4482-BDF3-7101C811F121}.Release|Win32.ActiveCfg = Release|x86 - {604A12A7-07BF-4482-BDF3-7101C811F121}.Release|Win32.Build.0 = Release|x86 - {604A12A7-07BF-4482-BDF3-7101C811F121}.Release|x64.ActiveCfg = Release|x64 - {604A12A7-07BF-4482-BDF3-7101C811F121}.Release|x64.Build.0 = Release|x64 - {604A12A7-07BF-4482-BDF3-7101C811F121}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {604A12A7-07BF-4482-BDF3-7101C811F121}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {604A12A7-07BF-4482-BDF3-7101C811F121}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Any CPU - {604A12A7-07BF-4482-BDF3-7101C811F121}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Any CPU - {604A12A7-07BF-4482-BDF3-7101C811F121}.RelWithDebInfo|Win32.ActiveCfg = Release|Any CPU - {604A12A7-07BF-4482-BDF3-7101C811F121}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.RelWithDebInfo|x64.ActiveCfg = Release|x64 + {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.RelWithDebInfo|x64.Build.0 = Release|x64 + {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.RelWithDebInfo|x86.ActiveCfg = Release|Win32 + {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB}.RelWithDebInfo|x86.Build.0 = Release|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Debug|Win32.ActiveCfg = Debug|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Debug|Win32.Build.0 = Debug|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Debug|x64.ActiveCfg = Debug|x64 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Debug|x64.Build.0 = Debug|x64 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Debug|x86.ActiveCfg = Debug|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Debug|x86.Build.0 = Debug|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.MinSizeRel|Win32.ActiveCfg = Release|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.MinSizeRel|Win32.Build.0 = Release|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.MinSizeRel|x64.ActiveCfg = Release|x64 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.MinSizeRel|x64.Build.0 = Release|x64 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.MinSizeRel|x86.ActiveCfg = Release|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.MinSizeRel|x86.Build.0 = Release|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Release|Any CPU.ActiveCfg = Release|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Release|Mixed Platforms.Build.0 = Release|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Release|Win32.ActiveCfg = Release|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Release|Win32.Build.0 = Release|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Release|x64.ActiveCfg = Release|x64 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Release|x64.Build.0 = Release|x64 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Release|x86.ActiveCfg = Release|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.Release|x86.Build.0 = Release|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.RelWithDebInfo|Win32.Build.0 = Release|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.RelWithDebInfo|x64.ActiveCfg = Release|x64 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.RelWithDebInfo|x64.Build.0 = Release|x64 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.RelWithDebInfo|x86.ActiveCfg = Release|Win32 + {8690FDDF-C5B7-4C42-A337-BD5243F29B85}.RelWithDebInfo|x86.Build.0 = Release|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.Debug|Win32.ActiveCfg = Debug|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.Debug|Win32.Build.0 = Debug|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.Debug|x64.ActiveCfg = Debug|x64 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.Debug|x64.Build.0 = Debug|x64 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.Debug|x86.ActiveCfg = Debug|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.Debug|x86.Build.0 = Debug|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.MinSizeRel|Win32.ActiveCfg = Release|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.MinSizeRel|Win32.Build.0 = Release|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.MinSizeRel|x64.ActiveCfg = Release|x64 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.MinSizeRel|x64.Build.0 = Release|x64 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.MinSizeRel|x86.ActiveCfg = Release|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.MinSizeRel|x86.Build.0 = Release|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.Release|Any CPU.ActiveCfg = Release|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.Release|Mixed Platforms.Build.0 = Release|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.Release|Win32.ActiveCfg = Release|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.Release|Win32.Build.0 = Release|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.Release|x64.ActiveCfg = Release|x64 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.Release|x64.Build.0 = Release|x64 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.Release|x86.ActiveCfg = Release|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.Release|x86.Build.0 = Release|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.RelWithDebInfo|Win32.Build.0 = Release|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.RelWithDebInfo|x64.ActiveCfg = Release|x64 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.RelWithDebInfo|x64.Build.0 = Release|x64 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.RelWithDebInfo|x86.ActiveCfg = Release|Win32 + {2A1BC987-AF42-4500-802D-89CD32FC1309}.RelWithDebInfo|x86.Build.0 = Release|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|Win32.ActiveCfg = Debug|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|Win32.Build.0 = Debug|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|x64.ActiveCfg = Debug|x64 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|x64.Build.0 = Debug|x64 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|x86.ActiveCfg = Debug|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|x86.Build.0 = Debug|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.MinSizeRel|Any CPU.ActiveCfg = Release|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.MinSizeRel|Mixed Platforms.Build.0 = Release|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.MinSizeRel|Win32.ActiveCfg = Release|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.MinSizeRel|Win32.Build.0 = Release|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.MinSizeRel|x64.ActiveCfg = Release|x64 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.MinSizeRel|x64.Build.0 = Release|x64 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.MinSizeRel|x86.ActiveCfg = Release|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.MinSizeRel|x86.Build.0 = Release|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|Any CPU.ActiveCfg = Release|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|Mixed Platforms.Build.0 = Release|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|Win32.ActiveCfg = Release|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|Win32.Build.0 = Release|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|x64.ActiveCfg = Release|x64 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|x64.Build.0 = Release|x64 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|x86.ActiveCfg = Release|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|x86.Build.0 = Release|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.RelWithDebInfo|Win32.Build.0 = Release|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.RelWithDebInfo|x64.ActiveCfg = Release|x64 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.RelWithDebInfo|x64.Build.0 = Release|x64 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.RelWithDebInfo|x86.ActiveCfg = Release|Win32 + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.RelWithDebInfo|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -538,12 +686,19 @@ Global GlobalSection(NestedProjects) = preSolution {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50} = {C27B926E-B3EF-4990-8822-47580E43A0BE} {460D625F-2AC9-4559-B809-0BA89CEAEDF4} = {C27B926E-B3EF-4990-8822-47580E43A0BE} - {2A1BC987-AF42-4500-802D-89CD32FC1309} = {20720CA7-795C-45AD-A302-9383A6DD503A} {B1195BB9-B3A5-47F0-906C-8DEA384D1520} = {20720CA7-795C-45AD-A302-9383A6DD503A} - {8690FDDF-C5B7-4C42-A337-BD5243F29B85} = {20720CA7-795C-45AD-A302-9383A6DD503A} {DA2AA800-ED64-4649-8B3B-E7F1E3968B78} = {20720CA7-795C-45AD-A302-9383A6DD503A} {143BD516-20A1-4890-A3E4-F8BFD02220E7} = {20720CA7-795C-45AD-A302-9383A6DD503A} - {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB} = {9CCCBB44-303F-44AE-B99C-4165AD894DBD} - {604A12A7-07BF-4482-BDF3-7101C811F121} = {9CCCBB44-303F-44AE-B99C-4165AD894DBD} + {C83A6FAD-E71F-4B1E-9D63-E93E61DDC012} = {20720CA7-795C-45AD-A302-9383A6DD503A} + {8690FDDF-C5B7-4C42-A337-BD5243F29B85} = {20720CA7-795C-45AD-A302-9383A6DD503A} + {2A1BC987-AF42-4500-802D-89CD32FC1309} = {20720CA7-795C-45AD-A302-9383A6DD503A} + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4} = {F156EEBC-0195-4020-8700-4433208DE12B} + {3EA5F14D-2A71-4588-A69D-87C4571C580F} = {F156EEBC-0195-4020-8700-4433208DE12B} + {7E3990D2-3D94-465C-B58D-64A74B3ECF9B} = {1322B12B-5E37-448A-AAAF-F637460DCB23} + {F10CBC03-9809-4CBA-95D8-327C287B18EE} = {1322B12B-5E37-448A-AAAF-F637460DCB23} + {35AEA3C0-E0A7-4E1E-88CD-514AA5A442B1} = {1322B12B-5E37-448A-AAAF-F637460DCB23} + {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE} = {1322B12B-5E37-448A-AAAF-F637460DCB23} + {604A12A7-07BF-4482-BDF3-7101C811F121} = {C83A6FAD-E71F-4B1E-9D63-E93E61DDC012} + {C8CBA520-5D7D-4D61-A8DA-6E05FD132BCB} = {C83A6FAD-E71F-4B1E-9D63-E93E61DDC012} EndGlobalSection EndGlobal diff --git a/Code/Game/DanBiasServer/GameSession/GameSession.h b/Code/Game/DanBiasServer/GameSession/GameSession.h deleted file mode 100644 index b2145c19..00000000 --- a/Code/Game/DanBiasServer/GameSession/GameSession.h +++ /dev/null @@ -1,101 +0,0 @@ -///////////////////////////////////////////////////////////////////// -// Created by [Dennis Andersen] [2013] -///////////////////////////////////////////////////////////////////// -#ifndef DANBIASSERVER_GAME_SESSION_H -#define DANBIASSERVER_GAME_SESSION_H - -//warning C4150: deletion of pointer to incomplete type, no destructor called, because of forward decleration and the use of smartpointer. -#pragma warning(disable: 4150) - -#include "..\LobbySessions\NetworkSession.h" -#include -#include -#include -#include -#include - -namespace DanBias -{ - class LobbyClient; - class GameClient; - class GameSession : public Oyster::Thread::IThreadObject, public INetworkSession - { - public: - /** - * A container to use when initiating a new session - */ - struct GameDescription - { - std::wstring mapName; - NetworkSession* owner; - Utility::DynamicMemory::DynamicArray> clients; - }; - static GameSession* gameSession; - public: - GameSession(); - virtual~GameSession(); - - /** Initiates and creates a game session. */ - bool Create(GameDescription& desc); - - /** Runs the game session (ie starts the game loop). */ - void Run(); - - /** Join an existing/running game session - * @param client The client to attach to the session - */ - bool Join(Utility::DynamicMemory::SmartPointer client); - - /** - * Closes the game session - * @param disconnectClients If set to true clients is dissconnected from the server, if false the clients is sent to the given owner of the session. - */ - void CloseSession(bool disconnectClients = false); - - inline bool IsCreated() const { return this->isCreated; } - inline bool IsRunning() const { return this->isRunning; } - - //Private member functions - private: - //Handles all events recieved - void ParseEvents(); - //Handles all gameplay events - void ParseGameplayEvent(Oyster::Network::CustomNetProtocol& p, DanBias::GameClient* c); - //Handles all general events - void ParseGeneralEvent(Oyster::Network::CustomNetProtocol& p, DanBias::GameClient* c); - //Adds a client to the client list - void InsertClient(Utility::DynamicMemory::SmartPointer obj); - //Removes a client from the client list - void RemoveClient(DanBias::GameClient* obj); - //Sends a protocol ta all clients in session - void Send(Oyster::Network::CustomNetProtocol* p); - //Frame function, derived from IThreadObject - bool DoWork ( ) override; - //Sends a client to the owner, if obj is NULL then all clients is sent - void SendToOwner(DanBias::GameClient* obj); - //Do a cleanup on all the private data - void Clean(); - //Update game objects if needed - void UpdateGameObjects(); - - //Private member variables - private: - - Utility::DynamicMemory::DynamicArray> clients; - Oyster::IPostBox *box; - Oyster::Thread::OysterThread worker; - GameLogic::GameAPI& gameInstance; - GameLogic::ILevelData *levelData; - NetworkSession* owner; - bool isCreated; - bool isRunning; - Utility::WinTimer timer; - - static void ObjectMove(GameLogic::IObjectData* movedObject); - - private: - friend class AdminInterface; - - };//End GameSession -}//End namespace DanBias -#endif // !DANBIASSERVER_GAME_SESSION_H \ No newline at end of file diff --git a/Code/Game/DanBiasServer/GameSession/GameSession_Events.cpp b/Code/Game/DanBiasServer/GameSession/GameSession_Events.cpp deleted file mode 100644 index 8306e138..00000000 --- a/Code/Game/DanBiasServer/GameSession/GameSession_Events.cpp +++ /dev/null @@ -1,157 +0,0 @@ -///////////////////////////////////////////////////////////////////// -// Created by [Dennis Andersen] [2013] -///////////////////////////////////////////////////////////////////// -#include "GameSession.h" -#include "GameClient.h" - -#include -#include -#include -#include - -#include - -using namespace Utility::DynamicMemory; -using namespace Oyster; -using namespace Oyster::Network; -using namespace Oyster::Thread; -using namespace GameLogic; - -namespace DanBias -{ - void GameSession::ParseEvents() - { - if( !this->box->IsEmpty() ) - { - NetworkSession::NetEvent &e = this->box->Fetch(); - static int ii = 0; - printf("%i - Message recieved! [%i]\n", ii++, e.protocol[0].value); - - if(e.protocol[0].type != Oyster::Network::NetAttributeType_Short) return; - - if( ProtocolIsGameplay(e.protocol[protocol_INDEX_ID].value.netShort) ) - ParseGameplayEvent(e.protocol, e.gameClient); - - if( ProtocolIsGeneral(e.protocol[protocol_INDEX_ID].value.netShort) ) - ParseGeneralEvent(e.protocol, e.gameClient); - } - } - - void GameSession::ParseGameplayEvent(Oyster::Network::CustomNetProtocol& p, DanBias::GameClient* c) - { - switch (p[protocol_INDEX_ID].value.netShort) - { - case protocol_Gameplay_PlayerMovement: - { - if(p[1].value.netBool) //bool bForward; - c->GetPlayer()->Move(GameLogic::PLAYER_MOVEMENT_FORWARD); - if(p[2].value.netBool) //bool bBackward; - c->GetPlayer()->Move(GameLogic::PLAYER_MOVEMENT_BACKWARD); - if(p[3].value.netBool) //bool bStrafeLeft; - c->GetPlayer()->Move(GameLogic::PLAYER_MOVEMENT_LEFT); - if(p[4].value.netBool) //bool bStrafeRight; - c->GetPlayer()->Move(GameLogic::PLAYER_MOVEMENT_RIGHT); - } - break; - case protocol_Gameplay_PlayerLookDir: - { - Protocol_PlayerLook m; m = p; - Oyster::Math3D::Float3 lookDir; - lookDir.x = p.Get(1).value.netFloat; - lookDir.y = p.Get(2).value.netFloat; - lookDir.z = p.Get(3).value.netFloat; - c->GetPlayer()->Rotate(lookDir); - } - break; - case protocol_Gameplay_PlayerChangeWeapon: - - break; - case protocol_Gameplay_PlayerShot: - if (p[1].value.netBool) - c->GetPlayer()->UseWeapon(GameLogic::WEAPON_USE_PRIMARY_PRESS); - break; - case protocol_Gameplay_PlayerJump: - if (p[1].value.netBool) - c->GetPlayer()->Move(GameLogic::PLAYER_MOVEMENT_JUMP); - break; - case protocol_Gameplay_ObjectDamage: - - break; - } - } - - void GameSession::ParseGeneralEvent(Oyster::Network::CustomNetProtocol& p, DanBias::GameClient* c) - { - switch (p[protocol_INDEX_ID].value.netShort) - { - case protocol_General_Status: - switch (p[1].value.netInt) - { - case GameLogic::Protocol_General_Status::States_disconected: - printf("Client with ID [%i] dissconnected\n", c->GetClient()->GetID()); - this->RemoveClient(c); - break; - - case GameLogic::Protocol_General_Status::States_idle: - - break; - - case GameLogic::Protocol_General_Status::States_ready: - - break; - - case GameLogic::Protocol_General_Status::States_leave: - - break; - } - break; - case protocol_General_Text: - { - GameLogic::Protocol_General_Text temp(p); - printf("Message recieved from (%i):\t %s\n", c->GetID(), temp.text.c_str()); - } - break; - - } - } - - - void GameSession::ObjectMove(GameLogic::IObjectData* movedObject) - { - GameLogic::IObjectData* obj = NULL; - if(dynamic_cast(movedObject)) - { - obj =((GameLogic::ILevelData*)movedObject)->GetObjectAt(0); - if(obj) - { - if(obj->GetType() == OBJECT_TYPE_WORLD) - { - obj->GetID(); - Oyster::Math::Float4x4 world =obj->GetOrientation(); - Oyster::Math3D::Float4x4 scale = Oyster::Math3D::Float4x4::identity; - scale.v[0].x = 8; - scale.v[1].y = 8; - scale.v[2].z = 8; - //world = world * scale; - Protocol_ObjectPosition p(world, 0); - GameSession::gameSession->Send(p.GetProtocol()); - } - } - obj = NULL; - obj =((GameLogic::ILevelData*)movedObject)->GetObjectAt(1); - if(obj) - { - if(obj->GetType() == OBJECT_TYPE_BOX) - { - obj->GetID(); - Oyster::Math::Float4x4 world = obj->GetOrientation(); - Protocol_ObjectPosition p(world, 1); - GameSession::gameSession->Send(p.GetProtocol()); - } - } - } - - } - -}//End namespace DanBias - diff --git a/Code/Game/DanBiasServer/GameSession/GameSession_Logic.cpp b/Code/Game/DanBiasServer/GameSession/GameSession_Logic.cpp deleted file mode 100644 index 6d72ff57..00000000 --- a/Code/Game/DanBiasServer/GameSession/GameSession_Logic.cpp +++ /dev/null @@ -1,61 +0,0 @@ -///////////////////////////////////////////////////////////////////// -// Created by [Dennis Andersen] [2013] -///////////////////////////////////////////////////////////////////// -#include "GameSession.h" -#include "GameClient.h" - -#include -#include -#include -#include -#include - -#define DELTA_TIME_20 0.05f -#define DELTA_TIME_24 0.04166666666666666666666666666667f -#define DELTA_TIME_30 0.03333333333333333333333333333333f -#define DELTA_TIME_60 0.01666666666666666666666666666667f -#define DELTA_TIME_120 0.00833333333333333333333333333333f - -using namespace Utility::DynamicMemory; -using namespace Oyster; -using namespace Oyster::Network; -using namespace Oyster::Thread; -using namespace GameLogic; - -namespace DanBias -{ - - bool GameSession::DoWork( ) - { - if(this->isRunning) - { - double dt = this->timer.getElapsedSeconds(); - gameInstance.SetFrameTimeLength((float)dt); - - if(dt >= DELTA_TIME_20) - { - this->ParseEvents(); - - this->gameInstance.NewFrame(); - - this->UpdateGameObjects(); - - this->timer.reset(); - } - } - - return this->isRunning; - } - - void GameSession::UpdateGameObjects() - { - if(clients.Size() >= 1 && clients[0]) - { - Oyster::Math::Float4x4 world = this->clients[0]->GetPlayer()->GetOrientation(); - Protocol_ObjectPosition p(world, 2); - Send(p.GetProtocol()); - } - } - -}//End namespace DanBias - diff --git a/Code/Game/DanBiasGame/DLLMain.cpp b/Code/Game/GameClient/DLLMain.cpp similarity index 100% rename from Code/Game/DanBiasGame/DLLMain.cpp rename to Code/Game/GameClient/DLLMain.cpp diff --git a/Code/Game/DanBiasGame/DanBiasGame_Impl.cpp b/Code/Game/GameClient/DanBiasGame_Impl.cpp similarity index 99% rename from Code/Game/DanBiasGame/DanBiasGame_Impl.cpp rename to Code/Game/GameClient/DanBiasGame_Impl.cpp index c88739ff..21d5589f 100644 --- a/Code/Game/DanBiasGame/DanBiasGame_Impl.cpp +++ b/Code/Game/GameClient/DanBiasGame_Impl.cpp @@ -18,7 +18,7 @@ #include "WinTimer.h" #include "vld.h" -#include "../Misc/EventHandler/EventHandler.h" +#include "EventHandler/EventHandler.h" using namespace ::Oyster; using namespace ::Oyster::Event; diff --git a/Code/Game/DanBiasGame/DanBiasGame.vcxproj b/Code/Game/GameClient/GameClient.vcxproj similarity index 92% rename from Code/Game/DanBiasGame/DanBiasGame.vcxproj rename to Code/Game/GameClient/GameClient.vcxproj index 81fd9ebf..0691fef1 100644 --- a/Code/Game/DanBiasGame/DanBiasGame.vcxproj +++ b/Code/Game/GameClient/GameClient.vcxproj @@ -21,7 +21,7 @@ {2A1BC987-AF42-4500-802D-89CD32FC1309} Win32Proj - DanBiasGame + GameClient @@ -106,7 +106,7 @@ Disabled DANBIAS_GAME_DLL_EXPORT;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true - $(SolutionDir)OysterMath;$(SolutionDir)Input;$(SolutionDir)OysterGraphics;$(SolutionDir)Misc;%(AdditionalIncludeDirectories) + $(SolutionDir)Misc\OysterMath;$(SolutionDir)Misc\Input;$(SolutionDir)OysterGraphics;$(SolutionDir)Misc\Utilities;%(AdditionalIncludeDirectories) Windows @@ -123,7 +123,7 @@ Disabled DANBIAS_GAME_DLL_EXPORT;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true - $(SolutionDir)OysterMath;$(SolutionDir)Input;$(SolutionDir)OysterGraphics;$(SolutionDir)Misc;%(AdditionalIncludeDirectories) + $(SolutionDir)Misc\OysterMath;$(SolutionDir)Misc\Input;$(SolutionDir)OysterGraphics;$(SolutionDir)Misc\Utilities;%(AdditionalIncludeDirectories) Windows @@ -142,7 +142,7 @@ true DANBIAS_GAME_DLL_EXPORT;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true - $(SolutionDir)OysterMath;$(SolutionDir)Input;$(SolutionDir)OysterGraphics;$(SolutionDir)Misc;%(AdditionalIncludeDirectories) + $(SolutionDir)Misc\OysterMath;$(SolutionDir)Misc\Input;$(SolutionDir)OysterGraphics;$(SolutionDir)Misc\Utilities;%(AdditionalIncludeDirectories) Windows @@ -163,7 +163,7 @@ true DANBIAS_GAME_DLL_EXPORT;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true - $(SolutionDir)OysterMath;$(SolutionDir)Input;$(SolutionDir)OysterGraphics;$(SolutionDir)Misc;%(AdditionalIncludeDirectories) + $(SolutionDir)Misc\OysterMath;$(SolutionDir)Misc\Input;$(SolutionDir)OysterGraphics;$(SolutionDir)Misc\Utilities;%(AdditionalIncludeDirectories) Windows @@ -175,11 +175,8 @@ - - {7e3990d2-3d94-465c-b58d-64a74b3ecf9b} - - - {2ec4dded-8f75-4c86-a10b-e1e8eb29f3ee} + + {f10cbc03-9809-4cba-95d8-327c287b18ee} {460d625f-2ac9-4559-b809-0ba89ceaedf4} @@ -187,14 +184,12 @@ {0ec83e64-230e-48ef-b08c-6ac9651b4f82} - - {f10cbc03-9809-4cba-95d8-327c287b18ee} - {143bd516-20a1-4890-a3e4-f8bfd02220e7} + @@ -202,7 +197,6 @@ - @@ -239,7 +233,7 @@ - + diff --git a/Code/CLIStandaloneServer/CLIStandaloneServer.vcxproj.user b/Code/Game/GameClient/GameClient.vcxproj.user similarity index 100% rename from Code/CLIStandaloneServer/CLIStandaloneServer.vcxproj.user rename to Code/Game/GameClient/GameClient.vcxproj.user diff --git a/Code/Game/DanBiasGame/GameClientRecieverFunc.h b/Code/Game/GameClient/GameClientRecieverFunc.h similarity index 100% rename from Code/Game/DanBiasGame/GameClientRecieverFunc.h rename to Code/Game/GameClient/GameClientRecieverFunc.h diff --git a/Code/Game/DanBiasGame/GameClientState/Buttons/ButtonEllipse.h b/Code/Game/GameClient/GameClientState/Buttons/ButtonEllipse.h similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/Buttons/ButtonEllipse.h rename to Code/Game/GameClient/GameClientState/Buttons/ButtonEllipse.h diff --git a/Code/Game/DanBiasGame/GameClientState/Buttons/ButtonRectangle.h b/Code/Game/GameClient/GameClientState/Buttons/ButtonRectangle.h similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/Buttons/ButtonRectangle.h rename to Code/Game/GameClient/GameClientState/Buttons/ButtonRectangle.h diff --git a/Code/Game/DanBiasGame/GameClientState/Buttons/EventButtonGUI.h b/Code/Game/GameClient/GameClientState/Buttons/EventButtonGUI.h similarity index 97% rename from Code/Game/DanBiasGame/GameClientState/Buttons/EventButtonGUI.h rename to Code/Game/GameClient/GameClientState/Buttons/EventButtonGUI.h index d4981c23..c770cb9c 100644 --- a/Code/Game/DanBiasGame/GameClientState/Buttons/EventButtonGUI.h +++ b/Code/Game/GameClient/GameClientState/Buttons/EventButtonGUI.h @@ -5,8 +5,8 @@ #ifndef DANBIAS_CLIENT_EVENT_BUTTON_GUI_H #define DANBIAS_CLIENT_EVENT_BUTTON_GUI_H -#include "../Misc/EventHandler/EventButton.h" -#include "../OysterGraphics/DllInterfaces/GFXAPI.h" +#include "EventHandler/EventButton.h" +#include "DllInterfaces/GFXAPI.h" diff --git a/Code/Game/DanBiasGame/GameClientState/Buttons/TextField.h b/Code/Game/GameClient/GameClientState/Buttons/TextField.h similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/Buttons/TextField.h rename to Code/Game/GameClient/GameClientState/Buttons/TextField.h diff --git a/Code/Game/DanBiasGame/GameClientState/C_Object.cpp b/Code/Game/GameClient/GameClientState/C_Object.cpp similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/C_Object.cpp rename to Code/Game/GameClient/GameClientState/C_Object.cpp diff --git a/Code/Game/DanBiasGame/GameClientState/C_Object.h b/Code/Game/GameClient/GameClientState/C_Object.h similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/C_Object.h rename to Code/Game/GameClient/GameClientState/C_Object.h diff --git a/Code/Game/DanBiasGame/GameClientState/C_obj/C_DynamicObj.cpp b/Code/Game/GameClient/GameClientState/C_obj/C_DynamicObj.cpp similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/C_obj/C_DynamicObj.cpp rename to Code/Game/GameClient/GameClientState/C_obj/C_DynamicObj.cpp diff --git a/Code/Game/DanBiasGame/GameClientState/C_obj/C_DynamicObj.h b/Code/Game/GameClient/GameClientState/C_obj/C_DynamicObj.h similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/C_obj/C_DynamicObj.h rename to Code/Game/GameClient/GameClientState/C_obj/C_DynamicObj.h diff --git a/Code/Game/DanBiasGame/GameClientState/C_obj/C_Player.cpp b/Code/Game/GameClient/GameClientState/C_obj/C_Player.cpp similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/C_obj/C_Player.cpp rename to Code/Game/GameClient/GameClientState/C_obj/C_Player.cpp diff --git a/Code/Game/DanBiasGame/GameClientState/C_obj/C_Player.h b/Code/Game/GameClient/GameClientState/C_obj/C_Player.h similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/C_obj/C_Player.h rename to Code/Game/GameClient/GameClientState/C_obj/C_Player.h diff --git a/Code/Game/DanBiasGame/GameClientState/C_obj/C_StaticObj.cpp b/Code/Game/GameClient/GameClientState/C_obj/C_StaticObj.cpp similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/C_obj/C_StaticObj.cpp rename to Code/Game/GameClient/GameClientState/C_obj/C_StaticObj.cpp diff --git a/Code/Game/DanBiasGame/GameClientState/C_obj/C_StaticObj.h b/Code/Game/GameClient/GameClientState/C_obj/C_StaticObj.h similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/C_obj/C_StaticObj.h rename to Code/Game/GameClient/GameClientState/C_obj/C_StaticObj.h diff --git a/Code/Game/DanBiasGame/GameClientState/C_obj/C_UIobject.cpp b/Code/Game/GameClient/GameClientState/C_obj/C_UIobject.cpp similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/C_obj/C_UIobject.cpp rename to Code/Game/GameClient/GameClientState/C_obj/C_UIobject.cpp diff --git a/Code/Game/DanBiasGame/GameClientState/C_obj/C_UIobject.h b/Code/Game/GameClient/GameClientState/C_obj/C_UIobject.h similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/C_obj/C_UIobject.h rename to Code/Game/GameClient/GameClientState/C_obj/C_UIobject.h diff --git a/Code/Game/DanBiasGame/GameClientState/Camera.cpp b/Code/Game/GameClient/GameClientState/Camera.cpp similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/Camera.cpp rename to Code/Game/GameClient/GameClientState/Camera.cpp diff --git a/Code/Game/DanBiasGame/GameClientState/Camera.h b/Code/Game/GameClient/GameClientState/Camera.h similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/Camera.h rename to Code/Game/GameClient/GameClientState/Camera.h diff --git a/Code/Game/DanBiasGame/GameClientState/Camera_Basic.cpp b/Code/Game/GameClient/GameClientState/Camera_Basic.cpp similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/Camera_Basic.cpp rename to Code/Game/GameClient/GameClientState/Camera_Basic.cpp diff --git a/Code/Game/DanBiasGame/GameClientState/Camera_Basic.h b/Code/Game/GameClient/GameClientState/Camera_Basic.h similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/Camera_Basic.h rename to Code/Game/GameClient/GameClientState/Camera_Basic.h diff --git a/Code/Game/DanBiasGame/GameClientState/Camera_FPS.cpp b/Code/Game/GameClient/GameClientState/Camera_FPS.cpp similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/Camera_FPS.cpp rename to Code/Game/GameClient/GameClientState/Camera_FPS.cpp diff --git a/Code/Game/DanBiasGame/GameClientState/Camera_FPS.h b/Code/Game/GameClient/GameClientState/Camera_FPS.h similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/Camera_FPS.h rename to Code/Game/GameClient/GameClientState/Camera_FPS.h diff --git a/Code/Game/DanBiasGame/GameClientState/GameClientState.cpp b/Code/Game/GameClient/GameClientState/GameClientState.cpp similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/GameClientState.cpp rename to Code/Game/GameClient/GameClientState/GameClientState.cpp diff --git a/Code/Game/DanBiasGame/GameClientState/GameClientState.h b/Code/Game/GameClient/GameClientState/GameClientState.h similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/GameClientState.h rename to Code/Game/GameClient/GameClientState/GameClientState.h diff --git a/Code/Game/DanBiasGame/GameClientState/GameState.cpp b/Code/Game/GameClient/GameClientState/GameState.cpp similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/GameState.cpp rename to Code/Game/GameClient/GameClientState/GameState.cpp diff --git a/Code/Game/DanBiasGame/GameClientState/GameState.h b/Code/Game/GameClient/GameClientState/GameState.h similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/GameState.h rename to Code/Game/GameClient/GameClientState/GameState.h diff --git a/Code/Game/DanBiasGame/GameClientState/LanMenuState.cpp b/Code/Game/GameClient/GameClientState/LanMenuState.cpp similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/LanMenuState.cpp rename to Code/Game/GameClient/GameClientState/LanMenuState.cpp diff --git a/Code/Game/DanBiasGame/GameClientState/LanMenuState.h b/Code/Game/GameClient/GameClientState/LanMenuState.h similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/LanMenuState.h rename to Code/Game/GameClient/GameClientState/LanMenuState.h diff --git a/Code/Game/DanBiasGame/GameClientState/LevelLoader/LevelLoader.cpp b/Code/Game/GameClient/GameClientState/LevelLoader/LevelLoader.cpp similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/LevelLoader/LevelLoader.cpp rename to Code/Game/GameClient/GameClientState/LevelLoader/LevelLoader.cpp diff --git a/Code/Game/DanBiasGame/GameClientState/LevelLoader/LevelLoader.h b/Code/Game/GameClient/GameClientState/LevelLoader/LevelLoader.h similarity index 98% rename from Code/Game/DanBiasGame/GameClientState/LevelLoader/LevelLoader.h rename to Code/Game/GameClient/GameClientState/LevelLoader/LevelLoader.h index 184a7005..aa67c4f5 100644 --- a/Code/Game/DanBiasGame/GameClientState/LevelLoader/LevelLoader.h +++ b/Code/Game/GameClient/GameClientState/LevelLoader/LevelLoader.h @@ -7,7 +7,7 @@ #include #include -#include "../Misc/Utilities.h" +#include "Utilities.h" #include "ObjectDefines.h" namespace GameLogic diff --git a/Code/Game/DanBiasGame/GameClientState/LevelLoader/LevelParser.cpp b/Code/Game/GameClient/GameClientState/LevelLoader/LevelParser.cpp similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/LevelLoader/LevelParser.cpp rename to Code/Game/GameClient/GameClientState/LevelLoader/LevelParser.cpp diff --git a/Code/Game/DanBiasGame/GameClientState/LevelLoader/LevelParser.h b/Code/Game/GameClient/GameClientState/LevelLoader/LevelParser.h similarity index 92% rename from Code/Game/DanBiasGame/GameClientState/LevelLoader/LevelParser.h rename to Code/Game/GameClient/GameClientState/LevelLoader/LevelParser.h index 346b75b5..8f2a9150 100644 --- a/Code/Game/DanBiasGame/GameClientState/LevelLoader/LevelParser.h +++ b/Code/Game/GameClient/GameClientState/LevelLoader/LevelParser.h @@ -4,7 +4,7 @@ #include #include #include "ObjectDefines.h" -#include "../Misc/Utilities.h" +#include "Utilities.h" namespace GameLogic { diff --git a/Code/Game/DanBiasGame/GameClientState/LevelLoader/Loader.cpp b/Code/Game/GameClient/GameClientState/LevelLoader/Loader.cpp similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/LevelLoader/Loader.cpp rename to Code/Game/GameClient/GameClientState/LevelLoader/Loader.cpp diff --git a/Code/Game/DanBiasGame/GameClientState/LevelLoader/Loader.h b/Code/Game/GameClient/GameClientState/LevelLoader/Loader.h similarity index 88% rename from Code/Game/DanBiasGame/GameClientState/LevelLoader/Loader.h rename to Code/Game/GameClient/GameClientState/LevelLoader/Loader.h index 198c2a87..0433194e 100644 --- a/Code/Game/DanBiasGame/GameClientState/LevelLoader/Loader.h +++ b/Code/Game/GameClient/GameClientState/LevelLoader/Loader.h @@ -5,7 +5,7 @@ #ifndef LOADER_H #define LOADER_H -#include "..\Misc\Resource\OysterResource.h" +#include "Resource\OysterResource.h" #include namespace GameLogic diff --git a/Code/Game/DanBiasGame/GameClientState/LevelLoader/ObjectDefines.h b/Code/Game/GameClient/GameClientState/LevelLoader/ObjectDefines.h similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/LevelLoader/ObjectDefines.h rename to Code/Game/GameClient/GameClientState/LevelLoader/ObjectDefines.h diff --git a/Code/Game/DanBiasGame/GameClientState/LevelLoader/ParseFunctions.cpp b/Code/Game/GameClient/GameClientState/LevelLoader/ParseFunctions.cpp similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/LevelLoader/ParseFunctions.cpp rename to Code/Game/GameClient/GameClientState/LevelLoader/ParseFunctions.cpp diff --git a/Code/Game/DanBiasGame/GameClientState/LevelLoader/ParseFunctions.h b/Code/Game/GameClient/GameClientState/LevelLoader/ParseFunctions.h similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/LevelLoader/ParseFunctions.h rename to Code/Game/GameClient/GameClientState/LevelLoader/ParseFunctions.h diff --git a/Code/Game/DanBiasGame/GameClientState/LobbyAdminState.cpp b/Code/Game/GameClient/GameClientState/LobbyAdminState.cpp similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/LobbyAdminState.cpp rename to Code/Game/GameClient/GameClientState/LobbyAdminState.cpp diff --git a/Code/Game/DanBiasGame/GameClientState/LobbyAdminState.h b/Code/Game/GameClient/GameClientState/LobbyAdminState.h similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/LobbyAdminState.h rename to Code/Game/GameClient/GameClientState/LobbyAdminState.h diff --git a/Code/Game/DanBiasGame/GameClientState/LobbyState.cpp b/Code/Game/GameClient/GameClientState/LobbyState.cpp similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/LobbyState.cpp rename to Code/Game/GameClient/GameClientState/LobbyState.cpp diff --git a/Code/Game/DanBiasGame/GameClientState/LobbyState.h b/Code/Game/GameClient/GameClientState/LobbyState.h similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/LobbyState.h rename to Code/Game/GameClient/GameClientState/LobbyState.h diff --git a/Code/Game/DanBiasGame/GameClientState/MainState.cpp b/Code/Game/GameClient/GameClientState/MainState.cpp similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/MainState.cpp rename to Code/Game/GameClient/GameClientState/MainState.cpp diff --git a/Code/Game/DanBiasGame/GameClientState/MainState.h b/Code/Game/GameClient/GameClientState/MainState.h similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/MainState.h rename to Code/Game/GameClient/GameClientState/MainState.h diff --git a/Code/Game/DanBiasGame/GameClientState/NetLoadState.cpp b/Code/Game/GameClient/GameClientState/NetLoadState.cpp similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/NetLoadState.cpp rename to Code/Game/GameClient/GameClientState/NetLoadState.cpp diff --git a/Code/Game/DanBiasGame/GameClientState/NetLoadState.h b/Code/Game/GameClient/GameClientState/NetLoadState.h similarity index 100% rename from Code/Game/DanBiasGame/GameClientState/NetLoadState.h rename to Code/Game/GameClient/GameClientState/NetLoadState.h diff --git a/Code/Game/DanBiasGame/Include/DanBiasGame.h b/Code/Game/GameClient/Include/DanBiasGame.h similarity index 100% rename from Code/Game/DanBiasGame/Include/DanBiasGame.h rename to Code/Game/GameClient/Include/DanBiasGame.h diff --git a/Code/Game/DanBiasLauncher/DanBiasLauncher.vcxproj b/Code/Game/GameLauncher/GameLauncher.vcxproj similarity index 85% rename from Code/Game/DanBiasLauncher/DanBiasLauncher.vcxproj rename to Code/Game/GameLauncher/GameLauncher.vcxproj index f81a2159..9445aa09 100644 --- a/Code/Game/DanBiasLauncher/DanBiasLauncher.vcxproj +++ b/Code/Game/GameLauncher/GameLauncher.vcxproj @@ -21,7 +21,7 @@ {8690FDDF-C5B7-4C42-A337-BD5243F29B85} Win32Proj - DanBiasLauncher + GameLauncher @@ -105,13 +105,14 @@ Level3 Disabled WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(SolutionDir)Game\DanBiasServer\Include;$(SolutionDir)Game\DanBiasGame\Include + $(SolutionDir)Game\GameClient\Include Windows true - DanBiasGame_$(PlatformShortName)D.dll;%(DelayLoadDLLs) - DanBiasGame_$(PlatformShortName)D.lib;%(AdditionalDependencies) + GameClient_$(PlatformShortName)D.dll;%(DelayLoadDLLs) + + @@ -121,13 +122,14 @@ Level3 Disabled WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(SolutionDir)Game\DanBiasServer\Include;$(SolutionDir)Game\DanBiasGame\Include + $(SolutionDir)Game\GameClient\Include Windows true - DanBiasGame_$(PlatformShortName)D.dll;%(DelayLoadDLLs) - DanBiasGame_$(PlatformShortName)D.lib;%(AdditionalDependencies) + GameClient_$(PlatformShortName)D.dll;%(DelayLoadDLLs) + + @@ -139,15 +141,16 @@ true true WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(SolutionDir)Game\DanBiasServer\Include;$(SolutionDir)Game\DanBiasGame\Include + $(SolutionDir)Game\GameClient\Include Windows true true true - DanBiasGame_$(PlatformShortName).dll;%(DelayLoadDLLs) - DanBiasGame_$(PlatformShortName).lib;%(AdditionalDependencies) + GameClient_$(PlatformShortName).dll;%(DelayLoadDLLs) + + @@ -159,22 +162,23 @@ true true WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(SolutionDir)Game\DanBiasServer\Include;$(SolutionDir)Game\DanBiasGame\Include + $(SolutionDir)Game\GameClient\Include Windows true true true - DanBiasGame_$(PlatformShortName).dll;%(DelayLoadDLLs) - DanBiasGame_$(PlatformShortName).lib;%(AdditionalDependencies) + GameClient_$(PlatformShortName).dll;%(DelayLoadDLLs) + + - + {2a1bc987-af42-4500-802d-89cd32fc1309} diff --git a/Code/Game/DanBiasGame/DanBiasGame.vcxproj.user b/Code/Game/GameLauncher/GameLauncher.vcxproj.user similarity index 100% rename from Code/Game/DanBiasGame/DanBiasGame.vcxproj.user rename to Code/Game/GameLauncher/GameLauncher.vcxproj.user diff --git a/Code/Game/DanBiasLauncher/Launcher.cpp b/Code/Game/GameLauncher/Launcher.cpp similarity index 100% rename from Code/Game/DanBiasLauncher/Launcher.cpp rename to Code/Game/GameLauncher/Launcher.cpp diff --git a/Code/Game/GameLogic/GameLogic.vcxproj b/Code/Game/GameLogic/GameLogic.vcxproj index 6c026917..ad129c3b 100644 --- a/Code/Game/GameLogic/GameLogic.vcxproj +++ b/Code/Game/GameLogic/GameLogic.vcxproj @@ -99,7 +99,7 @@ Level3 Disabled true - $(SolutionDir)Misc;$(SolutionDir)OysterMath;$(SolutionDir)OysterPhysics3D;$(SolutionDir)GamePhysics;%(AdditionalIncludeDirectories) + $(SolutionDir)Misc\Utilities;$(SolutionDir)Misc\OysterMath;$(SolutionDir)Physics\OysterPhysics3D;$(SolutionDir)Physics\GamePhysics;%(AdditionalIncludeDirectories) DANBIAS_GAMELOGIC_DLL_EXPORT;_WINDLL;%(PreprocessorDefinitions) @@ -113,7 +113,7 @@ Level3 Disabled true - $(SolutionDir)Misc;$(SolutionDir)OysterMath;$(SolutionDir)OysterPhysics3D;$(SolutionDir)GamePhysics;%(AdditionalIncludeDirectories) + $(SolutionDir)Misc\Utilities;$(SolutionDir)Misc\OysterMath;$(SolutionDir)Physics\OysterPhysics3D;$(SolutionDir)Physics\GamePhysics;%(AdditionalIncludeDirectories) DANBIAS_GAMELOGIC_DLL_EXPORT;_WINDLL;%(PreprocessorDefinitions) @@ -129,7 +129,7 @@ true true true - $(SolutionDir)Misc;$(SolutionDir)OysterMath;$(SolutionDir)OysterPhysics3D;$(SolutionDir)GamePhysics;%(AdditionalIncludeDirectories) + $(SolutionDir)Misc\Utilities;$(SolutionDir)Misc\OysterMath;$(SolutionDir)Physics\OysterPhysics3D;$(SolutionDir)Physics\GamePhysics;%(AdditionalIncludeDirectories) DANBIAS_GAMELOGIC_DLL_EXPORT;_WINDLL;%(PreprocessorDefinitions) @@ -147,7 +147,7 @@ true true true - $(SolutionDir)Misc;$(SolutionDir)OysterMath;$(SolutionDir)OysterPhysics3D;$(SolutionDir)GamePhysics;%(AdditionalIncludeDirectories) + $(SolutionDir)Misc\Utilities;$(SolutionDir)Misc\OysterMath;$(SolutionDir)Physics\OysterPhysics3D;$(SolutionDir)Physics\GamePhysics;%(AdditionalIncludeDirectories) DANBIAS_GAMELOGIC_DLL_EXPORT;_WINDLL;%(PreprocessorDefinitions) @@ -158,20 +158,6 @@ GamePhysics_$(PlatformShortName).dll;%(DelayLoadDLLs) - - - {104fa3e9-94d9-4e1d-a941-28a03bc8a095} - - - {2ec4dded-8f75-4c86-a10b-e1e8eb29f3ee} - - - {f10cbc03-9809-4cba-95d8-327c287b18ee} - - - {4285bd3f-3c6c-4670-b7af-a29afef5f6a8} - - @@ -224,6 +210,20 @@ + + + {f10cbc03-9809-4cba-95d8-327c287b18ee} + + + {2ec4dded-8f75-4c86-a10b-e1e8eb29f3ee} + + + {c4c76a8d-44c5-4452-9f61-39c7e01cbdb4} + + + {3ea5f14d-2a71-4588-a69d-87c4571c580f} + + diff --git a/Code/Game/GameLogic/LevelLoader/LevelLoader.h b/Code/Game/GameLogic/LevelLoader/LevelLoader.h index 184a7005..aa67c4f5 100644 --- a/Code/Game/GameLogic/LevelLoader/LevelLoader.h +++ b/Code/Game/GameLogic/LevelLoader/LevelLoader.h @@ -7,7 +7,7 @@ #include #include -#include "../Misc/Utilities.h" +#include "Utilities.h" #include "ObjectDefines.h" namespace GameLogic diff --git a/Code/Game/GameLogic/LevelLoader/LevelParser.h b/Code/Game/GameLogic/LevelLoader/LevelParser.h index 346b75b5..8f2a9150 100644 --- a/Code/Game/GameLogic/LevelLoader/LevelParser.h +++ b/Code/Game/GameLogic/LevelLoader/LevelParser.h @@ -4,7 +4,7 @@ #include #include #include "ObjectDefines.h" -#include "../Misc/Utilities.h" +#include "Utilities.h" namespace GameLogic { diff --git a/Code/Game/GameLogic/LevelLoader/Loader.h b/Code/Game/GameLogic/LevelLoader/Loader.h index 198c2a87..0433194e 100644 --- a/Code/Game/GameLogic/LevelLoader/Loader.h +++ b/Code/Game/GameLogic/LevelLoader/Loader.h @@ -5,7 +5,7 @@ #ifndef LOADER_H #define LOADER_H -#include "..\Misc\Resource\OysterResource.h" +#include "Resource\OysterResource.h" #include namespace GameLogic diff --git a/Code/Game/GameLogic/LevelLoader/ParseFunctions.cpp b/Code/Game/GameLogic/LevelLoader/ParseFunctions.cpp index 1caa840f..826a52be 100644 --- a/Code/Game/GameLogic/LevelLoader/ParseFunctions.cpp +++ b/Code/Game/GameLogic/LevelLoader/ParseFunctions.cpp @@ -3,7 +3,7 @@ ////////////////////////////////// #include "ParseFunctions.h" -#include "../../../Misc/Packing/Packing.h" +#include "Packing/Packing.h" #include "Loader.h" #include diff --git a/Code/Game/GameServer/GameServer.vcxproj b/Code/Game/GameServer/GameServer.vcxproj index 4a63c4f7..036459fa 100644 --- a/Code/Game/GameServer/GameServer.vcxproj +++ b/Code/Game/GameServer/GameServer.vcxproj @@ -74,7 +74,7 @@ $(SolutionDir)..\Bin\DLL\ $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ $(ProjectName)_$(PlatformShortName)D - $(SolutionDir)..\External\Include\;$(SolutionDir)Game\GameProtocols\;$(SolutionDir)Game\GameLogic\;$(SolutionDir)Network\NetworkAPI\;$(SolutionDir)OysterMath\;$(SolutionDir)GamePhysics\;$(SolutionDir)Misc\;$(SolutionDir)WindowManager\;$(SolutionDir)OysterPhysics3D\;$(SolutionDir)Game\ServerDependencies;C:\Program Files %28x86%29\Visual Leak Detector\include;$(IncludePath) + $(SolutionDir)..\External\Include\;$(SolutionDir)Game\GameProtocols\;$(SolutionDir)Game\GameLogic\;$(SolutionDir)Network\NetworkAPI\;$(SolutionDir)Misc\OysterMath\;$(SolutionDir)Physics\GamePhysics\;$(SolutionDir)Misc\Utilities;$(SolutionDir)Misc\WindowManager\;$(SolutionDir)OysterPhysics3D\;$(SolutionDir)Game\ServerDependencies;C:\Program Files %28x86%29\Visual Leak Detector\include;$(IncludePath) $(OutDir);$(SolutionDir)..\External\Lib\WindowManager\;C:\Program Files %28x86%29\Visual Leak Detector\lib\Win32;$(SolutionDir)..\External\Lib\ServerDependencies\;$(LibraryPath) @@ -82,7 +82,7 @@ $(SolutionDir)..\Bin\DLL\ $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ $(ProjectName)_$(PlatformShortName)D - $(SolutionDir)..\External\Include\;$(SolutionDir)Game\GameProtocols\;$(SolutionDir)Game\GameLogic\;$(SolutionDir)Network\NetworkAPI\;$(SolutionDir)OysterMath\;$(SolutionDir)GamePhysics\;$(SolutionDir)Misc\;$(SolutionDir)WindowManager\;$(SolutionDir)OysterPhysics3D\;$(SolutionDir)Game\ServerDependencies;C:\Program Files %28x86%29\Visual Leak Detector\include;$(IncludePath) + $(SolutionDir)..\External\Include\;$(SolutionDir)Game\GameProtocols\;$(SolutionDir)Game\GameLogic\;$(SolutionDir)Network\NetworkAPI\;$(SolutionDir)Misc\OysterMath\;$(SolutionDir)Physics\GamePhysics\;$(SolutionDir)Misc\Utilities;$(SolutionDir)Misc\WindowManager\;$(SolutionDir)OysterPhysics3D\;$(SolutionDir)Game\ServerDependencies;C:\Program Files %28x86%29\Visual Leak Detector\include;$(IncludePath) $(OutDir);$(SolutionDir)..\External\Lib\WindowManager\;C:\Program Files %28x86%29\Visual Leak Detector\lib\Win64;$(SolutionDir)..\External\Lib\ServerDependencies\;$(LibraryPath) @@ -90,7 +90,7 @@ $(SolutionDir)..\Bin\DLL\ $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ $(ProjectName)_$(PlatformShortName) - $(SolutionDir)..\External\Include\;$(SolutionDir)Game\GameProtocols\;$(SolutionDir)Game\GameLogic\;$(SolutionDir)Network\NetworkAPI\;$(SolutionDir)OysterMath\;$(SolutionDir)GamePhysics\;$(SolutionDir)Misc\;$(SolutionDir)WindowManager\;$(SolutionDir)OysterPhysics3D\;$(SolutionDir)Game\ServerDependencies;C:\Program Files %28x86%29\Visual Leak Detector\include;$(IncludePath) + $(SolutionDir)..\External\Include\;$(SolutionDir)Game\GameProtocols\;$(SolutionDir)Game\GameLogic\;$(SolutionDir)Network\NetworkAPI\;$(SolutionDir)Misc\OysterMath\;$(SolutionDir)Physics\GamePhysics\;$(SolutionDir)Misc\Utilities;$(SolutionDir)Misc\WindowManager\;$(SolutionDir)OysterPhysics3D\;$(SolutionDir)Game\ServerDependencies;C:\Program Files %28x86%29\Visual Leak Detector\include;$(IncludePath) $(OutDir);$(SolutionDir)..\External\Lib\WindowManager\;C:\Program Files %28x86%29\Visual Leak Detector\lib\Win32;$(SolutionDir)..\External\Lib\ServerDependencies\;$(LibraryPath) @@ -98,7 +98,7 @@ $(SolutionDir)..\Bin\DLL\ $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ $(ProjectName)_$(PlatformShortName) - $(SolutionDir)..\External\Include\;$(SolutionDir)Game\GameProtocols\;$(SolutionDir)Game\GameLogic\;$(SolutionDir)Network\NetworkAPI\;$(SolutionDir)OysterMath\;$(SolutionDir)GamePhysics\;$(SolutionDir)Misc\;$(SolutionDir)WindowManager\;$(SolutionDir)OysterPhysics3D\;$(SolutionDir)Game\ServerDependencies;C:\Program Files %28x86%29\Visual Leak Detector\include;$(IncludePath) + $(SolutionDir)..\External\Include\;$(SolutionDir)Game\GameProtocols\;$(SolutionDir)Game\GameLogic\;$(SolutionDir)Network\NetworkAPI\;$(SolutionDir)Misc\OysterMath\;$(SolutionDir)Physics\GamePhysics\;$(SolutionDir)Misc\Utilities;$(SolutionDir)Misc\WindowManager\;$(SolutionDir)OysterPhysics3D\;$(SolutionDir)Game\ServerDependencies;C:\Program Files %28x86%29\Visual Leak Detector\include;$(IncludePath) $(OutDir);$(SolutionDir)..\External\Lib\WindowManager\;C:\Program Files %28x86%29\Visual Leak Detector\lib\Win64;$(SolutionDir)..\External\Lib\ServerDependencies\;$(LibraryPath) @@ -108,13 +108,14 @@ Level3 Disabled DANBIAS_SERVER_DLL_EXPORT;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(SolutionDir)Game\GameLogic\ + $(SolutionDir)Game\GameLogic\;$(SolutionDir)Misc\Utilities;$(SolutionDir)Misc\OysterMath Windows true GameLogic_$(PlatformShortName)D.dll;NetworkAPI_$(PlatformShortName)D.dll;%(DelayLoadDLLs) - NetworkAPI_$(PlatformShortName)D.lib;WindowManager_$(PlatformShortName)D.lib;GameLogic_$(PlatformShortName)D.lib;%(AdditionalDependencies) + + @@ -124,13 +125,14 @@ Level3 Disabled DANBIAS_SERVER_DLL_EXPORT;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(SolutionDir)Game\GameLogic\ + $(SolutionDir)Game\GameLogic\;$(SolutionDir)Misc\Utilities;$(SolutionDir)Misc\OysterMath Windows true GameLogic_$(PlatformShortName)D.dll;NetworkAPI_$(PlatformShortName)D.dll;%(DelayLoadDLLs) - NetworkAPI_$(PlatformShortName)D.lib;WindowManager_$(PlatformShortName)D.lib;GameLogic_$(PlatformShortName)D.lib;%(AdditionalDependencies) + + @@ -142,7 +144,7 @@ true true DANBIAS_SERVER_DLL_EXPORT;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(SolutionDir)Game\GameLogic\ + $(SolutionDir)Game\GameLogic\;$(SolutionDir)Misc\Utilities;$(SolutionDir)Misc\OysterMath Windows @@ -150,7 +152,8 @@ true true GameLogic_$(PlatformShortName).dll;NetworkAPI_$(PlatformShortName).dll;%(DelayLoadDLLs) - NetworkAPI_$(PlatformShortName).lib;WindowManager_$(PlatformShortName).lib;GameLogic_$(PlatformShortName).lib;%(AdditionalDependencies) + + @@ -162,7 +165,7 @@ true true DANBIAS_SERVER_DLL_EXPORT;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(SolutionDir)Game\GameLogic\ + $(SolutionDir)Game\GameLogic\;$(SolutionDir)Misc\Utilities;$(SolutionDir)Misc\OysterMath Windows @@ -170,7 +173,8 @@ true true GameLogic_$(PlatformShortName).dll;NetworkAPI_$(PlatformShortName).dll;%(DelayLoadDLLs) - NetworkAPI_$(PlatformShortName).lib;WindowManager_$(PlatformShortName).lib;GameLogic_$(PlatformShortName).lib;%(AdditionalDependencies) + + @@ -194,14 +198,11 @@ - + {2ec4dded-8f75-4c86-a10b-e1e8eb29f3ee} - - {f10cbc03-9809-4cba-95d8-327c287b18ee} - - - {35aea3c0-e0a7-4e1e-88cd-514aa5a442b1} + + {460d625f-2ac9-4559-b809-0ba89ceaedf4} {b1195bb9-b3a5-47f0-906c-8dea384d1520} diff --git a/Code/CLIStandaloneServer/AssemblyInfo.cpp b/Code/Game/LanServer/CLIStandaloneServer/AssemblyInfo.cpp similarity index 100% rename from Code/CLIStandaloneServer/AssemblyInfo.cpp rename to Code/Game/LanServer/CLIStandaloneServer/AssemblyInfo.cpp diff --git a/Code/CLIStandaloneServer/CLIStandaloneServer.vcxproj b/Code/Game/LanServer/CLIStandaloneServer/CLIStandaloneServer.vcxproj similarity index 94% rename from Code/CLIStandaloneServer/CLIStandaloneServer.vcxproj rename to Code/Game/LanServer/CLIStandaloneServer/CLIStandaloneServer.vcxproj index 7e221e48..921e2bd8 100644 --- a/Code/CLIStandaloneServer/CLIStandaloneServer.vcxproj +++ b/Code/Game/LanServer/CLIStandaloneServer/CLIStandaloneServer.vcxproj @@ -102,6 +102,7 @@ Level3 Disabled true + $(SolutionDir)Game/GameServer true @@ -113,6 +114,7 @@ Level3 Disabled true + $(SolutionDir)Game/GameServer true @@ -125,6 +127,7 @@ true true true + $(SolutionDir)Game/GameServer true @@ -139,6 +142,7 @@ true true true + $(SolutionDir)Game/GameServer true @@ -159,7 +163,7 @@ - + {143bd516-20a1-4890-a3e4-f8bfd02220e7} diff --git a/Code/Game/DanBiasLauncher/DanBiasLauncher.vcxproj.user b/Code/Game/LanServer/CLIStandaloneServer/CLIStandaloneServer.vcxproj.user similarity index 100% rename from Code/Game/DanBiasLauncher/DanBiasLauncher.vcxproj.user rename to Code/Game/LanServer/CLIStandaloneServer/CLIStandaloneServer.vcxproj.user diff --git a/Code/CLIStandaloneServer/StandaloneGameServerCLI.cpp b/Code/Game/LanServer/CLIStandaloneServer/StandaloneGameServerCLI.cpp similarity index 100% rename from Code/CLIStandaloneServer/StandaloneGameServerCLI.cpp rename to Code/Game/LanServer/CLIStandaloneServer/StandaloneGameServerCLI.cpp diff --git a/Code/CLIStandaloneServer/StandaloneGameServerCLI.h b/Code/Game/LanServer/CLIStandaloneServer/StandaloneGameServerCLI.h similarity index 96% rename from Code/CLIStandaloneServer/StandaloneGameServerCLI.h rename to Code/Game/LanServer/CLIStandaloneServer/StandaloneGameServerCLI.h index 99c8b121..3fdd0713 100644 --- a/Code/CLIStandaloneServer/StandaloneGameServerCLI.h +++ b/Code/Game/LanServer/CLIStandaloneServer/StandaloneGameServerCLI.h @@ -3,7 +3,7 @@ #include -#include "..\Game\GameServer\GameServerAPI.h" +#include "GameServerAPI.h" namespace System { namespace Windows { namespace Interop diff --git a/Code/StandAloneLauncher/App.config b/Code/Game/LanServer/StandAloneLauncher/App.config similarity index 100% rename from Code/StandAloneLauncher/App.config rename to Code/Game/LanServer/StandAloneLauncher/App.config diff --git a/Code/StandAloneLauncher/Form1.Designer.cs b/Code/Game/LanServer/StandAloneLauncher/Form1.Designer.cs similarity index 100% rename from Code/StandAloneLauncher/Form1.Designer.cs rename to Code/Game/LanServer/StandAloneLauncher/Form1.Designer.cs diff --git a/Code/StandAloneLauncher/Form1.cs b/Code/Game/LanServer/StandAloneLauncher/Form1.cs similarity index 100% rename from Code/StandAloneLauncher/Form1.cs rename to Code/Game/LanServer/StandAloneLauncher/Form1.cs diff --git a/Code/StandAloneLauncher/Form1.resx b/Code/Game/LanServer/StandAloneLauncher/Form1.resx similarity index 100% rename from Code/StandAloneLauncher/Form1.resx rename to Code/Game/LanServer/StandAloneLauncher/Form1.resx diff --git a/Code/StandAloneLauncher/Program.cs b/Code/Game/LanServer/StandAloneLauncher/Program.cs similarity index 100% rename from Code/StandAloneLauncher/Program.cs rename to Code/Game/LanServer/StandAloneLauncher/Program.cs diff --git a/Code/StandAloneLauncher/Properties/AssemblyInfo.cs b/Code/Game/LanServer/StandAloneLauncher/Properties/AssemblyInfo.cs similarity index 100% rename from Code/StandAloneLauncher/Properties/AssemblyInfo.cs rename to Code/Game/LanServer/StandAloneLauncher/Properties/AssemblyInfo.cs diff --git a/Code/StandAloneLauncher/Properties/Resources.Designer.cs b/Code/Game/LanServer/StandAloneLauncher/Properties/Resources.Designer.cs similarity index 100% rename from Code/StandAloneLauncher/Properties/Resources.Designer.cs rename to Code/Game/LanServer/StandAloneLauncher/Properties/Resources.Designer.cs diff --git a/Code/StandAloneLauncher/Properties/Resources.resx b/Code/Game/LanServer/StandAloneLauncher/Properties/Resources.resx similarity index 100% rename from Code/StandAloneLauncher/Properties/Resources.resx rename to Code/Game/LanServer/StandAloneLauncher/Properties/Resources.resx diff --git a/Code/StandAloneLauncher/Properties/Settings.Designer.cs b/Code/Game/LanServer/StandAloneLauncher/Properties/Settings.Designer.cs similarity index 100% rename from Code/StandAloneLauncher/Properties/Settings.Designer.cs rename to Code/Game/LanServer/StandAloneLauncher/Properties/Settings.Designer.cs diff --git a/Code/StandAloneLauncher/Properties/Settings.settings b/Code/Game/LanServer/StandAloneLauncher/Properties/Settings.settings similarity index 100% rename from Code/StandAloneLauncher/Properties/Settings.settings rename to Code/Game/LanServer/StandAloneLauncher/Properties/Settings.settings diff --git a/Code/StandAloneLauncher/StandAloneLauncher.csproj b/Code/Game/LanServer/StandAloneLauncher/StandAloneLauncher.csproj similarity index 95% rename from Code/StandAloneLauncher/StandAloneLauncher.csproj rename to Code/Game/LanServer/StandAloneLauncher/StandAloneLauncher.csproj index 8cedeb8f..2d2c86fe 100644 --- a/Code/StandAloneLauncher/StandAloneLauncher.csproj +++ b/Code/Game/LanServer/StandAloneLauncher/StandAloneLauncher.csproj @@ -17,7 +17,7 @@ true full false - ..\..\Bin\DLL\ + ..\..\..\..\Bin\DLL\ DEBUG;TRACE prompt 4 @@ -27,7 +27,7 @@ AnyCPU pdbonly true - ..\..\Bin\DLL\ + ..\..\..\..\Bin\DLL\ TRACE prompt 4 @@ -35,7 +35,7 @@ true - ..\..\Bin\DLL\ + ..\..\..\..\Bin\DLL\ DEBUG;TRACE full x64 @@ -45,7 +45,7 @@ true - ..\..\Bin\DLL\ + ..\..\..\..\Bin\DLL\ TRACE true pdbonly @@ -57,7 +57,7 @@ true - ..\..\Bin\DLL\ + ..\..\..\..\Bin\DLL\ DEBUG;TRACE full x86 @@ -67,7 +67,7 @@ true - ..\..\Bin\DLL\ + ..\..\..\..\Bin\DLL\ TRACE true pdbonly diff --git a/Code/StandAloneLauncher/StandAloneLauncher.csproj.user b/Code/Game/LanServer/StandAloneLauncher/StandAloneLauncher.csproj.user similarity index 100% rename from Code/StandAloneLauncher/StandAloneLauncher.csproj.user rename to Code/Game/LanServer/StandAloneLauncher/StandAloneLauncher.csproj.user diff --git a/Code/GamePhysics/GamePhysics.vcxproj b/Code/GamePhysics/GamePhysics.vcxproj index 475a05f9..07f5aed2 100644 --- a/Code/GamePhysics/GamePhysics.vcxproj +++ b/Code/GamePhysics/GamePhysics.vcxproj @@ -153,17 +153,6 @@ $(SolutionDir)Physics/lib/release/BulletCollisionx64.lib;$(SolutionDir)Physics/lib/release/BulletDynamicsx64.lib;$(SolutionDir)Physics/lib/release/LinearMathx64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - {2ec4dded-8f75-4c86-a10b-e1e8eb29f3ee} - - - {f10cbc03-9809-4cba-95d8-327c287b18ee} - - - {4285bd3f-3c6c-4670-b7af-a29afef5f6a8} - - diff --git a/Code/GamePhysics/GamePhysics.vcxproj.filters b/Code/GamePhysics/GamePhysics.vcxproj.filters deleted file mode 100644 index 5a3c6fb2..00000000 --- a/Code/GamePhysics/GamePhysics.vcxproj.filters +++ /dev/null @@ -1,51 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {f2cb55b8-47a0-45c7-8dce-5b93f945a57b} - - - {792daa4b-b2f7-4664-9529-71a929365274} - - - - - Header Files\Include - - - Header Files\Implementation - - - Header Files\Implementation - - - Header Files\Include - - - Header Files\Include - - - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/Code/Input/Input.vcxproj.filters b/Code/Input/Input.vcxproj.filters deleted file mode 100644 index 1b318c0a..00000000 --- a/Code/Input/Input.vcxproj.filters +++ /dev/null @@ -1,75 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/Code/Input/Include/Common.h b/Code/Misc/Input/Include/Common.h similarity index 100% rename from Code/Input/Include/Common.h rename to Code/Misc/Input/Include/Common.h diff --git a/Code/Input/Include/Input.h b/Code/Misc/Input/Include/Input.h similarity index 100% rename from Code/Input/Include/Input.h rename to Code/Misc/Input/Include/Input.h diff --git a/Code/Input/Include/InputManager.h b/Code/Misc/Input/Include/InputManager.h similarity index 100% rename from Code/Input/Include/InputManager.h rename to Code/Misc/Input/Include/InputManager.h diff --git a/Code/Input/Include/InputObject.h b/Code/Misc/Input/Include/InputObject.h similarity index 100% rename from Code/Input/Include/InputObject.h rename to Code/Misc/Input/Include/InputObject.h diff --git a/Code/Input/Include/Keyboard.h b/Code/Misc/Input/Include/Keyboard.h similarity index 100% rename from Code/Input/Include/Keyboard.h rename to Code/Misc/Input/Include/Keyboard.h diff --git a/Code/Input/Include/Mouse.h b/Code/Misc/Input/Include/Mouse.h similarity index 100% rename from Code/Input/Include/Mouse.h rename to Code/Misc/Input/Include/Mouse.h diff --git a/Code/Input/Include/PreReq.h b/Code/Misc/Input/Include/PreReq.h similarity index 100% rename from Code/Input/Include/PreReq.h rename to Code/Misc/Input/Include/PreReq.h diff --git a/Code/Input/Include/Win32/Win32Input.h b/Code/Misc/Input/Include/Win32/Win32Input.h similarity index 100% rename from Code/Input/Include/Win32/Win32Input.h rename to Code/Misc/Input/Include/Win32/Win32Input.h diff --git a/Code/Input/Include/Win32/Win32Keyboard.h b/Code/Misc/Input/Include/Win32/Win32Keyboard.h similarity index 100% rename from Code/Input/Include/Win32/Win32Keyboard.h rename to Code/Misc/Input/Include/Win32/Win32Keyboard.h diff --git a/Code/Input/Include/Win32/Win32Mouse.h b/Code/Misc/Input/Include/Win32/Win32Mouse.h similarity index 100% rename from Code/Input/Include/Win32/Win32Mouse.h rename to Code/Misc/Input/Include/Win32/Win32Mouse.h diff --git a/Code/Input/Input.vcxproj b/Code/Misc/Input/Input.vcxproj similarity index 100% rename from Code/Input/Input.vcxproj rename to Code/Misc/Input/Input.vcxproj diff --git a/Code/Input/Input.vcxproj.user b/Code/Misc/Input/Input.vcxproj.user similarity index 100% rename from Code/Input/Input.vcxproj.user rename to Code/Misc/Input/Input.vcxproj.user diff --git a/Code/Input/L_inputClass.cpp b/Code/Misc/Input/L_inputClass.cpp similarity index 100% rename from Code/Input/L_inputClass.cpp rename to Code/Misc/Input/L_inputClass.cpp diff --git a/Code/Input/L_inputClass.h b/Code/Misc/Input/L_inputClass.h similarity index 100% rename from Code/Input/L_inputClass.h rename to Code/Misc/Input/L_inputClass.h diff --git a/Code/Input/Main.cpp b/Code/Misc/Input/Main.cpp similarity index 100% rename from Code/Input/Main.cpp rename to Code/Misc/Input/Main.cpp diff --git a/Code/Input/Source/InputManager.cpp b/Code/Misc/Input/Source/InputManager.cpp similarity index 100% rename from Code/Input/Source/InputManager.cpp rename to Code/Misc/Input/Source/InputManager.cpp diff --git a/Code/Input/Source/Keyboard.cpp b/Code/Misc/Input/Source/Keyboard.cpp similarity index 100% rename from Code/Input/Source/Keyboard.cpp rename to Code/Misc/Input/Source/Keyboard.cpp diff --git a/Code/Input/Source/Mouse.cpp b/Code/Misc/Input/Source/Mouse.cpp similarity index 100% rename from Code/Input/Source/Mouse.cpp rename to Code/Misc/Input/Source/Mouse.cpp diff --git a/Code/Input/Source/Win32/Win32Input.cpp b/Code/Misc/Input/Source/Win32/Win32Input.cpp similarity index 100% rename from Code/Input/Source/Win32/Win32Input.cpp rename to Code/Misc/Input/Source/Win32/Win32Input.cpp diff --git a/Code/Input/Source/Win32/Win32Keyboard.cpp b/Code/Misc/Input/Source/Win32/Win32Keyboard.cpp similarity index 100% rename from Code/Input/Source/Win32/Win32Keyboard.cpp rename to Code/Misc/Input/Source/Win32/Win32Keyboard.cpp diff --git a/Code/Input/Source/Win32/Win32Mouse.cpp b/Code/Misc/Input/Source/Win32/Win32Mouse.cpp similarity index 100% rename from Code/Input/Source/Win32/Win32Mouse.cpp rename to Code/Misc/Input/Source/Win32/Win32Mouse.cpp diff --git a/Code/Misc/Misc.vcxproj.filters b/Code/Misc/Misc.vcxproj.filters deleted file mode 100644 index 34fdd526..00000000 --- a/Code/Misc/Misc.vcxproj.filters +++ /dev/null @@ -1,141 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/Code/OysterMath/LinearMath.h b/Code/Misc/OysterMath/LinearMath.h similarity index 100% rename from Code/OysterMath/LinearMath.h rename to Code/Misc/OysterMath/LinearMath.h diff --git a/Code/OysterMath/Matrix.h b/Code/Misc/OysterMath/Matrix.h similarity index 100% rename from Code/OysterMath/Matrix.h rename to Code/Misc/OysterMath/Matrix.h diff --git a/Code/OysterMath/OysterMath.cpp b/Code/Misc/OysterMath/OysterMath.cpp similarity index 100% rename from Code/OysterMath/OysterMath.cpp rename to Code/Misc/OysterMath/OysterMath.cpp diff --git a/Code/OysterMath/OysterMath.h b/Code/Misc/OysterMath/OysterMath.h similarity index 100% rename from Code/OysterMath/OysterMath.h rename to Code/Misc/OysterMath/OysterMath.h diff --git a/Code/OysterMath/OysterMath.vcxproj b/Code/Misc/OysterMath/OysterMath.vcxproj similarity index 92% rename from Code/OysterMath/OysterMath.vcxproj rename to Code/Misc/OysterMath/OysterMath.vcxproj index 1a07c303..43e0612d 100644 --- a/Code/OysterMath/OysterMath.vcxproj +++ b/Code/Misc/OysterMath/OysterMath.vcxproj @@ -90,7 +90,7 @@ Level3 Disabled true - $(SolutionDir)Misc;%(AdditionalIncludeDirectories) + $(SolutionDir)Misc\Utilities;%(AdditionalIncludeDirectories) true @@ -101,7 +101,7 @@ Level3 Disabled true - $(SolutionDir)Misc;%(AdditionalIncludeDirectories) + $(SolutionDir)Misc\Utilities;%(AdditionalIncludeDirectories) true @@ -114,7 +114,7 @@ true true true - $(SolutionDir)Misc;%(AdditionalIncludeDirectories) + $(SolutionDir)Misc\Utilities;%(AdditionalIncludeDirectories) true @@ -129,7 +129,7 @@ true true true - $(SolutionDir)Misc;%(AdditionalIncludeDirectories) + $(SolutionDir)Misc\Utilities;%(AdditionalIncludeDirectories) true @@ -148,7 +148,7 @@ - + {2ec4dded-8f75-4c86-a10b-e1e8eb29f3ee} diff --git a/Code/OysterMath/OysterMath.vcxproj.user b/Code/Misc/OysterMath/OysterMath.vcxproj.user similarity index 100% rename from Code/OysterMath/OysterMath.vcxproj.user rename to Code/Misc/OysterMath/OysterMath.vcxproj.user diff --git a/Code/OysterMath/Quaternion.h b/Code/Misc/OysterMath/Quaternion.h similarity index 100% rename from Code/OysterMath/Quaternion.h rename to Code/Misc/OysterMath/Quaternion.h diff --git a/Code/OysterMath/Vector.h b/Code/Misc/OysterMath/Vector.h similarity index 100% rename from Code/OysterMath/Vector.h rename to Code/Misc/OysterMath/Vector.h diff --git a/Code/Misc/DynamicArray.h b/Code/Misc/Utilities/DynamicArray.h similarity index 100% rename from Code/Misc/DynamicArray.h rename to Code/Misc/Utilities/DynamicArray.h diff --git a/Code/Misc/EventHandler/EventButton.h b/Code/Misc/Utilities/EventHandler/EventButton.h similarity index 100% rename from Code/Misc/EventHandler/EventButton.h rename to Code/Misc/Utilities/EventHandler/EventButton.h diff --git a/Code/Misc/EventHandler/EventButtonCollection.cpp b/Code/Misc/Utilities/EventHandler/EventButtonCollection.cpp similarity index 97% rename from Code/Misc/EventHandler/EventButtonCollection.cpp rename to Code/Misc/Utilities/EventHandler/EventButtonCollection.cpp index bb3a3461..132c139d 100644 --- a/Code/Misc/EventHandler/EventButtonCollection.cpp +++ b/Code/Misc/Utilities/EventHandler/EventButtonCollection.cpp @@ -4,7 +4,6 @@ #include "EventButtonCollection.h" #include "EventHandler.h" -#include "../../Input/L_inputClass.h" using namespace Oyster::Event; diff --git a/Code/Misc/EventHandler/EventButtonCollection.h b/Code/Misc/Utilities/EventHandler/EventButtonCollection.h similarity index 97% rename from Code/Misc/EventHandler/EventButtonCollection.h rename to Code/Misc/Utilities/EventHandler/EventButtonCollection.h index 8c39d171..2bb43667 100644 --- a/Code/Misc/EventHandler/EventButtonCollection.h +++ b/Code/Misc/Utilities/EventHandler/EventButtonCollection.h @@ -5,8 +5,6 @@ #ifndef MISC_EVENT_BUTTON_COLLECTION_H #define MISC_EVENT_BUTTON_COLLECTION_H -#include "../../Input/L_inputClass.h" - #include "../DynamicArray.h" #include "IEventButton.h" diff --git a/Code/Misc/EventHandler/EventHandler.cpp b/Code/Misc/Utilities/EventHandler/EventHandler.cpp similarity index 100% rename from Code/Misc/EventHandler/EventHandler.cpp rename to Code/Misc/Utilities/EventHandler/EventHandler.cpp diff --git a/Code/Misc/EventHandler/EventHandler.h b/Code/Misc/Utilities/EventHandler/EventHandler.h similarity index 95% rename from Code/Misc/EventHandler/EventHandler.h rename to Code/Misc/Utilities/EventHandler/EventHandler.h index 82c25e1a..8964c810 100644 --- a/Code/Misc/EventHandler/EventHandler.h +++ b/Code/Misc/Utilities/EventHandler/EventHandler.h @@ -5,8 +5,6 @@ #ifndef MISC_EVENT_HANDLER_H #define MISC_EVENT_HANDLER_H -#include "../../Input/L_inputClass.h" - #include "EventButtonCollection.h" #include "EventButton.h" diff --git a/Code/Misc/EventHandler/IEventButton.h b/Code/Misc/Utilities/EventHandler/IEventButton.h similarity index 100% rename from Code/Misc/EventHandler/IEventButton.h rename to Code/Misc/Utilities/EventHandler/IEventButton.h diff --git a/Code/Misc/GID.h b/Code/Misc/Utilities/GID.h similarity index 100% rename from Code/Misc/GID.h rename to Code/Misc/Utilities/GID.h diff --git a/Code/Misc/IQueue.h b/Code/Misc/Utilities/IQueue.h similarity index 100% rename from Code/Misc/IQueue.h rename to Code/Misc/Utilities/IQueue.h diff --git a/Code/Misc/LinkedList.h b/Code/Misc/Utilities/LinkedList.h similarity index 100% rename from Code/Misc/LinkedList.h rename to Code/Misc/Utilities/LinkedList.h diff --git a/Code/Misc/OysterCallback.h b/Code/Misc/Utilities/OysterCallback.h similarity index 100% rename from Code/Misc/OysterCallback.h rename to Code/Misc/Utilities/OysterCallback.h diff --git a/Code/Misc/Packing/Packing.cpp b/Code/Misc/Utilities/Packing/Packing.cpp similarity index 100% rename from Code/Misc/Packing/Packing.cpp rename to Code/Misc/Utilities/Packing/Packing.cpp diff --git a/Code/Misc/Packing/Packing.h b/Code/Misc/Utilities/Packing/Packing.h similarity index 100% rename from Code/Misc/Packing/Packing.h rename to Code/Misc/Utilities/Packing/Packing.h diff --git a/Code/Misc/PostBox/IPostBox.h b/Code/Misc/Utilities/PostBox/IPostBox.h similarity index 100% rename from Code/Misc/PostBox/IPostBox.h rename to Code/Misc/Utilities/PostBox/IPostBox.h diff --git a/Code/Misc/PostBox/PostBox.h b/Code/Misc/Utilities/PostBox/PostBox.h similarity index 100% rename from Code/Misc/PostBox/PostBox.h rename to Code/Misc/Utilities/PostBox/PostBox.h diff --git a/Code/Misc/Queue.h b/Code/Misc/Utilities/Queue.h similarity index 100% rename from Code/Misc/Queue.h rename to Code/Misc/Utilities/Queue.h diff --git a/Code/Misc/Resource/Loaders/ByteLoader.cpp b/Code/Misc/Utilities/Resource/Loaders/ByteLoader.cpp similarity index 100% rename from Code/Misc/Resource/Loaders/ByteLoader.cpp rename to Code/Misc/Utilities/Resource/Loaders/ByteLoader.cpp diff --git a/Code/Misc/Resource/Loaders/CustomLoader.cpp b/Code/Misc/Utilities/Resource/Loaders/CustomLoader.cpp similarity index 100% rename from Code/Misc/Resource/Loaders/CustomLoader.cpp rename to Code/Misc/Utilities/Resource/Loaders/CustomLoader.cpp diff --git a/Code/Misc/Resource/OResource.cpp b/Code/Misc/Utilities/Resource/OResource.cpp similarity index 100% rename from Code/Misc/Resource/OResource.cpp rename to Code/Misc/Utilities/Resource/OResource.cpp diff --git a/Code/Misc/Resource/OResource.h b/Code/Misc/Utilities/Resource/OResource.h similarity index 100% rename from Code/Misc/Resource/OResource.h rename to Code/Misc/Utilities/Resource/OResource.h diff --git a/Code/Misc/Resource/OResourceHandler.cpp b/Code/Misc/Utilities/Resource/OResourceHandler.cpp similarity index 100% rename from Code/Misc/Resource/OResourceHandler.cpp rename to Code/Misc/Utilities/Resource/OResourceHandler.cpp diff --git a/Code/Misc/Resource/OysterResource.h b/Code/Misc/Utilities/Resource/OysterResource.h similarity index 100% rename from Code/Misc/Resource/OysterResource.h rename to Code/Misc/Utilities/Resource/OysterResource.h diff --git a/Code/Misc/Resource/ResourceManager.cpp b/Code/Misc/Utilities/Resource/ResourceManager.cpp similarity index 100% rename from Code/Misc/Resource/ResourceManager.cpp rename to Code/Misc/Utilities/Resource/ResourceManager.cpp diff --git a/Code/Misc/Resource/ResourceManager.h b/Code/Misc/Utilities/Resource/ResourceManager.h similarity index 100% rename from Code/Misc/Resource/ResourceManager.h rename to Code/Misc/Utilities/Resource/ResourceManager.h diff --git a/Code/Misc/Thread/IThreadObject.h b/Code/Misc/Utilities/Thread/IThreadObject.h similarity index 100% rename from Code/Misc/Thread/IThreadObject.h rename to Code/Misc/Utilities/Thread/IThreadObject.h diff --git a/Code/Misc/Thread/OysterMutex.cpp b/Code/Misc/Utilities/Thread/OysterMutex.cpp similarity index 100% rename from Code/Misc/Thread/OysterMutex.cpp rename to Code/Misc/Utilities/Thread/OysterMutex.cpp diff --git a/Code/Misc/Thread/OysterMutex.h b/Code/Misc/Utilities/Thread/OysterMutex.h similarity index 100% rename from Code/Misc/Thread/OysterMutex.h rename to Code/Misc/Utilities/Thread/OysterMutex.h diff --git a/Code/Misc/Thread/OysterThread.h b/Code/Misc/Utilities/Thread/OysterThread.h similarity index 100% rename from Code/Misc/Thread/OysterThread.h rename to Code/Misc/Utilities/Thread/OysterThread.h diff --git a/Code/Misc/Thread/OysterThread_Impl.cpp b/Code/Misc/Utilities/Thread/OysterThread_Impl.cpp similarity index 100% rename from Code/Misc/Thread/OysterThread_Impl.cpp rename to Code/Misc/Utilities/Thread/OysterThread_Impl.cpp diff --git a/Code/Misc/ThreadSafeDynamicArray.h b/Code/Misc/Utilities/ThreadSafeDynamicArray.h similarity index 100% rename from Code/Misc/ThreadSafeDynamicArray.h rename to Code/Misc/Utilities/ThreadSafeDynamicArray.h diff --git a/Code/Misc/ThreadSafeQueue.h b/Code/Misc/Utilities/ThreadSafeQueue.h similarity index 100% rename from Code/Misc/ThreadSafeQueue.h rename to Code/Misc/Utilities/ThreadSafeQueue.h diff --git a/Code/Misc/Utilities-Impl.h b/Code/Misc/Utilities/Utilities-Impl.h similarity index 100% rename from Code/Misc/Utilities-Impl.h rename to Code/Misc/Utilities/Utilities-Impl.h diff --git a/Code/Misc/Utilities.cpp b/Code/Misc/Utilities/Utilities.cpp similarity index 100% rename from Code/Misc/Utilities.cpp rename to Code/Misc/Utilities/Utilities.cpp diff --git a/Code/Misc/Utilities.h b/Code/Misc/Utilities/Utilities.h similarity index 100% rename from Code/Misc/Utilities.h rename to Code/Misc/Utilities/Utilities.h diff --git a/Code/Misc/Misc.vcxproj b/Code/Misc/Utilities/Utilities.vcxproj similarity index 99% rename from Code/Misc/Misc.vcxproj rename to Code/Misc/Utilities/Utilities.vcxproj index 7ba749da..d1632595 100644 --- a/Code/Misc/Misc.vcxproj +++ b/Code/Misc/Utilities/Utilities.vcxproj @@ -20,7 +20,7 @@ {2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE} - Misc + Utilities diff --git a/Code/Misc/Misc.vcxproj.user b/Code/Misc/Utilities/Utilities.vcxproj.user similarity index 100% rename from Code/Misc/Misc.vcxproj.user rename to Code/Misc/Utilities/Utilities.vcxproj.user diff --git a/Code/Misc/WinTimer.cpp b/Code/Misc/Utilities/WinTimer.cpp similarity index 100% rename from Code/Misc/WinTimer.cpp rename to Code/Misc/Utilities/WinTimer.cpp diff --git a/Code/Misc/WinTimer.h b/Code/Misc/Utilities/WinTimer.h similarity index 100% rename from Code/Misc/WinTimer.h rename to Code/Misc/Utilities/WinTimer.h diff --git a/Code/WindowManager/Example Usage.cpp b/Code/Misc/WindowManager/Example Usage.cpp similarity index 100% rename from Code/WindowManager/Example Usage.cpp rename to Code/Misc/WindowManager/Example Usage.cpp diff --git a/Code/WindowManager/Window.cpp b/Code/Misc/WindowManager/Window.cpp similarity index 100% rename from Code/WindowManager/Window.cpp rename to Code/Misc/WindowManager/Window.cpp diff --git a/Code/WindowManager/Window.h b/Code/Misc/WindowManager/Window.h similarity index 100% rename from Code/WindowManager/Window.h rename to Code/Misc/WindowManager/Window.h diff --git a/Code/WindowManager/WindowManager.vcxproj b/Code/Misc/WindowManager/WindowManager.vcxproj similarity index 100% rename from Code/WindowManager/WindowManager.vcxproj rename to Code/Misc/WindowManager/WindowManager.vcxproj diff --git a/Code/WindowManager/WindowManager.vcxproj.user b/Code/Misc/WindowManager/WindowManager.vcxproj.user similarity index 100% rename from Code/WindowManager/WindowManager.vcxproj.user rename to Code/Misc/WindowManager/WindowManager.vcxproj.user diff --git a/Code/WindowManager/WindowShell.cpp b/Code/Misc/WindowManager/WindowShell.cpp similarity index 100% rename from Code/WindowManager/WindowShell.cpp rename to Code/Misc/WindowManager/WindowShell.cpp diff --git a/Code/WindowManager/WindowShell.h b/Code/Misc/WindowManager/WindowShell.h similarity index 100% rename from Code/WindowManager/WindowShell.h rename to Code/Misc/WindowManager/WindowShell.h diff --git a/Code/Network/NetworkAPI/NetworkAPI.vcxproj b/Code/Network/NetworkAPI/NetworkAPI.vcxproj index b637ead7..363c4c0d 100644 --- a/Code/Network/NetworkAPI/NetworkAPI.vcxproj +++ b/Code/Network/NetworkAPI/NetworkAPI.vcxproj @@ -107,7 +107,7 @@ Disabled NETWORKAPI_EXPORT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)Misc\ + $(SolutionDir)Misc\Utilities Console @@ -122,7 +122,7 @@ Disabled NETWORKAPI_EXPORT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)Misc\ + $(SolutionDir)Misc\Utilities Console @@ -139,7 +139,7 @@ true NETWORKAPI_EXPORT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)Misc\ + $(SolutionDir)Misc\Utilities Console @@ -158,7 +158,7 @@ true NETWORKAPI_EXPORT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)Misc\ + $(SolutionDir)Misc\Utilities Console @@ -184,7 +184,7 @@ - + {2ec4dded-8f75-4c86-a10b-e1e8eb29f3ee} diff --git a/Code/Network/NetworkAPI/NetworkClient.cpp b/Code/Network/NetworkAPI/NetworkClient.cpp index cf604d53..96d149f3 100644 --- a/Code/Network/NetworkAPI/NetworkClient.cpp +++ b/Code/Network/NetworkAPI/NetworkClient.cpp @@ -17,10 +17,10 @@ #include "../NetworkDependencies/PostBox.h" #include "../NetworkDependencies/WinsockFunctions.h" -#include "../../Misc/Utilities.h" -#include "../../Misc/Thread/IThreadObject.h" -#include "../../Misc/Thread/OysterThread.h" -#include "../../Misc/Packing/Packing.h" +#include "Utilities.h" +#include "Thread/IThreadObject.h" +#include "Thread/OysterThread.h" +#include "Packing/Packing.h" #include #include diff --git a/Code/Network/NetworkAPI/NetworkSession.cpp b/Code/Network/NetworkAPI/NetworkSession.cpp index 3d7bbadc..31d30b0e 100644 --- a/Code/Network/NetworkAPI/NetworkSession.cpp +++ b/Code/Network/NetworkAPI/NetworkSession.cpp @@ -3,9 +3,9 @@ ///////////////////////////////////////////////////////////////////// #include "NetworkSession.h" -#include "..\..\Misc\Utilities.h" -#include "..\..\Misc\DynamicArray.h" -#include "..\..\Misc\GID.h" +#include "Utilities.h" +#include "DynamicArray.h" +#include "GID.h" #include "CustomNetProtocol.h" #include #include diff --git a/Code/Network/NetworkAPI/NetworkSession.h b/Code/Network/NetworkAPI/NetworkSession.h index ddae7f24..f0677c77 100644 --- a/Code/Network/NetworkAPI/NetworkSession.h +++ b/Code/Network/NetworkAPI/NetworkSession.h @@ -13,7 +13,7 @@ #include "NetworkAPI_Preprocessor.h" #include "NetworkServerEventStruct.h" #include "NetworkClient.h" -#include "..\Misc\Utilities.h" +#include "Utilities.h" #include "DynamicArray.h" namespace Oyster diff --git a/Code/Network/NetworkAPI/Translator.cpp b/Code/Network/NetworkAPI/Translator.cpp index a38fb8b2..bbb85ed3 100644 --- a/Code/Network/NetworkAPI/Translator.cpp +++ b/Code/Network/NetworkAPI/Translator.cpp @@ -5,7 +5,7 @@ #include "CustomNetProtocol.h" -#include "../../Misc/Utilities.h" +#include "Utilities.h" #include "../NetworkDependencies/Messages/MessageHeader.h" #include "../NetworkDependencies/OysterByte.h" #include diff --git a/Code/Network/NetworkDependencies/IConnection.h b/Code/Network/NetworkDependencies/IConnection.h index bd59de65..7c92f318 100644 --- a/Code/Network/NetworkDependencies/IConnection.h +++ b/Code/Network/NetworkDependencies/IConnection.h @@ -5,7 +5,7 @@ // Created by Sam Svensson 2013 // ////////////////////////////////// -#include "../../Misc/Utilities.h" +#include "Utilities.h" namespace Oyster { diff --git a/Code/Network/NetworkDependencies/Listener.h b/Code/Network/NetworkDependencies/Listener.h index 49449990..1411817d 100644 --- a/Code/Network/NetworkDependencies/Listener.h +++ b/Code/Network/NetworkDependencies/Listener.h @@ -7,9 +7,9 @@ #include "Connection.h" #include "IPostBox.h" -#include "../../Misc/Thread/OysterThread.h" -#include "../../Misc/Thread/OysterMutex.h" -#include "../../Misc/Utilities.h" +#include "Thread/OysterThread.h" +#include "Thread/OysterMutex.h" +#include "Utilities.h" #include namespace Oyster diff --git a/Code/Network/NetworkDependencies/Messages/MessageHeader.cpp b/Code/Network/NetworkDependencies/Messages/MessageHeader.cpp index 8f315797..ae5f4bd4 100644 --- a/Code/Network/NetworkDependencies/Messages/MessageHeader.cpp +++ b/Code/Network/NetworkDependencies/Messages/MessageHeader.cpp @@ -1,5 +1,5 @@ #include "MessageHeader.h" -#include "../../../Misc/Packing/Packing.h" +#include "Packing/Packing.h" #include using namespace std; diff --git a/Code/Network/NetworkDependencies/NetworkDependencies.vcxproj b/Code/Network/NetworkDependencies/NetworkDependencies.vcxproj index a723d1f7..79521d28 100644 --- a/Code/Network/NetworkDependencies/NetworkDependencies.vcxproj +++ b/Code/Network/NetworkDependencies/NetworkDependencies.vcxproj @@ -98,7 +98,7 @@ Level3 Disabled true - %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories);$(SolutionDir)Misc\Utilities true @@ -109,7 +109,7 @@ Level3 Disabled true - %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories);$(SolutionDir)Misc\Utilities true @@ -122,7 +122,7 @@ true true true - %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories);$(SolutionDir)Misc\Utilities true @@ -137,7 +137,7 @@ true true true - %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories);$(SolutionDir)Misc\Utilities true @@ -145,11 +145,6 @@ true - - - {2ec4dded-8f75-4c86-a10b-e1e8eb29f3ee} - - @@ -176,6 +171,11 @@ + + + {2ec4dded-8f75-4c86-a10b-e1e8eb29f3ee} + + diff --git a/Code/Network/NetworkDependencies/PostBox.h b/Code/Network/NetworkDependencies/PostBox.h index 86375ce0..4da4015d 100644 --- a/Code/Network/NetworkDependencies/PostBox.h +++ b/Code/Network/NetworkDependencies/PostBox.h @@ -6,8 +6,7 @@ ///////////////////////////////////// #include "IPostBox.h" -#include "../../Misc/Thread/OysterMutex.h" -#include "../../Misc/ThreadSafeQueue.h" +#include "ThreadSafeQueue.h" namespace Oyster { diff --git a/Code/Network/NetworkDependencies/ThreadedClient.h b/Code/Network/NetworkDependencies/ThreadedClient.h index b125f401..c63e8062 100644 --- a/Code/Network/NetworkDependencies/ThreadedClient.h +++ b/Code/Network/NetworkDependencies/ThreadedClient.h @@ -5,11 +5,11 @@ // Created by Sam Svensson 2013 // ////////////////////////////////// -#include "../../Misc/Thread/IThreadObject.h" +#include "Thread/IThreadObject.h" #include "PostBox.h" #include "Connection.h" -#include "../../Misc/Thread/OysterThread.h" -#include "../../Misc/Utilities.h" +#include "Thread/OysterThread.h" +#include "Utilities.h" #include diff --git a/Code/OysterGraphics/Core/Core.h b/Code/OysterGraphics/Core/Core.h index 644d9f0d..ae234ee4 100644 --- a/Code/OysterGraphics/Core/Core.h +++ b/Code/OysterGraphics/Core/Core.h @@ -7,8 +7,7 @@ #include "Dx11Includes.h" #include #include "OysterMath.h" -//#include "../Misc/Resource/ResourceManager.h" -#include "../../Misc/Resource/ResourceManager.h" +#include "Resource/ResourceManager.h" //#include namespace Oyster diff --git a/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp b/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp index 537ed63d..f3bd12fd 100644 --- a/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp +++ b/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp @@ -3,7 +3,7 @@ #include "../Render/Resources.h" #include "../Render/DefaultRenderer.h" #include "../FileLoader/ObjReader.h" -#include "../../Misc/Resource/ResourceManager.h" +#include "Resource/ResourceManager.h" #include "../FileLoader/GeneralLoader.h" #include "../Model/ModelInfo.h" #include "../Render/GuiRenderer.h" diff --git a/Code/OysterGraphics/FileLoader/ObjReader.h b/Code/OysterGraphics/FileLoader/ObjReader.h index 4ae2bffd..076df470 100644 --- a/Code/OysterGraphics/FileLoader/ObjReader.h +++ b/Code/OysterGraphics/FileLoader/ObjReader.h @@ -1,6 +1,6 @@ #pragma once #include "../Model/ModelInfo.h" -#include "../../OysterMath/OysterMath.h" +#include "OysterMath.h" namespace Oyster { diff --git a/Code/OysterGraphics/OysterGraphics.vcxproj b/Code/OysterGraphics/OysterGraphics.vcxproj index fc00bde5..8faf4d0f 100644 --- a/Code/OysterGraphics/OysterGraphics.vcxproj +++ b/Code/OysterGraphics/OysterGraphics.vcxproj @@ -99,7 +99,7 @@ Level3 Disabled true - $(SolutionDir)OysterMath;$(SolutionDir)Misc;%(AdditionalIncludeDirectories) + $(SolutionDir)Physics\OysterPhysics3D;$(SolutionDir)Misc\OysterMath;$(SolutionDir)Misc\Utilities;%(AdditionalIncludeDirectories) GFX_DLL_EXPORT;%(PreprocessorDefinitions) @@ -118,7 +118,7 @@ Level3 Disabled true - ..\OysterPhysic3D\Collision;..\OysterPhysics3D;..\OysterMath;..\Misc;%(AdditionalIncludeDirectories) + $(SolutionDir)Physics\OysterPhysics3D;$(SolutionDir)Misc\OysterMath;$(SolutionDir)Misc\Utilities;%(AdditionalIncludeDirectories) GFX_DLL_EXPORT;%(PreprocessorDefinitions) @@ -136,7 +136,7 @@ true true true - ..\OysterPhysics3D;..\OysterMath;..\Misc;%(AdditionalIncludeDirectories) + $(SolutionDir)Physics\OysterPhysics3D;$(SolutionDir)Misc\OysterMath;$(SolutionDir)Misc\Utilities;%(AdditionalIncludeDirectories) GFX_DLL_EXPORT;%(PreprocessorDefinitions) @@ -157,7 +157,7 @@ true true true - ..\OysterPhysics3D;..\OysterMath;..\Misc;%(AdditionalIncludeDirectories) + $(SolutionDir)Physics\OysterPhysics3D;$(SolutionDir)Misc\OysterMath;$(SolutionDir)Misc\Utilities;%(AdditionalIncludeDirectories) GFX_DLL_EXPORT;%(PreprocessorDefinitions) @@ -200,14 +200,6 @@ - - - {2ec4dded-8f75-4c86-a10b-e1e8eb29f3ee} - - - {f10cbc03-9809-4cba-95d8-327c287b18ee} - - Geometry @@ -344,6 +336,14 @@ + + + {f10cbc03-9809-4cba-95d8-327c287b18ee} + + + {2ec4dded-8f75-4c86-a10b-e1e8eb29f3ee} + + diff --git a/Code/OysterMath/OysterMath.vcxproj.filters b/Code/OysterMath/OysterMath.vcxproj.filters deleted file mode 100644 index 081fe633..00000000 --- a/Code/OysterMath/OysterMath.vcxproj.filters +++ /dev/null @@ -1,39 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/Code/OysterPhysics3D/OysterPhysics3D.vcxproj.filters b/Code/OysterPhysics3D/OysterPhysics3D.vcxproj.filters deleted file mode 100644 index 4947a4d7..00000000 --- a/Code/OysterPhysics3D/OysterPhysics3D.vcxproj.filters +++ /dev/null @@ -1,141 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {810a1ae3-6c3b-430a-8ebb-4fc4a4478717} - - - {512d69ae-c260-4a23-b1ee-cbfbd19620a6} - - - {67d78b73-6ad3-439e-bfba-817f0268b958} - - - {86be9383-5659-4e32-bf71-ec25a5f1c5ac} - - - - - Header Files\Collision - - - Header Files\Collision - - - Header Files\Collision - - - Header Files\Collision - - - Header Files\Collision - - - Header Files\Collision - - - Header Files\Collision - - - Header Files\Collision - - - Header Files\Collision - - - Header Files\Collision - - - Header Files\Physics - - - Header Files\Physics - - - Header Files\Physics - - - Header Files\Physics - - - Header Files\Physics - - - Header Files\Physics - - - Header Files\Physics - - - Header Files\Collision - - - Header Files\Collision - - - - - Source Files\Collision - - - Source Files\Collision - - - Source Files\Collision - - - Source Files\Collision - - - Source Files\Collision - - - Source Files\Collision - - - Source Files\Collision - - - Source Files\Collision - - - Source Files\Collision - - - Source Files\Collision - - - Source Files\Collision - - - Source Files\Physics - - - Source Files\Physics - - - Source Files\Physics - - - Source Files\Physics - - - Source Files\Physics - - - Source Files\Collision - - - \ No newline at end of file diff --git a/Code/Physics/GamePhysics/GamePhysics.vcxproj b/Code/Physics/GamePhysics/GamePhysics.vcxproj new file mode 100644 index 00000000..a368bedf --- /dev/null +++ b/Code/Physics/GamePhysics/GamePhysics.vcxproj @@ -0,0 +1,176 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {C4C76A8D-44C5-4452-9F61-39C7E01CBDB4} + GamePhysics + + + + DynamicLibrary + true + v110 + MultiByte + + + DynamicLibrary + true + v110 + MultiByte + + + DynamicLibrary + false + v110 + true + MultiByte + + + DynamicLibrary + false + v110 + true + MultiByte + + + + + + + + + + + + + + + + + + + $(SolutionDir)..\Bin\DLL\ + $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ + $(ProjectName)_$(PlatformShortName)D + + + $(SolutionDir)..\Bin\DLL\ + $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ + $(ProjectName)_$(PlatformShortName) + + + $(SolutionDir)..\Bin\DLL\ + $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ + $(ProjectName)_$(PlatformShortName)D + + + $(SolutionDir)..\Bin\DLL\ + $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ + $(ProjectName)_$(PlatformShortName) + + + + Level3 + Disabled + $(SolutionDir)Misc\Utilities;$(SolutionDir)Misc\OysterMath;$(SolutionDir)Physics\OysterPhysics3D;$(SolutionDir)Physics\Bullet Source\ + _WINDLL;PHYSICS_DLL_EXPORT;%(PreprocessorDefinitions) + false + + + true + + + $(SolutionDir)Physics/lib/debug/BulletCollision_Debug.lib;$(SolutionDir)Physics/lib/debug/BulletDynamics_Debug.lib;$(SolutionDir)Physics/lib/debug/LinearMath_Debug.lib;%(AdditionalDependencies) + + + + + Level3 + Disabled + $(SolutionDir)Misc\Utilities;$(SolutionDir)Misc\OysterMath;$(SolutionDir)Physics\OysterPhysics3D;$(SolutionDir)Physics\Bullet Source\ + _WINDLL;PHYSICS_DLL_EXPORT;%(PreprocessorDefinitions) + false + + + true + + + $(SolutionDir)Physics/lib/debug/BulletCollision_Debugx64.lib;$(SolutionDir)Physics/lib/debug/BulletDynamics_Debugx64.lib;$(SolutionDir)Physics/lib/debug/LinearMath_Debugx64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + Level3 + MaxSpeed + true + true + $(SolutionDir)Misc\Utilities;$(SolutionDir)Misc\OysterMath;$(SolutionDir)Physics\OysterPhysics3D;$(SolutionDir)Physics\Bullet Source\ + _WINDLL;PHYSICS_DLL_EXPORT;%(PreprocessorDefinitions) + false + + + true + true + true + + + $(SolutionDir)Physics/lib/release/BulletCollision.lib;$(SolutionDir)Physics/lib/release/BulletDynamics.lib;$(SolutionDir)Physics/lib/release/LinearMath.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + Level3 + MaxSpeed + true + true + $(SolutionDir)Misc\Utilities;$(SolutionDir)Misc\OysterMath;$(SolutionDir)Physics\OysterPhysics3D;$(SolutionDir)Physics\Bullet Source\ + _WINDLL;PHYSICS_DLL_EXPORT;%(PreprocessorDefinitions) + false + + + true + true + true + + + $(SolutionDir)Physics/lib/release/BulletCollisionx64.lib;$(SolutionDir)Physics/lib/release/BulletDynamicsx64.lib;$(SolutionDir)Physics/lib/release/LinearMathx64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + {f10cbc03-9809-4cba-95d8-327c287b18ee} + + + + + + \ No newline at end of file diff --git a/Code/GamePhysics/GamePhysics.vcxproj.user b/Code/Physics/GamePhysics/GamePhysics.vcxproj.user similarity index 95% rename from Code/GamePhysics/GamePhysics.vcxproj.user rename to Code/Physics/GamePhysics/GamePhysics.vcxproj.user index 4b847ee6..2e28d6f7 100644 --- a/Code/GamePhysics/GamePhysics.vcxproj.user +++ b/Code/Physics/GamePhysics/GamePhysics.vcxproj.user @@ -1,7 +1,7 @@  - false + true $(OutDir) diff --git a/Code/GamePhysics/Implementation/DLLMain.cpp b/Code/Physics/GamePhysics/Implementation/DLLMain.cpp similarity index 100% rename from Code/GamePhysics/Implementation/DLLMain.cpp rename to Code/Physics/GamePhysics/Implementation/DLLMain.cpp diff --git a/Code/GamePhysics/Implementation/PhysicsAPI_Impl.cpp b/Code/Physics/GamePhysics/Implementation/PhysicsAPI_Impl.cpp similarity index 100% rename from Code/GamePhysics/Implementation/PhysicsAPI_Impl.cpp rename to Code/Physics/GamePhysics/Implementation/PhysicsAPI_Impl.cpp diff --git a/Code/GamePhysics/Implementation/PhysicsAPI_Impl.h b/Code/Physics/GamePhysics/Implementation/PhysicsAPI_Impl.h similarity index 100% rename from Code/GamePhysics/Implementation/PhysicsAPI_Impl.h rename to Code/Physics/GamePhysics/Implementation/PhysicsAPI_Impl.h diff --git a/Code/GamePhysics/Implementation/SimpleRigidBody.cpp b/Code/Physics/GamePhysics/Implementation/SimpleRigidBody.cpp similarity index 100% rename from Code/GamePhysics/Implementation/SimpleRigidBody.cpp rename to Code/Physics/GamePhysics/Implementation/SimpleRigidBody.cpp diff --git a/Code/GamePhysics/Implementation/SimpleRigidBody.h b/Code/Physics/GamePhysics/Implementation/SimpleRigidBody.h similarity index 100% rename from Code/GamePhysics/Implementation/SimpleRigidBody.h rename to Code/Physics/GamePhysics/Implementation/SimpleRigidBody.h diff --git a/Code/GamePhysics/PhysicsAPI.h b/Code/Physics/GamePhysics/PhysicsAPI.h similarity index 100% rename from Code/GamePhysics/PhysicsAPI.h rename to Code/Physics/GamePhysics/PhysicsAPI.h diff --git a/Code/GamePhysics/PhysicsStructs-Impl.h b/Code/Physics/GamePhysics/PhysicsStructs-Impl.h similarity index 100% rename from Code/GamePhysics/PhysicsStructs-Impl.h rename to Code/Physics/GamePhysics/PhysicsStructs-Impl.h diff --git a/Code/GamePhysics/PhysicsStructs.h b/Code/Physics/GamePhysics/PhysicsStructs.h similarity index 100% rename from Code/GamePhysics/PhysicsStructs.h rename to Code/Physics/GamePhysics/PhysicsStructs.h diff --git a/Code/OysterPhysics3D/Box.cpp b/Code/Physics/OysterPhysics3D/Box.cpp similarity index 100% rename from Code/OysterPhysics3D/Box.cpp rename to Code/Physics/OysterPhysics3D/Box.cpp diff --git a/Code/OysterPhysics3D/Box.h b/Code/Physics/OysterPhysics3D/Box.h similarity index 100% rename from Code/OysterPhysics3D/Box.h rename to Code/Physics/OysterPhysics3D/Box.h diff --git a/Code/OysterPhysics3D/BoxAxisAligned.cpp b/Code/Physics/OysterPhysics3D/BoxAxisAligned.cpp similarity index 100% rename from Code/OysterPhysics3D/BoxAxisAligned.cpp rename to Code/Physics/OysterPhysics3D/BoxAxisAligned.cpp diff --git a/Code/OysterPhysics3D/BoxAxisAligned.h b/Code/Physics/OysterPhysics3D/BoxAxisAligned.h similarity index 100% rename from Code/OysterPhysics3D/BoxAxisAligned.h rename to Code/Physics/OysterPhysics3D/BoxAxisAligned.h diff --git a/Code/OysterPhysics3D/Cone.cpp b/Code/Physics/OysterPhysics3D/Cone.cpp similarity index 100% rename from Code/OysterPhysics3D/Cone.cpp rename to Code/Physics/OysterPhysics3D/Cone.cpp diff --git a/Code/OysterPhysics3D/Cone.h b/Code/Physics/OysterPhysics3D/Cone.h similarity index 100% rename from Code/OysterPhysics3D/Cone.h rename to Code/Physics/OysterPhysics3D/Cone.h diff --git a/Code/OysterPhysics3D/FluidDrag.cpp b/Code/Physics/OysterPhysics3D/FluidDrag.cpp similarity index 100% rename from Code/OysterPhysics3D/FluidDrag.cpp rename to Code/Physics/OysterPhysics3D/FluidDrag.cpp diff --git a/Code/OysterPhysics3D/FluidDrag.h b/Code/Physics/OysterPhysics3D/FluidDrag.h similarity index 100% rename from Code/OysterPhysics3D/FluidDrag.h rename to Code/Physics/OysterPhysics3D/FluidDrag.h diff --git a/Code/OysterPhysics3D/Frustrum.cpp b/Code/Physics/OysterPhysics3D/Frustrum.cpp similarity index 100% rename from Code/OysterPhysics3D/Frustrum.cpp rename to Code/Physics/OysterPhysics3D/Frustrum.cpp diff --git a/Code/OysterPhysics3D/Frustrum.h b/Code/Physics/OysterPhysics3D/Frustrum.h similarity index 100% rename from Code/OysterPhysics3D/Frustrum.h rename to Code/Physics/OysterPhysics3D/Frustrum.h diff --git a/Code/OysterPhysics3D/ICollideable.cpp b/Code/Physics/OysterPhysics3D/ICollideable.cpp similarity index 100% rename from Code/OysterPhysics3D/ICollideable.cpp rename to Code/Physics/OysterPhysics3D/ICollideable.cpp diff --git a/Code/OysterPhysics3D/ICollideable.h b/Code/Physics/OysterPhysics3D/ICollideable.h similarity index 100% rename from Code/OysterPhysics3D/ICollideable.h rename to Code/Physics/OysterPhysics3D/ICollideable.h diff --git a/Code/OysterPhysics3D/Inertia.cpp b/Code/Physics/OysterPhysics3D/Inertia.cpp similarity index 100% rename from Code/OysterPhysics3D/Inertia.cpp rename to Code/Physics/OysterPhysics3D/Inertia.cpp diff --git a/Code/OysterPhysics3D/Inertia.h b/Code/Physics/OysterPhysics3D/Inertia.h similarity index 100% rename from Code/OysterPhysics3D/Inertia.h rename to Code/Physics/OysterPhysics3D/Inertia.h diff --git a/Code/OysterPhysics3D/Line.cpp b/Code/Physics/OysterPhysics3D/Line.cpp similarity index 100% rename from Code/OysterPhysics3D/Line.cpp rename to Code/Physics/OysterPhysics3D/Line.cpp diff --git a/Code/OysterPhysics3D/Line.h b/Code/Physics/OysterPhysics3D/Line.h similarity index 100% rename from Code/OysterPhysics3D/Line.h rename to Code/Physics/OysterPhysics3D/Line.h diff --git a/Code/OysterPhysics3D/OysterCollision3D.cpp b/Code/Physics/OysterPhysics3D/OysterCollision3D.cpp similarity index 100% rename from Code/OysterPhysics3D/OysterCollision3D.cpp rename to Code/Physics/OysterPhysics3D/OysterCollision3D.cpp diff --git a/Code/OysterPhysics3D/OysterCollision3D.h b/Code/Physics/OysterPhysics3D/OysterCollision3D.h similarity index 100% rename from Code/OysterPhysics3D/OysterCollision3D.h rename to Code/Physics/OysterPhysics3D/OysterCollision3D.h diff --git a/Code/OysterPhysics3D/OysterPhysics3D.h b/Code/Physics/OysterPhysics3D/OysterPhysics3D.h similarity index 100% rename from Code/OysterPhysics3D/OysterPhysics3D.h rename to Code/Physics/OysterPhysics3D/OysterPhysics3D.h diff --git a/Code/OysterPhysics3D/OysterPhysics3D.vcxproj b/Code/Physics/OysterPhysics3D/OysterPhysics3D.vcxproj similarity index 91% rename from Code/OysterPhysics3D/OysterPhysics3D.vcxproj rename to Code/Physics/OysterPhysics3D/OysterPhysics3D.vcxproj index 2998c1bb..ed584d25 100644 --- a/Code/OysterPhysics3D/OysterPhysics3D.vcxproj +++ b/Code/Physics/OysterPhysics3D/OysterPhysics3D.vcxproj @@ -19,7 +19,7 @@ - {4285BD3F-3C6C-4670-B7AF-A29AFEF5F6A8} + {3EA5F14D-2A71-4588-A69D-87C4571C580F} OysterPhysics3D @@ -94,7 +94,7 @@ Level3 Disabled true - $(SolutionDir)Misc;$(SolutionDir)OysterMath;%(AdditionalIncludeDirectories) + $(SolutionDir)Misc\Utilities;$(SolutionDir)Misc\OysterMath;%(AdditionalIncludeDirectories) true @@ -105,7 +105,7 @@ Level3 Disabled true - $(SolutionDir)Misc;$(SolutionDir)OysterMath;%(AdditionalIncludeDirectories) + $(SolutionDir)Misc\Utilities;$(SolutionDir)Misc\OysterMath;%(AdditionalIncludeDirectories) true @@ -118,7 +118,7 @@ true true true - $(SolutionDir)Misc;$(SolutionDir)OysterMath;%(AdditionalIncludeDirectories) + $(SolutionDir)Misc\Utilities;$(SolutionDir)Misc\OysterMath;%(AdditionalIncludeDirectories) true @@ -133,7 +133,7 @@ true true true - $(SolutionDir)Misc;$(SolutionDir)OysterMath;%(AdditionalIncludeDirectories) + $(SolutionDir)Misc\Utilities;$(SolutionDir)Misc\OysterMath;%(AdditionalIncludeDirectories) true @@ -141,14 +141,6 @@ true - - - {2ec4dded-8f75-4c86-a10b-e1e8eb29f3ee} - - - {f10cbc03-9809-4cba-95d8-327c287b18ee} - - @@ -189,6 +181,14 @@ + + + {f10cbc03-9809-4cba-95d8-327c287b18ee} + + + {2ec4dded-8f75-4c86-a10b-e1e8eb29f3ee} + + diff --git a/Code/OysterPhysics3D/OysterPhysics3D.vcxproj.user b/Code/Physics/OysterPhysics3D/OysterPhysics3D.vcxproj.user similarity index 77% rename from Code/OysterPhysics3D/OysterPhysics3D.vcxproj.user rename to Code/Physics/OysterPhysics3D/OysterPhysics3D.vcxproj.user index 3f030911..9a0b0ae0 100644 --- a/Code/OysterPhysics3D/OysterPhysics3D.vcxproj.user +++ b/Code/Physics/OysterPhysics3D/OysterPhysics3D.vcxproj.user @@ -1,6 +1,6 @@  - false + true \ No newline at end of file diff --git a/Code/OysterPhysics3D/Particle.cpp b/Code/Physics/OysterPhysics3D/Particle.cpp similarity index 100% rename from Code/OysterPhysics3D/Particle.cpp rename to Code/Physics/OysterPhysics3D/Particle.cpp diff --git a/Code/OysterPhysics3D/Particle.h b/Code/Physics/OysterPhysics3D/Particle.h similarity index 100% rename from Code/OysterPhysics3D/Particle.h rename to Code/Physics/OysterPhysics3D/Particle.h diff --git a/Code/OysterPhysics3D/Plane.cpp b/Code/Physics/OysterPhysics3D/Plane.cpp similarity index 100% rename from Code/OysterPhysics3D/Plane.cpp rename to Code/Physics/OysterPhysics3D/Plane.cpp diff --git a/Code/OysterPhysics3D/Plane.h b/Code/Physics/OysterPhysics3D/Plane.h similarity index 100% rename from Code/OysterPhysics3D/Plane.h rename to Code/Physics/OysterPhysics3D/Plane.h diff --git a/Code/OysterPhysics3D/Point.cpp b/Code/Physics/OysterPhysics3D/Point.cpp similarity index 100% rename from Code/OysterPhysics3D/Point.cpp rename to Code/Physics/OysterPhysics3D/Point.cpp diff --git a/Code/OysterPhysics3D/Point.h b/Code/Physics/OysterPhysics3D/Point.h similarity index 100% rename from Code/OysterPhysics3D/Point.h rename to Code/Physics/OysterPhysics3D/Point.h diff --git a/Code/OysterPhysics3D/Ray.cpp b/Code/Physics/OysterPhysics3D/Ray.cpp similarity index 100% rename from Code/OysterPhysics3D/Ray.cpp rename to Code/Physics/OysterPhysics3D/Ray.cpp diff --git a/Code/OysterPhysics3D/Ray.h b/Code/Physics/OysterPhysics3D/Ray.h similarity index 100% rename from Code/OysterPhysics3D/Ray.h rename to Code/Physics/OysterPhysics3D/Ray.h diff --git a/Code/OysterPhysics3D/RigidBody.cpp b/Code/Physics/OysterPhysics3D/RigidBody.cpp similarity index 100% rename from Code/OysterPhysics3D/RigidBody.cpp rename to Code/Physics/OysterPhysics3D/RigidBody.cpp diff --git a/Code/OysterPhysics3D/RigidBody.h b/Code/Physics/OysterPhysics3D/RigidBody.h similarity index 100% rename from Code/OysterPhysics3D/RigidBody.h rename to Code/Physics/OysterPhysics3D/RigidBody.h diff --git a/Code/OysterPhysics3D/RigidBody_Inline.h b/Code/Physics/OysterPhysics3D/RigidBody_Inline.h similarity index 100% rename from Code/OysterPhysics3D/RigidBody_Inline.h rename to Code/Physics/OysterPhysics3D/RigidBody_Inline.h diff --git a/Code/OysterPhysics3D/Sphere.cpp b/Code/Physics/OysterPhysics3D/Sphere.cpp similarity index 100% rename from Code/OysterPhysics3D/Sphere.cpp rename to Code/Physics/OysterPhysics3D/Sphere.cpp diff --git a/Code/OysterPhysics3D/Sphere.h b/Code/Physics/OysterPhysics3D/Sphere.h similarity index 100% rename from Code/OysterPhysics3D/Sphere.h rename to Code/Physics/OysterPhysics3D/Sphere.h diff --git a/Code/OysterPhysics3D/Spring.cpp b/Code/Physics/OysterPhysics3D/Spring.cpp similarity index 100% rename from Code/OysterPhysics3D/Spring.cpp rename to Code/Physics/OysterPhysics3D/Spring.cpp diff --git a/Code/OysterPhysics3D/Spring.h b/Code/Physics/OysterPhysics3D/Spring.h similarity index 100% rename from Code/OysterPhysics3D/Spring.h rename to Code/Physics/OysterPhysics3D/Spring.h diff --git a/Code/OysterPhysics3D/Universe.cpp b/Code/Physics/OysterPhysics3D/Universe.cpp similarity index 100% rename from Code/OysterPhysics3D/Universe.cpp rename to Code/Physics/OysterPhysics3D/Universe.cpp diff --git a/Code/OysterPhysics3D/Universe.h b/Code/Physics/OysterPhysics3D/Universe.h similarity index 100% rename from Code/OysterPhysics3D/Universe.h rename to Code/Physics/OysterPhysics3D/Universe.h diff --git a/Code/WindowManager/WindowManager.vcxproj.filters b/Code/WindowManager/WindowManager.vcxproj.filters deleted file mode 100644 index a8263606..00000000 --- a/Code/WindowManager/WindowManager.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file