diff --git a/build/Lol (vs2013).sln b/build/Lol (vs2013).sln index 26c03723..9a9ef372 100644 --- a/build/Lol (vs2013).sln +++ b/build/Lol (vs2013).sln @@ -175,11 +175,9 @@ Global Debug|ORBIS = Debug|ORBIS Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Debug|Xbox 360 = Debug|Xbox 360 Release|ORBIS = Release|ORBIS Release|Win32 = Release|Win32 Release|x64 = Release|x64 - Release|Xbox 360 = Release|Xbox 360 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|ORBIS.ActiveCfg = Debug|ORBIS @@ -188,449 +186,363 @@ Global {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Win32.Build.0 = Debug|Win32 {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|x64.ActiveCfg = Debug|x64 {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|x64.Build.0 = Debug|x64 - {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 - {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 - {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|ORBIS.ActiveCfg = Release|ORBIS {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|ORBIS.Build.0 = Release|ORBIS {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Win32.ActiveCfg = Release|Win32 {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Win32.Build.0 = Release|Win32 {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|x64.ActiveCfg = Release|x64 {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|x64.Build.0 = Release|x64 - {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 - {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Xbox 360.Build.0 = Release|Xbox 360 - {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|ORBIS.ActiveCfg = Debug|Win32 {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|Win32.ActiveCfg = Debug|Win32 {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|x64.ActiveCfg = Debug|x64 {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|x64.Build.0 = Debug|x64 - {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|ORBIS.ActiveCfg = Release|Win32 {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Win32.ActiveCfg = Release|Win32 {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Win32.Build.0 = Release|Win32 {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|x64.ActiveCfg = Release|x64 {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|x64.Build.0 = Release|x64 - {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Xbox 360.ActiveCfg = Release|Win32 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|ORBIS.ActiveCfg = Debug|ORBIS {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Win32.ActiveCfg = Debug|Win32 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Win32.Build.0 = Debug|Win32 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|x64.ActiveCfg = Debug|x64 - {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 - {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 - {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|ORBIS.ActiveCfg = Release|ORBIS {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Win32.ActiveCfg = Release|Win32 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Win32.Build.0 = Release|Win32 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|x64.ActiveCfg = Release|x64 - {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 - {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Xbox 360.Build.0 = Release|Xbox 360 - {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|ORBIS.ActiveCfg = Debug|Win32 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win32.ActiveCfg = Debug|Win32 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win32.Build.0 = Debug|Win32 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|x64.ActiveCfg = Debug|x64 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|x64.Build.0 = Debug|x64 - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|ORBIS.ActiveCfg = Release|Win32 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Win32.ActiveCfg = Release|Win32 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Win32.Build.0 = Release|Win32 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|x64.ActiveCfg = Release|x64 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|x64.Build.0 = Release|x64 - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Xbox 360.ActiveCfg = Release|Win32 {83D3B207-C601-4025-8F41-01DEDC354661}.Debug|ORBIS.ActiveCfg = Debug|Win32 {83D3B207-C601-4025-8F41-01DEDC354661}.Debug|Win32.ActiveCfg = Debug|Win32 {83D3B207-C601-4025-8F41-01DEDC354661}.Debug|Win32.Build.0 = Debug|Win32 {83D3B207-C601-4025-8F41-01DEDC354661}.Debug|x64.ActiveCfg = Debug|x64 {83D3B207-C601-4025-8F41-01DEDC354661}.Debug|x64.Build.0 = Debug|x64 - {83D3B207-C601-4025-8F41-01DEDC354661}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {83D3B207-C601-4025-8F41-01DEDC354661}.Release|ORBIS.ActiveCfg = Release|Win32 {83D3B207-C601-4025-8F41-01DEDC354661}.Release|Win32.ActiveCfg = Release|Win32 {83D3B207-C601-4025-8F41-01DEDC354661}.Release|Win32.Build.0 = Release|Win32 {83D3B207-C601-4025-8F41-01DEDC354661}.Release|x64.ActiveCfg = Release|x64 {83D3B207-C601-4025-8F41-01DEDC354661}.Release|x64.Build.0 = Release|x64 - {83D3B207-C601-4025-8F41-01DEDC354661}.Release|Xbox 360.ActiveCfg = Release|Win32 {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|ORBIS.ActiveCfg = Debug|Win32 {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Win32.ActiveCfg = Debug|Win32 {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Win32.Build.0 = Debug|Win32 {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|x64.ActiveCfg = Debug|x64 {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|x64.Build.0 = Debug|x64 - {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|ORBIS.ActiveCfg = Release|Win32 {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Win32.ActiveCfg = Release|Win32 {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Win32.Build.0 = Release|Win32 {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|x64.ActiveCfg = Release|x64 {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|x64.Build.0 = Release|x64 - {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Xbox 360.ActiveCfg = Release|Win32 {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|ORBIS.ActiveCfg = Debug|Win32 {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Win32.ActiveCfg = Debug|Win32 {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Win32.Build.0 = Debug|Win32 {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|x64.ActiveCfg = Debug|x64 {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|x64.Build.0 = Debug|x64 - {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|ORBIS.ActiveCfg = Release|Win32 {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Win32.ActiveCfg = Release|Win32 {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Win32.Build.0 = Release|Win32 {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|x64.ActiveCfg = Release|x64 {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|x64.Build.0 = Release|x64 - {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Xbox 360.ActiveCfg = Release|Win32 {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|ORBIS.ActiveCfg = Debug|Win32 {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Win32.ActiveCfg = Debug|Win32 {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Win32.Build.0 = Debug|Win32 {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|x64.ActiveCfg = Debug|x64 {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|x64.Build.0 = Debug|x64 - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|ORBIS.ActiveCfg = Release|Win32 {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Win32.ActiveCfg = Release|Win32 {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Win32.Build.0 = Release|Win32 {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|x64.ActiveCfg = Release|x64 {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|x64.Build.0 = Release|x64 - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Xbox 360.ActiveCfg = Release|Win32 {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|ORBIS.ActiveCfg = Debug|Win32 {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Win32.ActiveCfg = Debug|Win32 {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Win32.Build.0 = Debug|Win32 {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|x64.ActiveCfg = Debug|x64 {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|x64.Build.0 = Debug|x64 - {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|ORBIS.ActiveCfg = Release|Win32 {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Win32.ActiveCfg = Release|Win32 {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Win32.Build.0 = Release|Win32 {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|x64.ActiveCfg = Release|x64 {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|x64.Build.0 = Release|x64 - {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Xbox 360.ActiveCfg = Release|Win32 {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|ORBIS.ActiveCfg = Debug|Win32 {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Win32.ActiveCfg = Debug|Win32 {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Win32.Build.0 = Debug|Win32 {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|x64.ActiveCfg = Debug|x64 {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|x64.Build.0 = Debug|x64 - {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|ORBIS.ActiveCfg = Release|Win32 {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Win32.ActiveCfg = Release|Win32 {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Win32.Build.0 = Release|Win32 {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|x64.ActiveCfg = Release|x64 {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|x64.Build.0 = Release|x64 - {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Xbox 360.ActiveCfg = Release|Win32 {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|ORBIS.ActiveCfg = Debug|Win32 {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Win32.ActiveCfg = Debug|Win32 {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Win32.Build.0 = Debug|Win32 {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|x64.ActiveCfg = Debug|x64 {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|x64.Build.0 = Debug|x64 - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|ORBIS.ActiveCfg = Release|Win32 {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Win32.ActiveCfg = Release|Win32 {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Win32.Build.0 = Release|Win32 {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|x64.ActiveCfg = Release|x64 {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|x64.Build.0 = Release|x64 - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Xbox 360.ActiveCfg = Release|Win32 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|ORBIS.ActiveCfg = Debug|Win32 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win32.ActiveCfg = Debug|Win32 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|x64.ActiveCfg = Debug|x64 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|x64.Build.0 = Debug|x64 - {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|ORBIS.ActiveCfg = Release|Win32 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win32.ActiveCfg = Release|Win32 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win32.Build.0 = Release|Win32 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|x64.ActiveCfg = Release|x64 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|x64.Build.0 = Release|x64 - {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Xbox 360.ActiveCfg = Release|Win32 {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|ORBIS.ActiveCfg = Debug|Win32 {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Win32.ActiveCfg = Debug|Win32 {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|x64.ActiveCfg = Debug|x64 {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|x64.Build.0 = Debug|x64 - {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|ORBIS.ActiveCfg = Release|Win32 {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Win32.ActiveCfg = Release|Win32 {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Win32.Build.0 = Release|Win32 {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|x64.ActiveCfg = Release|x64 {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|x64.Build.0 = Release|x64 - {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Xbox 360.ActiveCfg = Release|Win32 {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|ORBIS.ActiveCfg = Debug|Win32 {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|Win32.ActiveCfg = Debug|Win32 {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|x64.ActiveCfg = Debug|x64 {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|x64.Build.0 = Debug|x64 - {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|ORBIS.ActiveCfg = Release|Win32 {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Win32.ActiveCfg = Release|Win32 {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Win32.Build.0 = Release|Win32 {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|x64.ActiveCfg = Release|x64 {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|x64.Build.0 = Release|x64 - {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Xbox 360.ActiveCfg = Release|Win32 {1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|ORBIS.ActiveCfg = Debug|Win32 {1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|Win32.ActiveCfg = Debug|Win32 {1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|x64.ActiveCfg = Debug|x64 {1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|x64.Build.0 = Debug|x64 - {1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|ORBIS.ActiveCfg = Release|Win32 {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Win32.ActiveCfg = Release|Win32 {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Win32.Build.0 = Release|Win32 {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|x64.ActiveCfg = Release|x64 {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|x64.Build.0 = Release|x64 - {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Xbox 360.ActiveCfg = Release|Win32 {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|ORBIS.ActiveCfg = Debug|Win32 {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Win32.ActiveCfg = Debug|Win32 {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|x64.ActiveCfg = Debug|x64 {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|x64.Build.0 = Debug|x64 - {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|ORBIS.ActiveCfg = Release|Win32 {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Win32.ActiveCfg = Release|Win32 {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Win32.Build.0 = Release|Win32 {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|x64.ActiveCfg = Release|x64 {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|x64.Build.0 = Release|x64 - {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Xbox 360.ActiveCfg = Release|Win32 {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Debug|ORBIS.ActiveCfg = Debug|Win32 {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Debug|Win32.ActiveCfg = Debug|Win32 {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Debug|x64.ActiveCfg = Debug|x64 {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Debug|x64.Build.0 = Debug|x64 - {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|ORBIS.ActiveCfg = Release|Win32 {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|Win32.ActiveCfg = Release|Win32 {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|Win32.Build.0 = Release|Win32 {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|x64.ActiveCfg = Release|x64 {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|x64.Build.0 = Release|x64 - {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|Xbox 360.ActiveCfg = Release|Win32 {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|ORBIS.ActiveCfg = Debug|Win32 {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|Win32.ActiveCfg = Debug|Win32 {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|x64.ActiveCfg = Debug|x64 {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|x64.Build.0 = Debug|x64 - {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|ORBIS.ActiveCfg = Release|Win32 {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|Win32.ActiveCfg = Release|Win32 {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|Win32.Build.0 = Release|Win32 {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|x64.ActiveCfg = Release|x64 {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|x64.Build.0 = Release|x64 - {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|Xbox 360.ActiveCfg = Release|Win32 {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|ORBIS.ActiveCfg = Debug|Win32 {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|Win32.ActiveCfg = Debug|Win32 {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|x64.ActiveCfg = Debug|x64 {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|x64.Build.0 = Debug|x64 - {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|ORBIS.ActiveCfg = Release|Win32 {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|Win32.ActiveCfg = Release|Win32 {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|Win32.Build.0 = Release|Win32 {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|x64.ActiveCfg = Release|x64 {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|x64.Build.0 = Release|x64 - {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|Xbox 360.ActiveCfg = Release|Win32 {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|ORBIS.ActiveCfg = Debug|Win32 {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|Win32.ActiveCfg = Debug|Win32 {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|x64.ActiveCfg = Debug|x64 {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|x64.Build.0 = Debug|x64 - {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|ORBIS.ActiveCfg = Release|Win32 {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|Win32.ActiveCfg = Release|Win32 {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|Win32.Build.0 = Release|Win32 {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|x64.ActiveCfg = Release|x64 {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|x64.Build.0 = Release|x64 - {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|Xbox 360.ActiveCfg = Release|Win32 {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|ORBIS.ActiveCfg = Debug|Win32 {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|Win32.ActiveCfg = Debug|Win32 {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|x64.ActiveCfg = Debug|x64 {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|x64.Build.0 = Debug|x64 - {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|ORBIS.ActiveCfg = Release|Win32 {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|Win32.ActiveCfg = Release|Win32 {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|Win32.Build.0 = Release|Win32 {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|x64.ActiveCfg = Release|x64 {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|x64.Build.0 = Release|x64 - {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|Xbox 360.ActiveCfg = Release|Win32 {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|ORBIS.ActiveCfg = Debug|Win32 {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|Win32.ActiveCfg = Debug|Win32 {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|x64.ActiveCfg = Debug|x64 {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|x64.Build.0 = Debug|x64 - {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|ORBIS.ActiveCfg = Release|Win32 {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|Win32.ActiveCfg = Release|Win32 {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|Win32.Build.0 = Release|Win32 {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|x64.ActiveCfg = Release|x64 {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|x64.Build.0 = Release|x64 - {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|Xbox 360.ActiveCfg = Release|Win32 {A69411B3-6DE8-404E-8E70-0D3375A7492A}.Debug|ORBIS.ActiveCfg = Debug|Win32 {A69411B3-6DE8-404E-8E70-0D3375A7492A}.Debug|Win32.ActiveCfg = Debug|Win32 {A69411B3-6DE8-404E-8E70-0D3375A7492A}.Debug|x64.ActiveCfg = Debug|x64 {A69411B3-6DE8-404E-8E70-0D3375A7492A}.Debug|x64.Build.0 = Debug|x64 - {A69411B3-6DE8-404E-8E70-0D3375A7492A}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {A69411B3-6DE8-404E-8E70-0D3375A7492A}.Release|ORBIS.ActiveCfg = Release|Win32 {A69411B3-6DE8-404E-8E70-0D3375A7492A}.Release|Win32.ActiveCfg = Release|Win32 {A69411B3-6DE8-404E-8E70-0D3375A7492A}.Release|Win32.Build.0 = Release|Win32 {A69411B3-6DE8-404E-8E70-0D3375A7492A}.Release|x64.ActiveCfg = Release|x64 {A69411B3-6DE8-404E-8E70-0D3375A7492A}.Release|x64.Build.0 = Release|x64 - {A69411B3-6DE8-404E-8E70-0D3375A7492A}.Release|Xbox 360.ActiveCfg = Release|Win32 {C2E01551-B636-4324-8461-71811DF6FBB5}.Debug|ORBIS.ActiveCfg = Debug|Win32 {C2E01551-B636-4324-8461-71811DF6FBB5}.Debug|Win32.ActiveCfg = Debug|Win32 {C2E01551-B636-4324-8461-71811DF6FBB5}.Debug|x64.ActiveCfg = Debug|x64 {C2E01551-B636-4324-8461-71811DF6FBB5}.Debug|x64.Build.0 = Debug|x64 - {C2E01551-B636-4324-8461-71811DF6FBB5}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {C2E01551-B636-4324-8461-71811DF6FBB5}.Release|ORBIS.ActiveCfg = Release|Win32 {C2E01551-B636-4324-8461-71811DF6FBB5}.Release|Win32.ActiveCfg = Release|Win32 {C2E01551-B636-4324-8461-71811DF6FBB5}.Release|Win32.Build.0 = Release|Win32 {C2E01551-B636-4324-8461-71811DF6FBB5}.Release|x64.ActiveCfg = Release|x64 {C2E01551-B636-4324-8461-71811DF6FBB5}.Release|x64.Build.0 = Release|x64 - {C2E01551-B636-4324-8461-71811DF6FBB5}.Release|Xbox 360.ActiveCfg = Release|Win32 {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|ORBIS.ActiveCfg = Debug|Win32 {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|Win32.ActiveCfg = Debug|Win32 {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|x64.ActiveCfg = Debug|x64 {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|x64.Build.0 = Debug|x64 - {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|ORBIS.ActiveCfg = Release|Win32 {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|Win32.ActiveCfg = Release|Win32 {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|Win32.Build.0 = Release|Win32 {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|x64.ActiveCfg = Release|x64 {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|x64.Build.0 = Release|x64 - {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|Xbox 360.ActiveCfg = Release|Win32 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|ORBIS.ActiveCfg = Debug|Win32 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Win32.ActiveCfg = Debug|Win32 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|x64.ActiveCfg = Debug|x64 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|x64.Build.0 = Debug|x64 - {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|ORBIS.ActiveCfg = Release|Win32 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Win32.ActiveCfg = Release|Win32 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Win32.Build.0 = Release|Win32 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|x64.ActiveCfg = Release|x64 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|x64.Build.0 = Release|x64 - {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Xbox 360.ActiveCfg = Release|Win32 {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|ORBIS.ActiveCfg = Debug|Win32 {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Win32.ActiveCfg = Debug|Win32 {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|x64.ActiveCfg = Debug|x64 {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|x64.Build.0 = Debug|x64 - {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|ORBIS.ActiveCfg = Release|Win32 {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Win32.ActiveCfg = Release|Win32 {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Win32.Build.0 = Release|Win32 {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|x64.ActiveCfg = Release|x64 {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|x64.Build.0 = Release|x64 - {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Xbox 360.ActiveCfg = Release|Win32 {FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Debug|ORBIS.ActiveCfg = Debug|Win32 {FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Debug|Win32.ActiveCfg = Debug|Win32 {FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Debug|x64.ActiveCfg = Debug|x64 {FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Debug|x64.Build.0 = Debug|x64 - {FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Release|ORBIS.ActiveCfg = Release|Win32 {FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Release|Win32.ActiveCfg = Release|Win32 {FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Release|Win32.Build.0 = Release|Win32 {FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Release|x64.ActiveCfg = Release|x64 {FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Release|x64.Build.0 = Release|x64 - {FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Release|Xbox 360.ActiveCfg = Release|Win32 {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|ORBIS.ActiveCfg = Debug|Win32 {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|Win32.ActiveCfg = Debug|Win32 {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|Win32.Build.0 = Debug|Win32 {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|x64.ActiveCfg = Debug|x64 {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|x64.Build.0 = Debug|x64 - {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|ORBIS.ActiveCfg = Release|Win32 {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|Win32.ActiveCfg = Release|Win32 {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|Win32.Build.0 = Release|Win32 {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|x64.ActiveCfg = Release|x64 {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|x64.Build.0 = Release|x64 - {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|Xbox 360.ActiveCfg = Release|Win32 {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Debug|ORBIS.ActiveCfg = Debug|Win32 {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Debug|Win32.ActiveCfg = Debug|Win32 {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Debug|x64.ActiveCfg = Debug|x64 {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Debug|x64.Build.0 = Debug|x64 - {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|ORBIS.ActiveCfg = Release|Win32 {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|Win32.ActiveCfg = Release|Win32 {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|Win32.Build.0 = Release|Win32 {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|x64.ActiveCfg = Release|x64 {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|x64.Build.0 = Release|x64 - {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|Xbox 360.ActiveCfg = Release|Win32 {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|ORBIS.ActiveCfg = Debug|Win32 {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|Win32.ActiveCfg = Debug|Win32 {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|x64.ActiveCfg = Debug|x64 {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|x64.Build.0 = Debug|x64 - {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|ORBIS.ActiveCfg = Release|Win32 {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|Win32.ActiveCfg = Release|Win32 {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|Win32.Build.0 = Release|Win32 {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|x64.ActiveCfg = Release|x64 {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|x64.Build.0 = Release|x64 - {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|Xbox 360.ActiveCfg = Release|Win32 {6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Debug|ORBIS.ActiveCfg = Debug|Win32 {6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Debug|Win32.ActiveCfg = Debug|Win32 {6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Debug|x64.ActiveCfg = Debug|x64 {6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Debug|x64.Build.0 = Debug|x64 - {6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Release|ORBIS.ActiveCfg = Release|Win32 {6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Release|Win32.ActiveCfg = Release|Win32 {6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Release|Win32.Build.0 = Release|Win32 {6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Release|x64.ActiveCfg = Release|x64 {6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Release|x64.Build.0 = Release|x64 - {6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Release|Xbox 360.ActiveCfg = Release|Win32 {AA376B9B-484B-4DC4-982F-6CFA645E441E}.Debug|ORBIS.ActiveCfg = Debug|Win32 {AA376B9B-484B-4DC4-982F-6CFA645E441E}.Debug|Win32.ActiveCfg = Debug|Win32 {AA376B9B-484B-4DC4-982F-6CFA645E441E}.Debug|x64.ActiveCfg = Debug|x64 {AA376B9B-484B-4DC4-982F-6CFA645E441E}.Debug|x64.Build.0 = Debug|x64 - {AA376B9B-484B-4DC4-982F-6CFA645E441E}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {AA376B9B-484B-4DC4-982F-6CFA645E441E}.Release|ORBIS.ActiveCfg = Release|Win32 {AA376B9B-484B-4DC4-982F-6CFA645E441E}.Release|Win32.ActiveCfg = Release|Win32 {AA376B9B-484B-4DC4-982F-6CFA645E441E}.Release|Win32.Build.0 = Release|Win32 {AA376B9B-484B-4DC4-982F-6CFA645E441E}.Release|x64.ActiveCfg = Release|x64 {AA376B9B-484B-4DC4-982F-6CFA645E441E}.Release|x64.Build.0 = Release|x64 - {AA376B9B-484B-4DC4-982F-6CFA645E441E}.Release|Xbox 360.ActiveCfg = Release|Win32 {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|ORBIS.ActiveCfg = Debug|Win32 {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|Win32.ActiveCfg = Debug|Win32 {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|x64.ActiveCfg = Debug|x64 {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|x64.Build.0 = Debug|x64 - {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|ORBIS.ActiveCfg = Release|Win32 {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|Win32.ActiveCfg = Release|Win32 {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|Win32.Build.0 = Release|Win32 {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|x64.ActiveCfg = Release|x64 {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|x64.Build.0 = Release|x64 - {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|Xbox 360.ActiveCfg = Release|Win32 {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|ORBIS.ActiveCfg = Debug|Win32 {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|Win32.ActiveCfg = Debug|Win32 {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|x64.ActiveCfg = Debug|x64 {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|x64.Build.0 = Debug|x64 - {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|ORBIS.ActiveCfg = Release|Win32 {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|Win32.ActiveCfg = Release|Win32 {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|Win32.Build.0 = Release|Win32 {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|x64.ActiveCfg = Release|x64 {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|x64.Build.0 = Release|x64 - {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|Xbox 360.ActiveCfg = Release|Win32 {52493826-AC00-470B-A745-4F602529B3B0}.Debug|ORBIS.ActiveCfg = Debug|Win32 {52493826-AC00-470B-A745-4F602529B3B0}.Debug|Win32.ActiveCfg = Debug|Win32 {52493826-AC00-470B-A745-4F602529B3B0}.Debug|x64.ActiveCfg = Debug|x64 {52493826-AC00-470B-A745-4F602529B3B0}.Debug|x64.Build.0 = Debug|x64 - {52493826-AC00-470B-A745-4F602529B3B0}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {52493826-AC00-470B-A745-4F602529B3B0}.Release|ORBIS.ActiveCfg = Release|Win32 {52493826-AC00-470B-A745-4F602529B3B0}.Release|Win32.ActiveCfg = Release|Win32 {52493826-AC00-470B-A745-4F602529B3B0}.Release|Win32.Build.0 = Release|Win32 {52493826-AC00-470B-A745-4F602529B3B0}.Release|x64.ActiveCfg = Release|x64 {52493826-AC00-470B-A745-4F602529B3B0}.Release|x64.Build.0 = Release|x64 - {52493826-AC00-470B-A745-4F602529B3B0}.Release|Xbox 360.ActiveCfg = Release|Win32 {9F291982-8C81-4105-BF39-16844648E55F}.Debug|ORBIS.ActiveCfg = Debug|Win32 {9F291982-8C81-4105-BF39-16844648E55F}.Debug|Win32.ActiveCfg = Debug|Win32 {9F291982-8C81-4105-BF39-16844648E55F}.Debug|x64.ActiveCfg = Debug|x64 {9F291982-8C81-4105-BF39-16844648E55F}.Debug|x64.Build.0 = Debug|x64 - {9F291982-8C81-4105-BF39-16844648E55F}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {9F291982-8C81-4105-BF39-16844648E55F}.Release|ORBIS.ActiveCfg = Release|Win32 {9F291982-8C81-4105-BF39-16844648E55F}.Release|Win32.ActiveCfg = Release|Win32 {9F291982-8C81-4105-BF39-16844648E55F}.Release|Win32.Build.0 = Release|Win32 {9F291982-8C81-4105-BF39-16844648E55F}.Release|x64.ActiveCfg = Release|x64 {9F291982-8C81-4105-BF39-16844648E55F}.Release|x64.Build.0 = Release|x64 - {9F291982-8C81-4105-BF39-16844648E55F}.Release|Xbox 360.ActiveCfg = Release|Win32 {950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Debug|ORBIS.ActiveCfg = Debug|Win32 {950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Debug|Win32.ActiveCfg = Debug|Win32 {950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Debug|Win32.Build.0 = Debug|Win32 {950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Debug|x64.ActiveCfg = Debug|x64 {950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Debug|x64.Build.0 = Debug|x64 - {950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Release|ORBIS.ActiveCfg = Release|Win32 {950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Release|Win32.ActiveCfg = Release|Win32 {950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Release|Win32.Build.0 = Release|Win32 {950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Release|x64.ActiveCfg = Release|x64 {950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Release|x64.Build.0 = Release|x64 - {950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Release|Xbox 360.ActiveCfg = Release|Win32 {5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Debug|ORBIS.ActiveCfg = Debug|Win32 {5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Debug|Win32.ActiveCfg = Debug|Win32 {5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Debug|x64.ActiveCfg = Debug|x64 {5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Debug|x64.Build.0 = Debug|x64 - {5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Release|ORBIS.ActiveCfg = Release|Win32 {5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Release|Win32.ActiveCfg = Release|Win32 {5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Release|Win32.Build.0 = Release|Win32 {5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Release|x64.ActiveCfg = Release|x64 {5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Release|x64.Build.0 = Release|x64 - {5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Release|Xbox 360.ActiveCfg = Release|Win32 {C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|ORBIS.ActiveCfg = Debug|ORBIS {C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|ORBIS.Build.0 = Debug|ORBIS {C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -639,9 +551,6 @@ Global {C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|x64.ActiveCfg = Debug|x64 {C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|x64.Build.0 = Debug|x64 {C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|x64.Deploy.0 = Debug|x64 - {C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 - {C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 - {C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 {C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|ORBIS.ActiveCfg = Release|ORBIS {C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|ORBIS.Build.0 = Release|ORBIS {C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|Win32.ActiveCfg = Release|Win32 @@ -650,45 +559,36 @@ Global {C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|x64.ActiveCfg = Release|x64 {C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|x64.Build.0 = Release|x64 {C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|x64.Deploy.0 = Release|x64 - {C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 - {C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|Xbox 360.Build.0 = Release|Xbox 360 - {C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 {EE203B88-44CF-4829-9D42-7A5F43FECB52}.Debug|ORBIS.ActiveCfg = Debug|Win32 {EE203B88-44CF-4829-9D42-7A5F43FECB52}.Debug|Win32.ActiveCfg = Debug|Win32 {EE203B88-44CF-4829-9D42-7A5F43FECB52}.Debug|Win32.Build.0 = Debug|Win32 {EE203B88-44CF-4829-9D42-7A5F43FECB52}.Debug|x64.ActiveCfg = Debug|x64 {EE203B88-44CF-4829-9D42-7A5F43FECB52}.Debug|x64.Build.0 = Debug|x64 - {EE203B88-44CF-4829-9D42-7A5F43FECB52}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {EE203B88-44CF-4829-9D42-7A5F43FECB52}.Release|ORBIS.ActiveCfg = Release|Win32 {EE203B88-44CF-4829-9D42-7A5F43FECB52}.Release|Win32.ActiveCfg = Release|Win32 {EE203B88-44CF-4829-9D42-7A5F43FECB52}.Release|Win32.Build.0 = Release|Win32 {EE203B88-44CF-4829-9D42-7A5F43FECB52}.Release|x64.ActiveCfg = Release|x64 {EE203B88-44CF-4829-9D42-7A5F43FECB52}.Release|x64.Build.0 = Release|x64 - {EE203B88-44CF-4829-9D42-7A5F43FECB52}.Release|Xbox 360.ActiveCfg = Release|Win32 {7422B977-CA61-49BF-A586-F57B6FF9BD64}.Debug|ORBIS.ActiveCfg = Debug|Win32 {7422B977-CA61-49BF-A586-F57B6FF9BD64}.Debug|Win32.ActiveCfg = Debug|Win32 {7422B977-CA61-49BF-A586-F57B6FF9BD64}.Debug|Win32.Build.0 = Debug|Win32 {7422B977-CA61-49BF-A586-F57B6FF9BD64}.Debug|x64.ActiveCfg = Debug|x64 {7422B977-CA61-49BF-A586-F57B6FF9BD64}.Debug|x64.Build.0 = Debug|x64 - {7422B977-CA61-49BF-A586-F57B6FF9BD64}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {7422B977-CA61-49BF-A586-F57B6FF9BD64}.Release|ORBIS.ActiveCfg = Release|Win32 {7422B977-CA61-49BF-A586-F57B6FF9BD64}.Release|Win32.ActiveCfg = Release|Win32 {7422B977-CA61-49BF-A586-F57B6FF9BD64}.Release|Win32.Build.0 = Release|Win32 {7422B977-CA61-49BF-A586-F57B6FF9BD64}.Release|x64.ActiveCfg = Release|x64 {7422B977-CA61-49BF-A586-F57B6FF9BD64}.Release|x64.Build.0 = Release|x64 - {7422B977-CA61-49BF-A586-F57B6FF9BD64}.Release|Xbox 360.ActiveCfg = Release|Win32 {DB344310-4938-4294-AEE2-18512454585D}.Debug|ORBIS.ActiveCfg = Debug|Win32 {DB344310-4938-4294-AEE2-18512454585D}.Debug|Win32.ActiveCfg = Debug|Win32 {DB344310-4938-4294-AEE2-18512454585D}.Debug|Win32.Build.0 = Debug|Win32 {DB344310-4938-4294-AEE2-18512454585D}.Debug|x64.ActiveCfg = Debug|x64 {DB344310-4938-4294-AEE2-18512454585D}.Debug|x64.Build.0 = Debug|x64 - {DB344310-4938-4294-AEE2-18512454585D}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {DB344310-4938-4294-AEE2-18512454585D}.Release|ORBIS.ActiveCfg = Release|Win32 {DB344310-4938-4294-AEE2-18512454585D}.Release|Win32.ActiveCfg = Release|Win32 {DB344310-4938-4294-AEE2-18512454585D}.Release|Win32.Build.0 = Release|Win32 {DB344310-4938-4294-AEE2-18512454585D}.Release|x64.ActiveCfg = Release|x64 {DB344310-4938-4294-AEE2-18512454585D}.Release|x64.Build.0 = Release|x64 - {DB344310-4938-4294-AEE2-18512454585D}.Release|Xbox 360.ActiveCfg = Release|Win32 {FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Debug|ORBIS.ActiveCfg = Debug|Win32 {FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Debug|Win32.ActiveCfg = Debug|Win32 {FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Debug|Win32.Build.0 = Debug|Win32 @@ -696,7 +596,6 @@ Global {FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Debug|x64.ActiveCfg = Debug|x64 {FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Debug|x64.Build.0 = Debug|x64 {FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Debug|x64.Deploy.0 = Debug|x64 - {FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|ORBIS.ActiveCfg = Release|Win32 {FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|Win32.ActiveCfg = Release|Win32 {FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|Win32.Build.0 = Release|Win32 @@ -704,115 +603,90 @@ Global {FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|x64.ActiveCfg = Release|x64 {FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|x64.Build.0 = Release|x64 {FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|x64.Deploy.0 = Release|x64 - {FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|Xbox 360.ActiveCfg = Release|Win32 {EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Debug|ORBIS.ActiveCfg = Debug|Win32 {EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Debug|Win32.ActiveCfg = Debug|Win32 {EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Debug|Win32.Build.0 = Debug|Win32 {EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Debug|x64.ActiveCfg = Debug|x64 {EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Debug|x64.Build.0 = Debug|x64 - {EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Release|ORBIS.ActiveCfg = Release|Win32 {EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Release|Win32.ActiveCfg = Release|Win32 {EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Release|Win32.Build.0 = Release|Win32 {EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Release|x64.ActiveCfg = Release|x64 {EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Release|x64.Build.0 = Release|x64 - {EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Release|Xbox 360.ActiveCfg = Release|Win32 {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|ORBIS.ActiveCfg = Debug|Win32 {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|Win32.ActiveCfg = Debug|Win32 {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|Win32.Build.0 = Debug|Win32 {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|x64.ActiveCfg = Debug|x64 {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|x64.Build.0 = Debug|x64 - {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|ORBIS.ActiveCfg = Release|Win32 {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|Win32.ActiveCfg = Release|Win32 {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|Win32.Build.0 = Release|Win32 {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|x64.ActiveCfg = Release|x64 {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|x64.Build.0 = Release|x64 - {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|Xbox 360.ActiveCfg = Release|Win32 {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|ORBIS.ActiveCfg = Debug|Win32 {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|Win32.ActiveCfg = Debug|Win32 {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|Win32.Build.0 = Debug|Win32 {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|x64.ActiveCfg = Debug|x64 {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|x64.Build.0 = Debug|x64 - {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|ORBIS.ActiveCfg = Release|Win32 {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|Win32.ActiveCfg = Release|Win32 {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|Win32.Build.0 = Release|Win32 {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|x64.ActiveCfg = Release|x64 {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|x64.Build.0 = Release|x64 - {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|Xbox 360.ActiveCfg = Release|Win32 {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Debug|ORBIS.ActiveCfg = Debug|Win32 {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Debug|Win32.ActiveCfg = Debug|Win32 {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Debug|Win32.Build.0 = Debug|Win32 {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Debug|x64.ActiveCfg = Debug|x64 {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Debug|x64.Build.0 = Debug|x64 - {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Release|ORBIS.ActiveCfg = Release|Win32 {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Release|Win32.ActiveCfg = Release|Win32 {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Release|Win32.Build.0 = Release|Win32 {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Release|x64.ActiveCfg = Release|x64 {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Release|x64.Build.0 = Release|x64 - {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Release|Xbox 360.ActiveCfg = Release|Win32 {81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|ORBIS.ActiveCfg = Debug|Win32 {81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|Win32.ActiveCfg = Debug|Win32 {81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|Win32.Build.0 = Debug|Win32 {81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|x64.ActiveCfg = Debug|x64 {81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|x64.Build.0 = Debug|x64 - {81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|ORBIS.ActiveCfg = Release|Win32 {81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|Win32.ActiveCfg = Release|Win32 {81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|Win32.Build.0 = Release|Win32 {81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|x64.ActiveCfg = Release|x64 {81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|x64.Build.0 = Release|x64 - {81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|Xbox 360.ActiveCfg = Release|Win32 {B9A255A0-2B92-4801-AF6C-354535A6E105}.Debug|ORBIS.ActiveCfg = Debug|Win32 {B9A255A0-2B92-4801-AF6C-354535A6E105}.Debug|Win32.ActiveCfg = Debug|Win32 {B9A255A0-2B92-4801-AF6C-354535A6E105}.Debug|Win32.Build.0 = Debug|Win32 {B9A255A0-2B92-4801-AF6C-354535A6E105}.Debug|x64.ActiveCfg = Debug|x64 {B9A255A0-2B92-4801-AF6C-354535A6E105}.Debug|x64.Build.0 = Debug|x64 - {B9A255A0-2B92-4801-AF6C-354535A6E105}.Debug|Xbox 360.ActiveCfg = Debug|Win32 {B9A255A0-2B92-4801-AF6C-354535A6E105}.Release|ORBIS.ActiveCfg = Release|Win32 {B9A255A0-2B92-4801-AF6C-354535A6E105}.Release|Win32.ActiveCfg = Release|Win32 {B9A255A0-2B92-4801-AF6C-354535A6E105}.Release|Win32.Build.0 = Release|Win32 {B9A255A0-2B92-4801-AF6C-354535A6E105}.Release|x64.ActiveCfg = Release|x64 {B9A255A0-2B92-4801-AF6C-354535A6E105}.Release|x64.Build.0 = Release|x64 - {B9A255A0-2B92-4801-AF6C-354535A6E105}.Release|Xbox 360.ActiveCfg = Release|Win32 {775B46F7-03C4-4351-B78D-76088E028D14}.Debug|ORBIS.ActiveCfg = Debug|ORBIS {775B46F7-03C4-4351-B78D-76088E028D14}.Debug|ORBIS.Build.0 = Debug|ORBIS {775B46F7-03C4-4351-B78D-76088E028D14}.Debug|Win32.ActiveCfg = Debug|Win32 {775B46F7-03C4-4351-B78D-76088E028D14}.Debug|Win32.Build.0 = Debug|Win32 {775B46F7-03C4-4351-B78D-76088E028D14}.Debug|x64.ActiveCfg = Debug|x64 {775B46F7-03C4-4351-B78D-76088E028D14}.Debug|x64.Build.0 = Debug|x64 - {775B46F7-03C4-4351-B78D-76088E028D14}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 - {775B46F7-03C4-4351-B78D-76088E028D14}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 - {775B46F7-03C4-4351-B78D-76088E028D14}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 {775B46F7-03C4-4351-B78D-76088E028D14}.Release|ORBIS.ActiveCfg = Release|ORBIS {775B46F7-03C4-4351-B78D-76088E028D14}.Release|ORBIS.Build.0 = Release|ORBIS {775B46F7-03C4-4351-B78D-76088E028D14}.Release|Win32.ActiveCfg = Release|Win32 {775B46F7-03C4-4351-B78D-76088E028D14}.Release|Win32.Build.0 = Release|Win32 {775B46F7-03C4-4351-B78D-76088E028D14}.Release|x64.ActiveCfg = Release|x64 {775B46F7-03C4-4351-B78D-76088E028D14}.Release|x64.Build.0 = Release|x64 - {775B46F7-03C4-4351-B78D-76088E028D14}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 - {775B46F7-03C4-4351-B78D-76088E028D14}.Release|Xbox 360.Build.0 = Release|Xbox 360 - {775B46F7-03C4-4351-B78D-76088E028D14}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Debug|ORBIS.ActiveCfg = Debug|ORBIS {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Debug|ORBIS.Build.0 = Debug|ORBIS {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Debug|Win32.ActiveCfg = Debug|Win32 {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Debug|Win32.Build.0 = Debug|Win32 {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Debug|x64.ActiveCfg = Debug|x64 {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Debug|x64.Build.0 = Debug|x64 - {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 - {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 - {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Release|ORBIS.ActiveCfg = Release|ORBIS {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Release|ORBIS.Build.0 = Release|ORBIS {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Release|Win32.ActiveCfg = Release|Win32 {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Release|Win32.Build.0 = Release|Win32 {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Release|x64.ActiveCfg = Release|x64 {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Release|x64.Build.0 = Release|x64 - {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 - {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Release|Xbox 360.Build.0 = Release|Xbox 360 - {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/msbuild/lol.rules.props b/build/msbuild/lol.rules.props index 6d416a98..a2da6bd5 100644 --- a/build/msbuild/lol.rules.props +++ b/build/msbuild/lol.rules.props @@ -29,15 +29,12 @@ WIN32;$(Win32Defines);%(PreprocessorDefinitions) WIN32;$(Win32Defines);%(PreprocessorDefinitions) - _XBOX;$(XboxDefines);%(PreprocessorDefinitions) $(OrbisDefines);%(PreprocessorDefinitions) - false true Disabled MultiThreadedDebugDLL - MultiThreadedDebug _DEBUG;LOL_DEBUG;%(PreprocessorDefinitions) @@ -48,7 +45,6 @@ Level2 MultiThreadedDLL - MultiThreaded true true Speed @@ -69,8 +65,6 @@ $(D3d9Libs);%(AdditionalLibraryDirectories) $(XinputLibs);%(AdditionalLibraryDirectories) %(AdditionalLibraryDirectories) - xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;%(AdditionalDependencies) - xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies) $(OrbisLibs);%(AdditionalLibraryDirectories) $(OrbisDeps);%(AdditionalDependencies) @@ -100,10 +94,5 @@ - - - CopyToHardDrive - - diff --git a/build/msbuild/lol.vars.props b/build/msbuild/lol.vars.props index bdc6007e..753710f2 100644 --- a/build/msbuild/lol.vars.props +++ b/build/msbuild/lol.vars.props @@ -100,9 +100,6 @@ HAVE_STDIO_H; $(OrbisDefines) - - $(XboxDefines) - @@ -154,7 +151,6 @@ $(XinputLibs) $(XinputDeps) $(Win32Defines) - $(XboxDefines) $(OrbisDeps) $(OrbisLibs) $(OrbisDefines) diff --git a/build/run-bitten.sh b/build/run-bitten.sh index a03cae04..24de5862 100755 --- a/build/run-bitten.sh +++ b/build/run-bitten.sh @@ -150,17 +150,6 @@ if [ -d "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/ fi append "" -# -# Xbox development kit -# - -append "[xdk]" -if [ -n "$XEDK" ]; then - # FIXME: we don't know how to check the version - append "version = 2.0.20675.0" -fi -append "" - # # mingw32 / mingw-w64 # diff --git a/doc/samples/benchsuite.vcxproj b/doc/samples/benchsuite.vcxproj index 6b1c10ea..d669166c 100644 --- a/doc/samples/benchsuite.vcxproj +++ b/doc/samples/benchsuite.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - diff --git a/doc/samples/btphystest.vcxproj b/doc/samples/btphystest.vcxproj index 185271fd..08379e83 100644 --- a/doc/samples/btphystest.vcxproj +++ b/doc/samples/btphystest.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - diff --git a/doc/samples/meshviewer/meshviewer.vcxproj b/doc/samples/meshviewer/meshviewer.vcxproj index bf1d1c4b..0dd5c884 100644 --- a/doc/samples/meshviewer/meshviewer.vcxproj +++ b/doc/samples/meshviewer/meshviewer.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - @@ -129,4 +121,4 @@ - \ No newline at end of file + diff --git a/doc/samples/nacl_phystest.vcxproj b/doc/samples/nacl_phystest.vcxproj index fcfd05be..65fe24cb 100644 --- a/doc/samples/nacl_phystest.vcxproj +++ b/doc/samples/nacl_phystest.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - diff --git a/doc/tutorial/01_triangle.vcxproj b/doc/tutorial/01_triangle.vcxproj index 0d5e5247..5059d5b8 100644 --- a/doc/tutorial/01_triangle.vcxproj +++ b/doc/tutorial/01_triangle.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - diff --git a/doc/tutorial/02_cube.vcxproj b/doc/tutorial/02_cube.vcxproj index 0d26ea0d..23bee158 100644 --- a/doc/tutorial/02_cube.vcxproj +++ b/doc/tutorial/02_cube.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - diff --git a/doc/tutorial/03_noise.vcxproj b/doc/tutorial/03_noise.vcxproj index dea9730d..dd991e68 100644 --- a/doc/tutorial/03_noise.vcxproj +++ b/doc/tutorial/03_noise.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - diff --git a/doc/tutorial/04_texture.vcxproj b/doc/tutorial/04_texture.vcxproj index d3fa4907..3dc9cffb 100644 --- a/doc/tutorial/04_texture.vcxproj +++ b/doc/tutorial/04_texture.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - diff --git a/doc/tutorial/05_easymesh.vcxproj b/doc/tutorial/05_easymesh.vcxproj index 5e9576bd..56f51aee 100644 --- a/doc/tutorial/05_easymesh.vcxproj +++ b/doc/tutorial/05_easymesh.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - @@ -73,4 +65,4 @@ - \ No newline at end of file + diff --git a/doc/tutorial/06_sprite.vcxproj b/doc/tutorial/06_sprite.vcxproj index ba7f8acc..700d7859 100644 --- a/doc/tutorial/06_sprite.vcxproj +++ b/doc/tutorial/06_sprite.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - diff --git a/doc/tutorial/07_input.vcxproj b/doc/tutorial/07_input.vcxproj index 469f9185..a32b22cc 100644 --- a/doc/tutorial/07_input.vcxproj +++ b/doc/tutorial/07_input.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - diff --git a/doc/tutorial/08_fbo.cpp b/doc/tutorial/08_fbo.cpp index 00dbdf48..8d83a80c 100644 --- a/doc/tutorial/08_fbo.cpp +++ b/doc/tutorial/08_fbo.cpp @@ -96,18 +96,6 @@ public: m_fbo->Bind(); m_shader->Bind(); -#if _XBOX - /* FIXME: the Xbox enforces full EDRAM clears on each frame, so - * we cannot expect the render target contents to be preserved. - * This code snippet should be moved inside the Framebuffer class. */ - m_shader->SetUniform(m_uni_flag, 1.f); - m_shader->SetUniform(m_uni_texture, m_fbo->GetTextureUniform(), 0); - m_vdecl->SetStream(m_vbo, m_coord); - m_vdecl->Bind(); - m_vdecl->DrawElements(MeshPrimitive::Triangles, 0, 6); - m_vdecl->Unbind(); -#endif - m_shader->SetUniform(m_uni_flag, 0.f); m_shader->SetUniform(m_uni_point, m_hotspot); m_shader->SetUniform(m_uni_color, m_color); diff --git a/doc/tutorial/08_fbo.vcxproj b/doc/tutorial/08_fbo.vcxproj index 5673e913..cbf8604e 100644 --- a/doc/tutorial/08_fbo.vcxproj +++ b/doc/tutorial/08_fbo.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - diff --git a/doc/tutorial/11_fractal.cpp b/doc/tutorial/11_fractal.cpp index fe0dffd8..13e4cc16 100644 --- a/doc/tutorial/11_fractal.cpp +++ b/doc/tutorial/11_fractal.cpp @@ -63,15 +63,8 @@ public: m_deltascale[i] = real("1"); m_dirty[i] = 2; } -#if defined _XBOX - //m_center = rcmplx(-.22815528839841, -1.11514249704382); - //m_center = rcmplx(0.001643721971153, 0.822467633298876); - m_center = rcmplx("-0.65823419062254", "0.50221777363480"); - m_zoom_speed = -0.025; -#else m_center = rcmplx(-0.75, 0.0); m_zoom_speed = 0.0; -#endif m_translate = rcmplx(0.0, 0.0); m_radius = 5.0; m_ready = false; @@ -96,9 +89,7 @@ public: uint8_t red = (uint8_t)r * 256; uint8_t green = (uint8_t)g * 256; uint8_t blue = (uint8_t)b * 256; -#if defined _XBOX - m_palette.push(u8vec4(255, red, green, blue)); -#elif defined __native_client__ +#if defined __native_client__ m_palette.push(u8vec4(red, green, blue, 255)); #else m_palette.push(u8vec4(blue, green, red, 255)); @@ -182,7 +173,6 @@ public: uint32_t buttons = 0; //uint32_t buttons = Input::GetMouseButtons(); -#if !defined _XBOX if (buttons & 0x2) { if (!m_drag) @@ -224,7 +214,6 @@ public: if (lol::abs(m_zoom_speed) < 1e-5 || m_drag) m_zoom_speed = 0.0; } -#endif if (m_zoom_speed || m_translate != rcmplx(0.0, 0.0)) { @@ -242,12 +231,10 @@ public: zoom = 1e-14 / m_radius; } m_radius *= zoom; -#if !defined _XBOX m_center += m_translate; m_center = (m_center - worldmouse) * real(zoom) + worldmouse; worldmouse = m_center + rcmplx(ScreenToWorldOffset((vec2)mousepos)); -#endif /* Store the transformation properties to go from m_frame - 1 * to m_frame. */ @@ -421,11 +408,7 @@ public: } else { -#if defined _XBOX - *m_pixelstart++ = u8vec4(255, 0, 0, 0); -#else *m_pixelstart++ = u8vec4(0, 0, 0, 255); -#endif } } } diff --git a/doc/tutorial/11_fractal.vcxproj b/doc/tutorial/11_fractal.vcxproj index f1e7b637..cd57b5cb 100644 --- a/doc/tutorial/11_fractal.vcxproj +++ b/doc/tutorial/11_fractal.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - diff --git a/doc/tutorial/12_voronoi.cpp b/doc/tutorial/12_voronoi.cpp index 4eb29365..a16cf387 100644 --- a/doc/tutorial/12_voronoi.cpp +++ b/doc/tutorial/12_voronoi.cpp @@ -339,19 +339,6 @@ public: Renderer::Get()->Clear(ClearMask::Depth); shader->Bind(); - //08_FBO ?? - #if _XBOX - /* FIXME: the Xbox enforces full EDRAM clears on each frame, so - * we cannot expect the render target contents to be preserved. - * This code snippet should be moved inside the Framebuffer class. */ - //m_fbos[m_cur_fbo].m2->SetUniform(m_uni_flag, 1.f); - //m_fbos[m_cur_fbo].m2->SetUniform(m_uni_texture, m_fbo->GetTextureUniform(), 0); - //m_vdecl->SetStream(m_vbo, m_fbos[m_cur_fbo].m4.last()); - //m_vdecl->Bind(); - //m_vdecl->DrawElements(MeshPrimitive::Triangles, 0, 6); - //m_vdecl->Unbind(); - #endif - int i = 0; if (curres == ivec2::zero) m_screen_shader->SetUniform(m_screen_texture, src_buf->GetTextureUniform(), 0); diff --git a/doc/tutorial/12_voronoi.vcxproj b/doc/tutorial/12_voronoi.vcxproj index b8062a19..4050a338 100644 --- a/doc/tutorial/12_voronoi.vcxproj +++ b/doc/tutorial/12_voronoi.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - diff --git a/doc/tutorial/13_shader_builder.vcxproj b/doc/tutorial/13_shader_builder.vcxproj index 74adb466..a8ea22cd 100644 --- a/doc/tutorial/13_shader_builder.vcxproj +++ b/doc/tutorial/13_shader_builder.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - diff --git a/doc/tutorial/14_lol_lua.vcxproj b/doc/tutorial/14_lol_lua.vcxproj index b94d91d9..484991c8 100644 --- a/doc/tutorial/14_lol_lua.vcxproj +++ b/doc/tutorial/14_lol_lua.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - @@ -73,4 +65,4 @@ - \ No newline at end of file + diff --git a/src/application/application.cpp b/src/application/application.cpp index 1c48e029..96dad561 100644 --- a/src/application/application.cpp +++ b/src/application/application.cpp @@ -16,9 +16,7 @@ #include "lolgl.h" -#if _XBOX -# include "platform/xbox/xboxapp.h" -#elif __native_client__ +#if __native_client__ # include "platform/nacl/nacl-app.h" #elif __ANDROID__ # include "platform/android/androidapp.h" @@ -59,9 +57,7 @@ protected: display.Disable(); } -#if _XBOX - //NOT HANDLED YET -#elif __native_client__ +#if __native_client__ //NOT HANDLED YET #elif __ANDROID__ //NOT HANDLED YET @@ -121,9 +117,7 @@ class ApplicationData : app(name, resolution, framerate) { } -#if _XBOX - XboxApp app; -#elif __native_client__ +#if __native_client__ NaClApp app; #elif __ANDROID__ AndroidApp app; diff --git a/src/bullet/lolbullet.vcxproj b/src/bullet/lolbullet.vcxproj index bfe24a73..89b5b2aa 100644 --- a/src/bullet/lolbullet.vcxproj +++ b/src/bullet/lolbullet.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - {83D3B207-C601-4025-8F41-01DEDC354661} diff --git a/src/camera.cpp b/src/camera.cpp index 69e489c1..5dd5a507 100644 --- a/src/camera.cpp +++ b/src/camera.cpp @@ -16,7 +16,7 @@ #include #include -#if defined _WIN32 || defined _XBOX +#if defined _WIN32 # define strcasecmp _stricmp # undef near # undef far diff --git a/src/dict.cpp b/src/dict.cpp index 4edd070b..c91655a7 100644 --- a/src/dict.cpp +++ b/src/dict.cpp @@ -15,7 +15,7 @@ #include #include -#if defined _WIN32 || defined _XBOX +#if defined _WIN32 # define strcasecmp _stricmp #endif diff --git a/src/easymesh/shiny.lolfx b/src/easymesh/shiny.lolfx index 3b071bc1..48eb41c0 100644 --- a/src/easymesh/shiny.lolfx +++ b/src/easymesh/shiny.lolfx @@ -150,11 +150,7 @@ void main(float3 in_Vertex : POSITION, pass_Vertex = eye; pass_TNormal = tnorm; -#ifdef _XBOX - pass_Color = in_Color.abgr; -#else pass_Color = in_Color; -#endif out_Position = mul(u_projection, eye); } diff --git a/src/easymesh/shiny_SK.lolfx b/src/easymesh/shiny_SK.lolfx index 2d663498..0806b13c 100644 --- a/src/easymesh/shiny_SK.lolfx +++ b/src/easymesh/shiny_SK.lolfx @@ -175,11 +175,7 @@ void main(float3 in_Vertex : POSITION, pass_Vertex = eye; pass_TNormal = tnorm; -#ifdef _XBOX - pass_Color = in_Color.abgr; -#else pass_Color = in_Color; -#endif out_Position = mul(u_projection, eye); } diff --git a/src/easymesh/shinydebugUV.lolfx b/src/easymesh/shinydebugUV.lolfx index df9cdf7c..233a56ef 100644 --- a/src/easymesh/shinydebugUV.lolfx +++ b/src/easymesh/shinydebugUV.lolfx @@ -109,11 +109,7 @@ void main(float3 in_Vertex : POSITION, pass_Vertex = eye; pass_TNormal = tnorm; -#ifdef _XBOX - pass_Color = in_Color.abgr; -#else pass_Color = in_Color; -#endif out_Position = mul(u_projection, eye); } diff --git a/src/easymesh/shinydebuglighting.lolfx b/src/easymesh/shinydebuglighting.lolfx index 7bedac4e..25d0c1a0 100644 --- a/src/easymesh/shinydebuglighting.lolfx +++ b/src/easymesh/shinydebuglighting.lolfx @@ -109,11 +109,7 @@ void main(float3 in_Vertex : POSITION, pass_Vertex = eye; pass_TNormal = tnorm; -#ifdef _XBOX - pass_Color = in_Color.abgr; -#else pass_Color = in_Color; -#endif out_Position = mul(u_projection, eye); } diff --git a/src/easymesh/shinydebugnormal.lolfx b/src/easymesh/shinydebugnormal.lolfx index eb48b944..a2be3df7 100644 --- a/src/easymesh/shinydebugnormal.lolfx +++ b/src/easymesh/shinydebugnormal.lolfx @@ -71,11 +71,7 @@ void main(float3 in_Vertex : POSITION, pass_Vertex = eye; pass_TNormal = tnorm; -#ifdef _XBOX - pass_Color = in_Color.abgr; -#else pass_Color = in_Color; -#endif out_Position = mul(u_projection, eye); } diff --git a/src/easymesh/shinydebugwireframe.lolfx b/src/easymesh/shinydebugwireframe.lolfx index 723b285c..5586710d 100644 --- a/src/easymesh/shinydebugwireframe.lolfx +++ b/src/easymesh/shinydebugwireframe.lolfx @@ -67,11 +67,7 @@ void main(float3 in_Vertex : POSITION, pass_Vertex = eye; pass_TNormal = tnorm; -#ifdef _XBOX - pass_Color = in_Color.abgr; -#else pass_Color = in_Color; -#endif out_Position = mul(u_projection, eye); } diff --git a/src/easymesh/shinyflat.lolfx b/src/easymesh/shinyflat.lolfx index ee5f1a65..8888fcee 100644 --- a/src/easymesh/shinyflat.lolfx +++ b/src/easymesh/shinyflat.lolfx @@ -153,11 +153,7 @@ void main(float3 in_Vertex : POSITION, pass_Vertex = eye; pass_TNormal = tnorm; -#ifdef _XBOX - pass_Color = in_Color.abgr; -#else pass_Color = in_Color; -#endif out_Position = mul(u_projection, eye); } diff --git a/src/gpu/framebuffer.cpp b/src/gpu/framebuffer.cpp index ef90e87b..a85002c5 100644 --- a/src/gpu/framebuffer.cpp +++ b/src/gpu/framebuffer.cpp @@ -16,10 +16,6 @@ # define FAR # define NEAR # include -#elif defined _XBOX -# include -# undef near /* Fuck Microsoft */ -# undef far /* Fuck Microsoft again */ #endif namespace lol @@ -42,10 +38,6 @@ class FramebufferData IDirect3DDevice9 *m_dev; IDirect3DTexture9 *m_texture; IDirect3DSurface9 *m_surface, *m_back_surface; -#elif defined _XBOX - D3DDevice *m_dev; - D3DTexture *m_texture; - D3DSurface *m_surface, *m_back_surface; #else GLuint m_fbo, m_texture, m_depth; #endif @@ -79,25 +71,6 @@ uint32_t FramebufferFormat::GetFormat() case RGBA_16_UI: return D3DFMT_A16B16G16R16; case RGBA_16_F: return D3DFMT_A16B16G16R16F; case RGBA_32_F: return D3DFMT_A32B32G32R32F; -#elif defined _XBOX - case R_16_F: return D3DFMT_R16F; - case R_32_F: return D3DFMT_R32F; - case RG_16: - case RG_16_I: - case RG_16_UI: return D3DFMT_G16R16; - case RG_16_F: return D3DFMT_G16R16F; - case RG_32_F: return D3DFMT_G32R32F; - case RGB_8: - case RGB_8_I: - case RGB_8_UI: return D3DFMT_X8R8G8B8; - case RGBA_8: - case RGBA_8_I: - case RGBA_8_UI: return D3DFMT_A8R8G8B8; - case RGBA_16: - case RGBA_16_I: - case RGBA_16_UI: return D3DFMT_A16B16G16R16; - case RGBA_16_F: return D3DFMT_A16B16G16R16F; - case RGBA_32_F: return D3DFMT_A32B32G32R32F; #elif defined HAVE_GLES_2X /* FIXME: incomplete */ case RGBA_8: @@ -230,7 +203,7 @@ uint32_t FramebufferFormat::GetFormatOrder() { switch (m_format) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 /* FIXME: not implemented at all */ #elif defined HAVE_GLES_2X /* FIXME: incomplete */ @@ -314,19 +287,6 @@ Framebuffer::Framebuffer(ivec2 size, FramebufferFormat fbo_format) Abort(); if (FAILED(m_data->m_texture->GetSurfaceLevel(0, &m_data->m_surface))) Abort(); -#elif defined _XBOX - m_data->m_dev = (D3DDevice *)Renderer::Get()->GetDevice(); - - if (FAILED(m_data->m_dev->CreateTexture(size.x, size.y, 1, 0, - (D3DFORMAT)fbo_format.GetFormat(), - D3DPOOL_DEFAULT, - &m_data->m_texture, nullptr))) - Abort(); - if (FAILED(m_data->m_dev->CreateRenderTarget(size.x, size.y, - (D3DFORMAT)fbo_format.GetFormat(), - D3DMULTISAMPLE_NONE, 0, 0, - &m_data->m_surface, nullptr))) - Abort(); #else # if GL_VERSION_1_1 GLenum internal_format = fbo_format.GetFormat(); @@ -404,7 +364,7 @@ Framebuffer::Framebuffer(ivec2 size, FramebufferFormat fbo_format) Framebuffer::~Framebuffer() { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 m_data->m_surface->Release(); m_data->m_texture->Release(); #else @@ -425,7 +385,7 @@ Framebuffer::~Framebuffer() TextureUniform Framebuffer::GetTextureUniform() const { TextureUniform ret; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 ret.m_flags = (uint64_t)(uintptr_t)m_data->m_texture; #else ret.m_flags = m_data->m_texture; @@ -442,7 +402,7 @@ Image Framebuffer::GetImage() const { Image ret(m_data->m_size); -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 /* TODO: implement D3D Framebuffer::GetImage() */ #else u8vec4 *buffer = ret.Lock(); @@ -458,7 +418,7 @@ void Framebuffer::Bind() { ASSERT(!m_data->m_bound, "trying to bind an already bound framebuffer"); -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 if (FAILED(m_data->m_dev->GetRenderTarget(0, &m_data->m_back_surface))) Abort(); if (FAILED(m_data->m_dev->SetRenderTarget(0, m_data->m_surface))) @@ -483,13 +443,7 @@ void Framebuffer::Unbind() { ASSERT(m_data->m_bound, "trying to unbind an unbound framebuffer"); -#if defined USE_D3D9 || defined _XBOX -# if defined _XBOX - if (FAILED(m_data->m_dev->Resolve(D3DRESOLVE_RENDERTARGET0, nullptr, - m_data->m_texture, nullptr, 0, 0, nullptr, - 0, 0, nullptr))) - Abort(); -# endif +#if defined USE_D3D9 if (FAILED(m_data->m_dev->SetRenderTarget(0, m_data->m_back_surface))) Abort(); m_data->m_back_surface->Release(); diff --git a/src/gpu/indexbuffer.cpp b/src/gpu/indexbuffer.cpp index d01b607d..a68fc166 100644 --- a/src/gpu/indexbuffer.cpp +++ b/src/gpu/indexbuffer.cpp @@ -16,10 +16,6 @@ # define FAR # define NEAR # include -#elif defined _XBOX -# include -# undef near /* Fuck Microsoft */ -# undef far /* Fuck Microsoft again */ #endif namespace lol @@ -39,9 +35,6 @@ class IndexBufferData #if defined USE_D3D9 IDirect3DDevice9 *m_dev; IDirect3DIndexBuffer9 *m_ibo; -#elif defined _XBOX - D3DDevice *m_dev; - D3DIndexBuffer *m_ibo; #else GLuint m_ibo; uint8_t *m_memory; @@ -59,13 +52,8 @@ IndexBuffer::IndexBuffer(size_t size) m_data->m_size = size; if (!size) return; -#if defined USE_D3D9 || defined _XBOX -# if defined USE_D3D9 +#if defined USE_D3D9 m_data->m_dev = (IDirect3DDevice9 *)Renderer::Get()->GetDevice(); -# elif defined _XBOX - m_data->m_dev = (D3DDevice *)Renderer::Get()->GetDevice(); -# endif - if (FAILED(m_data->m_dev->CreateIndexBuffer(size, D3DUSAGE_WRITEONLY, D3DFMT_INDEX16, D3DPOOL_MANAGED, &m_data->m_ibo, nullptr))) @@ -80,7 +68,7 @@ IndexBuffer::~IndexBuffer() { if (m_data->m_size) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 if (FAILED(m_data->m_ibo->Release())) Abort(); #else @@ -101,7 +89,7 @@ void *IndexBuffer::Lock(size_t offset, size_t size) if (!m_data->m_size) return nullptr; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 void *ret; if (FAILED(m_data->m_ibo->Lock(offset, size, (void **)&ret, 0))) Abort(); @@ -117,7 +105,7 @@ void IndexBuffer::Unlock() if (!m_data->m_size) return; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 if (FAILED(m_data->m_ibo->Unlock())) Abort(); #else @@ -132,7 +120,7 @@ void IndexBuffer::Bind() if (!m_data->m_size) return; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 if (FAILED(m_data->m_dev->SetIndices(m_data->m_ibo))) Abort(); #else @@ -148,7 +136,7 @@ void IndexBuffer::Unbind() if (!m_data->m_size) return; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 if (FAILED(m_data->m_dev->SetIndices(nullptr))) Abort(); #else diff --git a/src/gpu/palette.lolfx b/src/gpu/palette.lolfx index 665fcf26..02d4fa2e 100644 --- a/src/gpu/palette.lolfx +++ b/src/gpu/palette.lolfx @@ -50,11 +50,7 @@ void main(float4 in_Position : POSITION, out float2 out_TexCoord : TEXCOORD0, out float4 out_Position : POSITION) { -#if _XBOX - float2 delta = float2(-0.5, -0.5) / u_texsize; -#else float2 delta = float2(0.0, 0.0); -#endif out_Position = mul(u_projection, mul(u_view, mul(u_model, in_Position))); out_TexCoord = in_TexCoord + delta; } diff --git a/src/gpu/renderer.cpp b/src/gpu/renderer.cpp index d9186de9..d252d4bd 100644 --- a/src/gpu/renderer.cpp +++ b/src/gpu/renderer.cpp @@ -14,11 +14,7 @@ #include -#if defined _XBOX -# include -# undef near /* Fuck Microsoft */ -# undef far /* Fuck Microsoft again */ -#elif defined _WIN32 +#if defined _WIN32 # if defined USE_D3D9 # include # endif @@ -33,8 +29,6 @@ /* FIXME: find a way to pass g_hwnd from the windowing system */ #if defined USE_D3D9 extern HWND g_hwnd; -#elif defined _XBOX -HWND g_hwnd = 0; #endif namespace lol @@ -72,9 +66,6 @@ private: #if defined USE_D3D9 IDirect3D9 *m_d3d_ctx; IDirect3DDevice9 *m_d3d_dev; -#elif defined _XBOX - Direct3D *m_d3d_ctx; - D3DDevice *m_d3d_dev; #endif }; @@ -85,7 +76,7 @@ private: Renderer::Renderer(ivec2 size) : m_data(new RendererData()) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 /* Create Direct3D context */ m_data->m_d3d_ctx = Direct3DCreate9(D3D_SDK_VERSION); if (!m_data->m_d3d_ctx) @@ -95,12 +86,6 @@ Renderer::Renderer(ivec2 size) } /* Create Direct3D device */ -# if defined _XBOX - XVIDEO_MODE VideoMode; - XGetVideoMode(&VideoMode); - size = lol::min(size, ivec2(VideoMode.dwDisplayWidth, - VideoMode.dwDisplayHeight)); -# endif D3DPRESENT_PARAMETERS d3dpp; memset(&d3dpp, 0, sizeof(d3dpp)); d3dpp.BackBufferWidth = size.x; @@ -172,7 +157,7 @@ Renderer::Renderer(ivec2 size) SetPolygonMode(PolygonMode::Fill); /* Add some rendering states that we don't export to the user */ -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 /* TODO */ #else # if defined HAVE_GL_2X && !defined __APPLE__ @@ -188,7 +173,7 @@ Renderer::~Renderer() void *Renderer::GetDevice() { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 return m_data->m_d3d_dev; #else return nullptr; @@ -201,7 +186,7 @@ void *Renderer::GetDevice() void Renderer::Clear(ClearMask mask) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 int m = 0; if (mask & ClearMask::Color) m |= D3DCLEAR_TARGET; @@ -263,7 +248,7 @@ void Renderer::SetViewport(ibox2 viewport) if (m_data->m_viewport == viewport) return; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 D3DVIEWPORT9 vp = { viewport.aa.x, viewport.aa.y, viewport.bb.x, viewport.bb.y, 0.0f, 1.0f }; @@ -301,7 +286,7 @@ void Renderer::SetClearColor(vec4 color) if (m_data->m_clear_color == color) return; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 /* Nothing to do */ #else glClearColor(color.r, color.g, color.b, color.a); @@ -324,7 +309,7 @@ void Renderer::SetClearDepth(float depth) if (m_data->m_clear_depth == depth) return; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 /* Nothing to do */ #elif defined HAVE_GLES_2X glClearDepthf(depth); @@ -349,7 +334,7 @@ void Renderer::SetAlphaFunc(AlphaFunc func, float alpha) if (m_data->m_alpha_func == func && m_data->m_alpha_value == alpha) return; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 switch (func) { case AlphaFunc::Disabled: @@ -444,7 +429,7 @@ void Renderer::SetBlendEquation(BlendEquation rgb, BlendEquation alpha) if (m_data->m_blend_rgb == rgb && m_data->m_blend_alpha == alpha) return; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 D3DBLEND s1[2] = { D3DBLENDOP_ADD, D3DBLENDOP_ADD }; BlendEquation s2[2] = { rgb, alpha }; @@ -521,7 +506,7 @@ void Renderer::SetBlendFunc(BlendFunc src, BlendFunc dst) if (m_data->m_blend_src == src && m_data->m_blend_dst == dst) return; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 D3DBLEND s1[2] = { D3DBLEND_ONE, D3DBLEND_ZERO }; BlendFunc s2[2] = { src, dst }; @@ -652,7 +637,7 @@ void Renderer::SetDepthFunc(DepthFunc func) if (m_data->m_depth_func == func) return; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 switch (func) { case DepthFunc::Disabled: @@ -733,7 +718,7 @@ void Renderer::SetDepthMask(DepthMask mask) if (m_data->m_depth_mask == mask) return; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 if (mask == DepthMask::Disabled) m_data->m_d3d_dev->SetRenderState(D3DRS_ZWRITEENABLE, D3DZB_FALSE); else @@ -762,7 +747,7 @@ void Renderer::SetCullMode(CullMode mode) if (m_data->m_cull_mode == mode) return; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 switch (mode) { case CullMode::Disabled: @@ -811,7 +796,7 @@ void Renderer::SetPolygonMode(PolygonMode mode) if (m_data->m_polygon_mode == mode) return; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 switch (mode) { case PolygonMode::Point: diff --git a/src/gpu/shader.cpp b/src/gpu/shader.cpp index 32c8e820..78cf137d 100644 --- a/src/gpu/shader.cpp +++ b/src/gpu/shader.cpp @@ -15,7 +15,7 @@ #include #include -#if defined(_WIN32) && !defined(_XBOX) +#if defined _WIN32 # define WIN32_LEAN_AND_MEAN # include # if defined USE_D3D9 @@ -25,10 +25,6 @@ # include # include # endif -#elif defined _XBOX -# include -# undef near /* Fuck Microsoft */ -# undef far /* Fuck Microsoft again */ #endif #include "pegtl.hh" @@ -90,11 +86,6 @@ private: IDirect3DVertexShader9 *vert_shader; IDirect3DPixelShader9 *frag_shader; ID3DXConstantTable *vert_table, *frag_table; -#elif defined _XBOX - D3DDevice *m_dev; - D3DVertexShader *vert_shader; - D3DPixelShader *frag_shader; - ID3DXConstantTable *vert_table, *frag_table; #else GLuint prog_id, vert_id, frag_id; // Benlitz: using a simple array could be faster since there is never more than a few attribute locations to store @@ -237,14 +228,12 @@ Shader::Shader(String const &name, { data->m_name = name; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 ID3DXBuffer *shader_code, *error_msg; HRESULT hr; D3DXMACRO macros[] = { -#if defined _XBOX - { "_XBOX", "1" }, -#endif + { "LOL_TEST_MACRO", "1" }, { nullptr, nullptr } }; #else @@ -257,13 +246,8 @@ Shader::Shader(String const &name, /* Compile vertex shader */ data->vert_crc = ShaderData::Hash(vert); -#if defined USE_D3D9 || defined _XBOX -# if defined USE_D3D9 +#if defined USE_D3D9 data->m_dev = (IDirect3DDevice9 *)Renderer::Get()->GetDevice(); -# elif defined _XBOX - data->m_dev = (D3DDevice *)Renderer::Get()->GetDevice(); -# endif - hr = D3DXCompileShader(vert, (UINT)strlen(vert), macros, nullptr, "main", "vs_3_0", 0, &shader_code, &error_msg, &data->vert_table); @@ -300,7 +284,7 @@ Shader::Shader(String const &name, /* Compile fragment shader */ data->frag_crc = ShaderData::Hash(frag); -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 hr = D3DXCompileShader(frag, (UINT)strlen(frag), macros, nullptr, "main", "ps_3_0", 0, &shader_code, &error_msg, &data->frag_table); @@ -336,7 +320,7 @@ Shader::Shader(String const &name, } #endif -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 /* FIXME: this is only debug code, we don't need it. */ D3DXCONSTANTTABLE_DESC desc; data->frag_table->GetDesc(&desc); @@ -450,7 +434,7 @@ ShaderAttrib Shader::GetAttribLocation(VertexUsage usage, int index) const ShaderAttrib ret; ret.m_flags = (uint64_t)(uint16_t)usage.ToScalar() << 16; ret.m_flags |= (uint64_t)(uint16_t)index; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 #else GLint l = -1; @@ -476,7 +460,7 @@ ShaderUniform Shader::GetUniformLocation(String const& uni) const ShaderUniform Shader::GetUniformLocation(char const *uni) const { ShaderUniform ret; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 /* Global variables are prefixed with "$" */ String tmpname = String("$") + uni; D3DXCONSTANT_DESC cdesc; @@ -515,7 +499,7 @@ ShaderUniform Shader::GetUniformLocation(char const *uni) const void Shader::SetUniform(ShaderUniform const &uni, int i) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 SetUniform(uni, ivec4(i, 0, 0, 0)); #else glUniform1i((GLint)uni.frag, i); @@ -524,7 +508,7 @@ void Shader::SetUniform(ShaderUniform const &uni, int i) void Shader::SetUniform(ShaderUniform const &uni, ivec2 const &v) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 SetUniform(uni, ivec4(v, 0, 0)); #else glUniform2i((GLint)uni.frag, v.x, v.y); @@ -533,7 +517,7 @@ void Shader::SetUniform(ShaderUniform const &uni, ivec2 const &v) void Shader::SetUniform(ShaderUniform const &uni, ivec3 const &v) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 SetUniform(uni, ivec4(v, 0)); #else glUniform3i((GLint)uni.frag, v.x, v.y, v.z); @@ -542,7 +526,7 @@ void Shader::SetUniform(ShaderUniform const &uni, ivec3 const &v) void Shader::SetUniform(ShaderUniform const &uni, ivec4 const &v) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 if (uni.flags & 1) data->m_dev->SetPixelShaderConstantI((UINT)uni.frag, &v[0], 1); if (uni.flags & 2) @@ -554,7 +538,7 @@ void Shader::SetUniform(ShaderUniform const &uni, ivec4 const &v) void Shader::SetUniform(ShaderUniform const &uni, float f) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 SetUniform(uni, vec4(f, 0, 0, 0)); #else glUniform1f((GLint)uni.frag, f); @@ -563,7 +547,7 @@ void Shader::SetUniform(ShaderUniform const &uni, float f) void Shader::SetUniform(ShaderUniform const &uni, vec2 const &v) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 SetUniform(uni, vec4(v, 0, 0)); #else glUniform2fv((GLint)uni.frag, 1, &v[0]); @@ -572,7 +556,7 @@ void Shader::SetUniform(ShaderUniform const &uni, vec2 const &v) void Shader::SetUniform(ShaderUniform const &uni, vec3 const &v) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 SetUniform(uni, vec4(v, 0)); #else glUniform3fv((GLint)uni.frag, 1, &v[0]); @@ -581,7 +565,7 @@ void Shader::SetUniform(ShaderUniform const &uni, vec3 const &v) void Shader::SetUniform(ShaderUniform const &uni, vec4 const &v) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 if (uni.flags & 1) data->m_dev->SetPixelShaderConstantF((UINT)uni.frag, &v[0], 1); if (uni.flags & 2) @@ -593,7 +577,7 @@ void Shader::SetUniform(ShaderUniform const &uni, vec4 const &v) void Shader::SetUniform(ShaderUniform const &uni, mat2 const &m) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 /* FIXME: do we need padding here like for the mat3 version? */ if (uni.flags & 1) data->m_dev->SetPixelShaderConstantF((UINT)uni.frag, &m[0][0], 1); @@ -606,7 +590,7 @@ void Shader::SetUniform(ShaderUniform const &uni, mat2 const &m) void Shader::SetUniform(ShaderUniform const &uni, mat3 const &m) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 /* Padding matrix columns is necessary on DirectX. We need to create * a new data structure; a 4×4 matrix will do. */ mat4 tmp(m, 1.0f); @@ -621,7 +605,7 @@ void Shader::SetUniform(ShaderUniform const &uni, mat3 const &m) void Shader::SetUniform(ShaderUniform const &uni, mat4 const &m) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 if (uni.flags & 1) data->m_dev->SetPixelShaderConstantF((UINT)uni.frag, &m[0][0], 4); if (uni.flags & 2) @@ -633,7 +617,7 @@ void Shader::SetUniform(ShaderUniform const &uni, mat4 const &m) void Shader::SetUniform(ShaderUniform const &uni, TextureUniform tex, int index) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 data->m_dev->SetTexture(index, (LPDIRECT3DTEXTURE9)tex.m_flags); data->m_dev->SetSamplerState(index, D3DSAMP_MAGFILTER, tex.m_attrib & 0xff); data->m_dev->SetSamplerState(index, D3DSAMP_MINFILTER, (tex.m_attrib >> 8) & 0xff); @@ -652,7 +636,7 @@ void Shader::SetUniform(ShaderUniform const &uni, TextureUniform tex, int index) void Shader::SetUniform(ShaderUniform const &uni, array const &v) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 /* FIXME: this will not work properly because we don't know how tell DX9 * it's a bunch of floats instead of vec4. */ if (uni.flags & 1) @@ -668,7 +652,7 @@ void Shader::SetUniform(ShaderUniform const &uni, array const &v) void Shader::SetUniform(ShaderUniform const &uni, array const &v) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 /* FIXME: this will not work properly because we don't know how tell DX9 * it's a bunch of vec2 instead of vec4. */ if (uni.flags & 1) @@ -684,7 +668,7 @@ void Shader::SetUniform(ShaderUniform const &uni, array const &v) void Shader::SetUniform(ShaderUniform const &uni, array const &v) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 /* FIXME: this will not work properly because we don't know how tell DX9 * it's a bunch of vec3 instead of vec4. */ if (uni.flags & 1) @@ -700,7 +684,7 @@ void Shader::SetUniform(ShaderUniform const &uni, array const &v) void Shader::SetUniform(ShaderUniform const &uni, array const &v) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 if (uni.flags & 1) data->m_dev->SetPixelShaderConstantF((UINT)uni.frag, &v[0][0], v.count()); @@ -714,7 +698,7 @@ void Shader::SetUniform(ShaderUniform const &uni, array const &v) void Shader::Bind() const { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 HRESULT hr; hr = data->m_dev->SetVertexShader(data->vert_shader); hr = data->m_dev->SetPixelShader(data->frag_shader); @@ -725,7 +709,7 @@ void Shader::Bind() const void Shader::Unbind() const { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 HRESULT hr; hr = data->m_dev->SetVertexShader(nullptr); hr = data->m_dev->SetPixelShader(nullptr); @@ -737,7 +721,7 @@ void Shader::Unbind() const Shader::~Shader() { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 data->vert_shader->Release(); data->vert_table->Release(); data->frag_shader->Release(); @@ -757,7 +741,7 @@ int ShaderData::GetVersion() { static int version = 0; -#if !defined USE_D3D9 && !defined _XBOX +#if !defined USE_D3D9 if (!version) { #if defined HAVE_GLES_2X diff --git a/src/gpu/texture.cpp b/src/gpu/texture.cpp index 08fe5916..8291374d 100644 --- a/src/gpu/texture.cpp +++ b/src/gpu/texture.cpp @@ -39,12 +39,6 @@ class TextureData D3DTEXTUREFILTERTYPE m_mag_filter; D3DTEXTUREFILTERTYPE m_min_filter; D3DTEXTUREFILTERTYPE m_mip_filter; -#elif defined _XBOX - D3DDevice *m_dev; - D3DTexture *m_texture; - D3DTEXTUREFILTERTYPE m_mag_filter; - D3DTEXTUREFILTERTYPE m_min_filter; - D3DTEXTUREFILTERTYPE m_mip_filter; #else GLuint m_texture; GLint m_internal_format; @@ -68,12 +62,8 @@ Texture::Texture(ivec2 size, PixelFormat format) m_data->m_size = size; m_data->m_format = format; -#if defined USE_D3D9 || defined _XBOX -# if defined USE_D3D9 +#if defined USE_D3D9 m_data->m_dev = (IDirect3DDevice9 *)Renderer::Get()->GetDevice(); -# elif defined _XBOX - m_data->m_dev = (D3DDevice *)Renderer::Get()->GetDevice(); -# endif static struct { @@ -162,7 +152,7 @@ Texture::Texture(ivec2 size, PixelFormat format) TextureUniform Texture::GetTextureUniform() const { TextureUniform ret; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 ret.m_flags = (uint64_t)(uintptr_t)m_data->m_texture; ret.m_attrib = m_data->m_mag_filter; ret.m_attrib |= m_data->m_min_filter << 8; @@ -175,7 +165,7 @@ TextureUniform Texture::GetTextureUniform() const void Texture::Bind() { -#if defined _XBOX || defined USE_D3D9 +#if defined USE_D3D9 m_data->m_dev->SetTexture(0, m_data->m_texture); #else # if !defined HAVE_GLES_2X @@ -187,7 +177,7 @@ void Texture::Bind() void Texture::SetData(void *data) { -#if defined _XBOX || defined USE_D3D9 +#if defined USE_D3D9 D3DLOCKED_RECT rect; # if defined USE_D3D9 m_data->m_texture->LockRect(0, &rect, nullptr, D3DLOCK_DISCARD); @@ -208,7 +198,7 @@ void Texture::SetData(void *data) void Texture::SetSubData(ivec2 origin, ivec2 size, void *data) { -#if defined _XBOX || defined USE_D3D9 +#if defined USE_D3D9 D3DLOCKED_RECT rect; m_data->m_texture->LockRect(0, &rect, nullptr, 0); @@ -230,7 +220,7 @@ void Texture::SetSubData(ivec2 origin, ivec2 size, void *data) void Texture::SetMagFiltering(TextureMagFilter filter) { -#if defined _XBOX || defined USE_D3D9 +#if defined USE_D3D9 // In DirectX, texture filtering is a per-texture-unit state switch (filter) { @@ -261,7 +251,7 @@ void Texture::SetMagFiltering(TextureMagFilter filter) void Texture::SetMinFiltering(TextureMinFilter filter) { -#if defined _XBOX || defined USE_D3D9 +#if defined USE_D3D9 // In DirectX, texture filtering is a per-texture-unit state #define F(x, y) \ m_data->m_min_filter = x; m_data->m_mip_filter = y; @@ -322,8 +312,6 @@ void Texture::GenerateMipmaps() { #if defined USE_D3D9 m_data->m_texture->->GenerateMipSubLevels(); -#elif defined _XBOX - /* FIXME: No direct mipmap generation support on X360 */ #else glBindTexture(GL_TEXTURE_2D, m_data->m_texture); glGenerateMipmap(GL_TEXTURE_2D); @@ -332,7 +320,7 @@ void Texture::GenerateMipmaps() Texture::~Texture() { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 m_data->m_texture->Release(); #else glDeleteTextures(1, &m_data->m_texture); diff --git a/src/gpu/tile.lolfx b/src/gpu/tile.lolfx index c934dbeb..26743852 100644 --- a/src/gpu/tile.lolfx +++ b/src/gpu/tile.lolfx @@ -48,11 +48,7 @@ void main(float4 in_Position : POSITION, out float2 out_TexCoord : TEXCOORD0, out float4 out_Position : POSITION) { -#if _XBOX - float2 delta = float2(-0.5, -0.5) / u_texsize; -#else float2 delta = float2(0.0, 0.0); -#endif out_Position = mul(u_projection, mul(u_view, mul(u_model, in_Position))); out_TexCoord = in_TexCoord + delta; } diff --git a/src/gpu/vertexbuffer.cpp b/src/gpu/vertexbuffer.cpp index 5c711f4f..45cb45ed 100644 --- a/src/gpu/vertexbuffer.cpp +++ b/src/gpu/vertexbuffer.cpp @@ -18,10 +18,6 @@ # define FAR # define NEAR # include -#elif defined _XBOX -# include -# undef near /* Fuck Microsoft */ -# undef far /* Fuck Microsoft again */ #endif namespace lol @@ -42,9 +38,6 @@ class VertexBufferData #if defined USE_D3D9 IDirect3DDevice9 *m_dev; IDirect3DVertexBuffer9 *m_vbo; -#elif defined _XBOX - D3DDevice *m_dev; - D3DVertexBuffer *m_vbo; #else GLuint m_vbo; uint8_t *m_memory; @@ -64,9 +57,6 @@ class VertexDeclarationData #if defined USE_D3D9 IDirect3DDevice9 *m_dev; IDirect3DVertexDeclaration9 *m_vdecl; -#elif defined _XBOX - D3DDevice *m_dev; - D3DVertexDeclaration *m_vdecl; #else #endif }; @@ -110,7 +100,7 @@ VertexDeclaration::VertexDeclaration(VertexStreamBase const &s1, VertexDeclaration::~VertexDeclaration() { -#if defined _XBOX || defined USE_D3D9 +#if defined USE_D3D9 if (FAILED(m_data->m_vdecl->Release())) Abort(); #else @@ -122,7 +112,7 @@ VertexDeclaration::~VertexDeclaration() void VertexDeclaration::Bind() { -#if defined _XBOX || defined USE_D3D9 +#if defined USE_D3D9 if (FAILED(m_data->m_dev->SetVertexDeclaration(m_data->m_vdecl))) Abort(); #else @@ -135,7 +125,7 @@ void VertexDeclaration::DrawElements(MeshPrimitive type, int skip, int count) if (count <= 0) return; -#if defined _XBOX || defined USE_D3D9 +#if defined USE_D3D9 switch (type.ToScalar()) { case MeshPrimitive::Triangles: @@ -194,7 +184,7 @@ void VertexDeclaration::DrawIndexedElements(MeshPrimitive type, int vbase, if (count <= 0) return; -#if defined _XBOX || defined USE_D3D9 +#if defined USE_D3D9 switch (type.ToScalar()) { case MeshPrimitive::Triangles: @@ -261,7 +251,7 @@ void VertexDeclaration::DrawIndexedElements(MeshPrimitive type, int vbase, void VertexDeclaration::Unbind() { -#if defined _XBOX || defined USE_D3D9 +#if defined USE_D3D9 int stream = -1; for (int i = 0; i < m_count; i++) if (m_streams[i].index != stream) @@ -301,7 +291,7 @@ void VertexDeclaration::SetStream(VertexBuffer *vb, ShaderAttrib attr1, ShaderAttrib attr11, ShaderAttrib attr12) { -#if defined _XBOX || defined USE_D3D9 +#if defined USE_D3D9 // Don't bother in DirectX world, shader attributes are not used SetStream(vb, nullptr); #else @@ -317,7 +307,7 @@ void VertexDeclaration::SetStream(VertexBuffer *vb, ShaderAttrib attribs[]) if (!vb->m_data->m_size) return; -#if defined _XBOX || defined USE_D3D9 +#if defined USE_D3D9 /* Only the first item is required to know which stream this * is about; the rest of the information is stored in the * vertex declaration already. */ @@ -458,7 +448,7 @@ void VertexDeclaration::SetStream(VertexBuffer *vb, ShaderAttrib attribs[]) void VertexDeclaration::Initialize() { -#if defined _XBOX || defined USE_D3D9 +#if defined USE_D3D9 static D3DVERTEXELEMENT9 const end_element[] = { D3DDECL_END() }; static D3DDECLTYPE const X = D3DDECLTYPE_UNUSED; static D3DDECLTYPE const tlut[] = @@ -488,11 +478,7 @@ void VertexDeclaration::Initialize() D3DDECLUSAGE_TANGENT, D3DDECLUSAGE_BINORMAL, D3DDECLUSAGE_TESSFACTOR, -#if defined _XBOX - D3DDECLUSAGE_TEXCOORD, /* FIXME: nonexistent */ -#else D3DDECLUSAGE_POSITIONT, -#endif D3DDECLUSAGE_COLOR, D3DDECLUSAGE_FOG, D3DDECLUSAGE_DEPTH, @@ -530,11 +516,7 @@ void VertexDeclaration::Initialize() } elements[m_count] = end_element[0]; -# if defined USE_D3D9 m_data->m_dev = (IDirect3DDevice9 *)Renderer::Get()->GetDevice(); -# elif defined _XBOX - m_data->m_dev = (D3DDevice *)Renderer::Get()->GetDevice(); -# endif if (FAILED(m_data->m_dev->CreateVertexDeclaration(elements, &m_data->m_vdecl))) @@ -614,13 +596,8 @@ VertexBuffer::VertexBuffer(size_t size) m_data->m_size = size; if (!size) return; -#if defined USE_D3D9 || defined _XBOX -# if defined USE_D3D9 +#if defined USE_D3D9 m_data->m_dev = (IDirect3DDevice9 *)Renderer::Get()->GetDevice(); -# elif defined _XBOX - m_data->m_dev = (D3DDevice *)Renderer::Get()->GetDevice(); -# endif - if (FAILED(m_data->m_dev->CreateVertexBuffer(size, D3DUSAGE_WRITEONLY, nullptr, D3DPOOL_MANAGED, &m_data->m_vbo, nullptr))) Abort(); @@ -634,7 +611,7 @@ VertexBuffer::~VertexBuffer() { if (m_data->m_size) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 if (FAILED(m_data->m_vbo->Release())) Abort(); #else @@ -654,7 +631,7 @@ void *VertexBuffer::Lock(size_t offset, size_t size) { if (!m_data->m_size) return nullptr; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 void *ret; if (FAILED(m_data->m_vbo->Lock(offset, size, (void **)&ret, 0))) Abort(); @@ -670,7 +647,7 @@ void VertexBuffer::Unlock() { if (!m_data->m_size) return; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 if (FAILED(m_data->m_vbo->Unlock())) Abort(); #else diff --git a/src/lol/gpu/shader.h b/src/lol/gpu/shader.h index f191279e..5ddd00d5 100644 --- a/src/lol/gpu/shader.h +++ b/src/lol/gpu/shader.h @@ -304,7 +304,7 @@ public: private: uint64_t m_flags; -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 uint32_t m_attrib; #endif }; diff --git a/src/lolcore.vcxproj b/src/lolcore.vcxproj index 74818f4d..96d8d1cc 100644 --- a/src/lolcore.vcxproj +++ b/src/lolcore.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} @@ -48,9 +40,6 @@ true MultiByte - - MultiByte - MultiByte @@ -64,10 +53,6 @@ true MultiByte - - true - MultiByte - true MultiByte @@ -178,8 +163,6 @@ true true true - true - true true true @@ -188,8 +171,6 @@ true true true - true - true true true @@ -198,8 +179,6 @@ true true true - true - true true true @@ -208,15 +187,11 @@ true true true - true - true true true - - @@ -340,8 +315,6 @@ true true true - true - true true true @@ -350,8 +323,6 @@ true true true - true - true true true @@ -360,8 +331,6 @@ true true true - true - true true true @@ -370,15 +339,11 @@ true true true - true - true true true - - diff --git a/src/lua/loadlib.c b/src/lua/loadlib.c index a2fd185d..0c9cd185 100644 --- a/src/lua/loadlib.c +++ b/src/lua/loadlib.c @@ -15,10 +15,7 @@ /* ** if needed, includes windows header before everything else */ -// LOL BEGIN -//#if defined(_WIN32) -#if defined(_WIN32) && !defined(_XBOX) -// LOL END +#if defined(_WIN32) #include #endif diff --git a/src/lua/lollua.vcxproj b/src/lua/lollua.vcxproj index 49f2a5d6..711aaae0 100644 --- a/src/lua/lollua.vcxproj +++ b/src/lua/lollua.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -132,4 +124,4 @@ - \ No newline at end of file + diff --git a/src/platform/xbox/xboxapp.cpp b/src/platform/xbox/xboxapp.cpp deleted file mode 100644 index 353aa9ea..00000000 --- a/src/platform/xbox/xboxapp.cpp +++ /dev/null @@ -1,76 +0,0 @@ -// -// Lol Engine -// -// Copyright: (c) 2010-2011 Sam Hocevar -// This program is free software; you can redistribute it and/or -// modify it under the terms of the Do What The Fuck You Want To -// Public License, Version 2, as published by Sam Hocevar. See -// http://www.wtfpl.net/ for more details. -// - -#include - -#if defined _XBOX -# include -#endif - -#include "xboxapp.h" -#include "xboxinput.h" - -namespace lol -{ - -/* - * XboxApp implementation class - */ - -class XboxAppData -{ - friend class XboxApp; - -private: -#if defined _XBOX -#endif -}; - -/* - * Public XboxApp class - */ - -XboxApp::XboxApp(char const *title, ivec2 res, float fps) : - data(new XboxAppData()) -{ -#if defined _XBOX - Ticker::Setup(fps); - Video::Setup(res); - - /* Autoreleased objects */ - new XboxInput(); -#endif -} - -void XboxApp::ShowPointer(bool show) -{ - ; -} - -void XboxApp::Tick() -{ - /* Tick the renderer, show the frame and clamp to desired framerate. */ - Ticker::TickDraw(); - -#if defined _XBOX - D3DDevice *d3d_dev = (D3DDevice *)Renderer::Get()->GetDevice(); - d3d_dev->Present(nullptr, nullptr, nullptr, nullptr); -#endif -} - -XboxApp::~XboxApp() -{ -#if defined _XBOX -#endif - delete data; -} - -} /* namespace lol */ - diff --git a/src/platform/xbox/xboxapp.h b/src/platform/xbox/xboxapp.h deleted file mode 100644 index 3d0842c4..00000000 --- a/src/platform/xbox/xboxapp.h +++ /dev/null @@ -1,39 +0,0 @@ -// -// Lol Engine -// -// Copyright: (c) 2010-2013 Sam Hocevar -// This program is free software; you can redistribute it and/or -// modify it under the terms of the Do What The Fuck You Want To -// Public License, Version 2, as published by Sam Hocevar. See -// http://www.wtfpl.net/ for more details. -// - -#pragma once - -// -// The XboxApp class -// ---------------- -// - -#include "lol/math/vector.h" - -namespace lol -{ - -class XboxAppData; - -class XboxApp -{ -public: - XboxApp(char const *title, ivec2 res, float fps); - virtual ~XboxApp(); - - void ShowPointer(bool show); - void Tick(); - -private: - XboxAppData *data; -}; - -} /* namespace lol */ - diff --git a/src/platform/xbox/xboxinput.cpp b/src/platform/xbox/xboxinput.cpp deleted file mode 100644 index 1f872dc5..00000000 --- a/src/platform/xbox/xboxinput.cpp +++ /dev/null @@ -1,102 +0,0 @@ -// -// Lol Engine -// -// Copyright: (c) 2010-2013 Sam Hocevar -// This program is free software; you can redistribute it and/or -// modify it under the terms of the Do What The Fuck You Want To -// Public License, Version 2, as published by Sam Hocevar. See -// http://www.wtfpl.net/ for more details. -// - -#include - -#if defined _XBOX -# include -# include -#endif - -#include "xboxinput.h" - -namespace lol -{ - -/* - * Xbox Input implementation class - */ - -class XboxInputData -{ - friend class XboxInput; - -private: -#if defined _XBOX - array m_joysticks; -#endif -}; - -/* - * Public XboxInput class - */ - -XboxInput::XboxInput() - : m_data(new XboxInputData()) -{ -#if defined _XBOX - for (int i = 0; i < XUSER_MAX_COUNT; i++) - { - XINPUT_STATE state; - if (XInputGetState(i, &state) != ERROR_SUCCESS) - continue; - - Stick *stick = Input::CreateStick(); - stick->SetAxisCount(4); - stick->SetButtonCount(16); - m_data->m_joysticks.push(i, stick); - } -#endif - - m_gamegroup = GAMEGROUP_INPUT; -} - -XboxInput::~XboxInput() -{ -#if defined _XBOX - /* Unregister all the joysticks we added */ - while (m_data->m_joysticks.count()) - { - Input::DestroyStick(m_data->m_joysticks[0].m2); - m_data->m_joysticks.remove(0); - } -#endif - delete m_data; -} - -void XboxInput::TickGame(float seconds) -{ - Entity::TickGame(seconds); -} - -void XboxInput::TickDraw(float seconds, Scene &scene) -{ - Entity::TickDraw(seconds, scene); - -#if defined _XBOX - for (int i = 0; i < m_data->m_joysticks.count(); i++) - { - XINPUT_STATE state; - if (XInputGetState(m_data->m_joysticks[i].m1, &state) != ERROR_SUCCESS) - continue; - - m_data->m_joysticks[i].m2->SetAxis(0, (float)state.Gamepad.sThumbLX / 32768.f); - m_data->m_joysticks[i].m2->SetAxis(1, -(float)state.Gamepad.sThumbLY / 32768.f); - m_data->m_joysticks[i].m2->SetAxis(2, (float)state.Gamepad.sThumbRX / 32768.f); - m_data->m_joysticks[i].m2->SetAxis(3, -(float)state.Gamepad.sThumbRY / 32768.f); - - for (int b = 0; b < 16; b++) - m_data->m_joysticks[i].m2->SetButton(b, ((uint16_t)(state.Gamepad.wButtons) >> b) & 1); - } -#endif -} - -} /* namespace lol */ - diff --git a/src/platform/xbox/xboxinput.h b/src/platform/xbox/xboxinput.h deleted file mode 100644 index 1820ad5f..00000000 --- a/src/platform/xbox/xboxinput.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// Lol Engine -// -// Copyright: (c) 2010-2013 Sam Hocevar -// This program is free software; you can redistribute it and/or -// modify it under the terms of the Do What The Fuck You Want To -// Public License, Version 2, as published by Sam Hocevar. See -// http://www.wtfpl.net/ for more details. -// - -#pragma once - -// -// The XboxInput class -// ------------------- -// - -#include "engine/entity.h" - -namespace lol -{ - -class XboxInputData; - -class XboxInput : public Entity -{ -public: - XboxInput(); - virtual ~XboxInput(); - -protected: - virtual void TickGame(float seconds); - virtual void TickDraw(float seconds, Scene &scene); - -private: - XboxInputData *m_data; -}; - -} /* namespace lol */ - diff --git a/src/scene.cpp b/src/scene.cpp index 8ceb8042..6a58ec8b 100644 --- a/src/scene.cpp +++ b/src/scene.cpp @@ -617,7 +617,7 @@ void Scene::RenderTiles() // XXX: rename to Blit() rc.SetBlendEquation(BlendEquation::Add, BlendEquation::Max); rc.SetAlphaFunc(AlphaFunc::GreaterOrEqual, 0.01f); -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 /* TODO */ #elif (defined USE_GLEW || defined HAVE_GL_2X) && !defined HAVE_GLES_2X glEnable(GL_TEXTURE_2D); @@ -714,7 +714,7 @@ void Scene::RenderTiles() // XXX: rename to Blit() } -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 /* TODO */ #elif (defined USE_GLEW || defined HAVE_GL_2X) && !defined HAVE_GLES_2X glDisable(GL_TEXTURE_2D); diff --git a/src/sys/init.cpp b/src/sys/init.cpp index adfd8b57..90c2d299 100644 --- a/src/sys/init.cpp +++ b/src/sys/init.cpp @@ -61,7 +61,7 @@ void Init(int argc, char *argv[], # if HAVE_GETCWD cwd = getcwd(nullptr, 0); -# elif HAVE__GETCWD || (_WIN32 && !_XBOX) +# elif HAVE__GETCWD || _WIN32 cwd = _getcwd(nullptr, 0); # endif diff --git a/src/sys/timer.cpp b/src/sys/timer.cpp index 110e3956..7ed0a902 100644 --- a/src/sys/timer.cpp +++ b/src/sys/timer.cpp @@ -17,11 +17,6 @@ || (HAVE_GETTIMEOFDAY && HAVE_USLEEP && HAVE_SYS_TIME_H && HAVE_UNISTD_H) # include # include -#elif _XBOX -# include -# undef near /* Fuck Microsoft */ -# undef far /* Fuck Microsoft again */ -# include #elif _WIN32 # define WIN32_LEAN_AND_MEAN # include diff --git a/src/t/test-base.vcxproj b/src/t/test-base.vcxproj index 22fb43af..083186f9 100644 --- a/src/t/test-base.vcxproj +++ b/src/t/test-base.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - diff --git a/src/t/test-entity.vcxproj b/src/t/test-entity.vcxproj index ae2ba58e..6ba31fe4 100644 --- a/src/t/test-entity.vcxproj +++ b/src/t/test-entity.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - diff --git a/src/t/test-image.vcxproj b/src/t/test-image.vcxproj index 750d0d88..ccec3c8d 100644 --- a/src/t/test-image.vcxproj +++ b/src/t/test-image.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - diff --git a/src/t/test-math.vcxproj b/src/t/test-math.vcxproj index d99663c4..7a1fa4d0 100644 --- a/src/t/test-math.vcxproj +++ b/src/t/test-math.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - diff --git a/src/t/test-sys.vcxproj b/src/t/test-sys.vcxproj index 8050b5fa..7635a5c9 100644 --- a/src/t/test-sys.vcxproj +++ b/src/t/test-sys.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 - diff --git a/src/textureimage.cpp b/src/textureimage.cpp index e51e6d8d..045543c9 100644 --- a/src/textureimage.cpp +++ b/src/textureimage.cpp @@ -14,7 +14,7 @@ #include #include -#if defined(_WIN32) && !defined(_XBOX) +#if defined _WIN32 # define WIN32_LEAN_AND_MEAN # include # if defined USE_D3D9 diff --git a/src/tileset.cpp b/src/tileset.cpp index 4273a5ad..4735651e 100644 --- a/src/tileset.cpp +++ b/src/tileset.cpp @@ -16,7 +16,7 @@ #include #include -#if defined(_WIN32) && !defined(_XBOX) +#if defined _WIN32 # define WIN32_LEAN_AND_MEAN # include # if defined USE_D3D9 diff --git a/src/video.cpp b/src/video.cpp index 266a3467..8d6fc34b 100644 --- a/src/video.cpp +++ b/src/video.cpp @@ -10,11 +10,7 @@ #include -#if defined _XBOX -# include -# undef near /* Fuck Microsoft */ -# undef far /* Fuck Microsoft again */ -#elif defined _WIN32 +#if defined _WIN32 # if defined USE_D3D9 # include # endif @@ -64,7 +60,7 @@ void Video::SetDebugRenderMode(DebugRenderMode d) case DebugRenderMode::Normal: case DebugRenderMode::UV: { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 #elif defined HAVE_GLES_2X #elif defined USE_GLEW || defined HAVE_GL_2X glEnable(GL_CULL_FACE); @@ -74,7 +70,7 @@ void Video::SetDebugRenderMode(DebugRenderMode d) } case DebugRenderMode::Wireframe: { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 #elif defined HAVE_GLES_2X #elif defined USE_GLEW || defined HAVE_GL_2X glDisable(GL_CULL_FACE); @@ -104,7 +100,7 @@ void Video::Destroy() void Video::Capture(uint32_t *buffer) { -#if defined USE_D3D9 || defined _XBOX +#if defined USE_D3D9 /* TODO */ #elif defined USE_GLEW || defined HAVE_GL_2X || defined HAVE_GLEX_2X GLint v[4]; diff --git a/tools/lolremez/lolremez.vcxproj b/tools/lolremez/lolremez.vcxproj index effdfe05..b4f91b62 100644 --- a/tools/lolremez/lolremez.vcxproj +++ b/tools/lolremez/lolremez.vcxproj @@ -13,10 +13,6 @@ Debug x64 - - Debug - Xbox 360 - Release ORBIS @@ -29,10 +25,6 @@ Release x64 - - Release - Xbox 360 -