lolengine
/
lol
ミラー元 https://github.com/lolengine/lol
1
0
フォーク 0
コード 課題 0 リリース 0 Wiki アクティビティ
ソースを参照

build: remove dead PS3 code.

undefined
Sam Hocevar 10年前
親
8657a3adfa
コミット
a07844682e
65個のファイルの変更、82行の追加、2121行の削除
分割表示
差分オプション
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード
  1. +0
    -102
      build/Lol (vs2013).sln
  2. +0
    -104
      build/Lol (vs2014).sln
  3. +1
    -1
      build/Makefile.am
  4. +0
    -24
      build/autotools/common.am
  5. +0
    -7
      build/autotools/m4/lol-gl.m4
  6. +0
    -10
      build/build-ps3
  7. +0
    -6
      build/lol-build
  8. +0
    -3
      build/msbuild/lol.config.props
  9. +4
    -11
      build/msbuild/lol.rules.props
  10. +0
    -13
      build/msbuild/lol.vars.props
  11. +0
    -15
      build/run-bitten.sh
  12. +0
    -39
      configure.ac
  13. +0
    -8
      demos/test/benchsuite.vcxproj
  14. +0
    -8
      demos/test/btphystest.vcxproj
  15. +0
    -8
      demos/test/meshviewer.vcxproj
  16. +1
    -9
      demos/test/nacl_phystest.vcxproj
  17. +0
    -8
      demos/tutorial/01_triangle.vcxproj
  18. +0
    -8
      demos/tutorial/02_cube.vcxproj
  19. +0
    -8
      demos/tutorial/03_noise.vcxproj
  20. +0
    -8
      demos/tutorial/04_texture.vcxproj
  21. +0
    -8
      demos/tutorial/05_easymesh.vcxproj
  22. +1
    -9
      demos/tutorial/06_sprite.vcxproj
  23. +0
    -8
      demos/tutorial/07_input.vcxproj
  24. +0
    -8
      demos/tutorial/08_fbo.vcxproj
  25. +5
    -11
      demos/tutorial/11_fractal.cpp
  26. +0
    -8
      demos/tutorial/11_fractal.vcxproj
  27. +0
    -8
      demos/tutorial/12_voronoi.vcxproj
  28. +1
    -9
      demos/tutorial/13_shader_builder.vcxproj
  29. +0
    -1
      doc/doxygen.cfg.in
  30. +0
    -9
      src/Makefile.am
  31. +2
    -6
      src/application/application.cpp
  32. +0
    -4
      src/base/string.cpp
  33. +0
    -8
      src/bullet/lolbullet.vcxproj
  34. +0
    -15
      src/gpu/framebuffer.cpp
  35. +1
    -1
      src/gpu/renderer.cpp
  36. +27
    -149
      src/gpu/shader.cpp
  37. +1
    -14
      src/gpu/texture.cpp
  38. +1
    -52
      src/gpu/vertexbuffer.cpp
  39. +0
    -196
      src/image/codec/ps3-image.cpp
  40. +0
    -3
      src/image/image.cpp
  41. +1
    -4
      src/lol/base/assert.h
  42. +0
    -5
      src/lol/base/features.h
  43. +1
    -6
      src/lol/sys/thread.h
  44. +0
    -37
      src/lolcore.vcxproj
  45. +0
    -21
      src/lolcore.vcxproj.filters
  46. +0
    -3
      src/lolgl.h
  47. +0
    -8
      src/lua/lollua.vcxproj
  48. +1
    -12
      src/math/half.cpp
  49. +6
    -148
      src/math/trig.cpp
  50. +1
    -1
      src/platform/nacl/nacl-app.cpp
  51. +0
    -275
      src/platform/ps3/ps3app.cpp
  52. +0
    -39
      src/platform/ps3/ps3app.h
  53. +0
    -180
      src/platform/ps3/ps3input.cpp
  54. +0
    -39
      src/platform/ps3/ps3input.h
  55. +0
    -179
      src/platform/ps3/threadbase.h
  56. +7
    -86
      src/sample.cpp
  57. +20
    -64
      src/sys/file.cpp
  58. +0
    -33
      src/sys/timer.cpp
  59. +0
    -8
      src/t/test-base.vcxproj
  60. +0
    -8
      src/t/test-entity.vcxproj
  61. +0
    -8
      src/t/test-image.vcxproj
  62. +0
    -8
      src/t/test-math.vcxproj
  63. +0
    -8
      src/t/test-sys.vcxproj
  64. +0
    -6
      src/video.cpp
  65. +0
    -8
      tools/lolremez/lolremez.vcxproj

+ 0
- 102
build/Lol (vs2013).sln ファイルの表示

@@ -149,12 +149,10 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ORBIS = Debug|ORBIS
Debug|PS3 = Debug|PS3
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Debug|Xbox 360 = Debug|Xbox 360
Release|ORBIS = Release|ORBIS
Release|PS3 = Release|PS3
Release|Win32 = Release|Win32
Release|x64 = Release|x64
Release|Xbox 360 = Release|Xbox 360
@@ -162,8 +160,6 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|ORBIS.Build.0 = Debug|ORBIS
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|PS3.ActiveCfg = Debug|PS3
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|PS3.Build.0 = Debug|PS3
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Win32.ActiveCfg = Debug|Win32
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Win32.Build.0 = Debug|Win32
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|x64.ActiveCfg = Debug|x64
@@ -173,8 +169,6 @@ Global
{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|PS3.ActiveCfg = Release|PS3
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|PS3.Build.0 = Release|PS3
{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
@@ -183,503 +177,427 @@ Global
{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|PS3.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|PS3.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|PS3.ActiveCfg = Debug|PS3
{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}.Release|ORBIS.ActiveCfg = Release|ORBIS
{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|PS3.ActiveCfg = Release|PS3
{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
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|ORBIS.ActiveCfg = Debug|Win32
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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
@@ -687,8 +605,6 @@ Global
{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|PS3.ActiveCfg = Debug|PS3
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|PS3.Build.0 = Debug|PS3
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|Win32.ActiveCfg = Debug|Win32
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|Win32.Build.0 = Debug|Win32
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|Win32.Deploy.0 = Debug|Win32
@@ -700,8 +616,6 @@ Global
{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|PS3.ActiveCfg = Release|PS3
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|PS3.Build.0 = Release|PS3
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|Win32.ActiveCfg = Release|Win32
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|Win32.Build.0 = Release|Win32
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|Win32.Deploy.0 = Release|Win32
@@ -712,49 +626,42 @@ Global
{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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.ActiveCfg = Debug|Win32
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Debug|Win32.ActiveCfg = Debug|Win32
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Debug|Win32.Build.0 = Debug|Win32
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Debug|Win32.Deploy.0 = Debug|Win32
@@ -763,7 +670,6 @@ Global
{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|PS3.ActiveCfg = Release|Win32
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|Win32.ActiveCfg = Release|Win32
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|Win32.Build.0 = Release|Win32
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|Win32.Deploy.0 = Release|Win32
@@ -772,28 +678,24 @@ Global
{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|PS3.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|PS3.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|PS3.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|PS3.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
@@ -801,8 +703,6 @@ Global
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|Xbox 360.ActiveCfg = Release|Win32
{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|ORBIS.Build.0 = Debug|ORBIS
{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|PS3.ActiveCfg = Debug|PS3
{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|PS3.Build.0 = Debug|PS3
{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
@@ -812,8 +712,6 @@ Global
{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|ORBIS.ActiveCfg = Release|ORBIS
{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|ORBIS.Build.0 = Release|ORBIS
{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|PS3.ActiveCfg = Release|PS3
{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|PS3.Build.0 = Release|PS3
{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


+ 0
- 104
build/Lol (vs2014).sln ファイルの表示

@@ -141,12 +141,10 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ORBIS = Debug|ORBIS
Debug|PS3 = Debug|PS3
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Debug|Xbox 360 = Debug|Xbox 360
Release|ORBIS = Release|ORBIS
Release|PS3 = Release|PS3
Release|Win32 = Release|Win32
Release|x64 = Release|x64
Release|Xbox 360 = Release|Xbox 360
@@ -154,8 +152,6 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|ORBIS.Build.0 = Debug|ORBIS
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|PS3.ActiveCfg = Debug|PS3
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|PS3.Build.0 = Debug|PS3
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Win32.ActiveCfg = Debug|Win32
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Win32.Build.0 = Debug|Win32
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|x64.ActiveCfg = Debug|x64
@@ -165,8 +161,6 @@ Global
{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|PS3.ActiveCfg = Release|PS3
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|PS3.Build.0 = Release|PS3
{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
@@ -175,67 +169,57 @@ Global
{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|PS3.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|PS3.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|PS3.ActiveCfg = Debug|PS3
{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}.Release|ORBIS.ActiveCfg = Release|ORBIS
{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|PS3.ActiveCfg = Release|PS3
{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
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|ORBIS.ActiveCfg = Debug|Win32
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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
@@ -243,8 +227,6 @@ Global
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Xbox 360.ActiveCfg = Release|Win32
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|ORBIS.Build.0 = Debug|ORBIS
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|PS3.ActiveCfg = Debug|PS3
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|PS3.Build.0 = Debug|PS3
{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
@@ -254,8 +236,6 @@ Global
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|ORBIS.ActiveCfg = Release|ORBIS
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|ORBIS.Build.0 = Release|ORBIS
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|PS3.ActiveCfg = Release|PS3
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|PS3.Build.0 = Release|PS3
{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
@@ -265,8 +245,6 @@ Global
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|ORBIS.Build.0 = Debug|ORBIS
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|PS3.ActiveCfg = Debug|PS3
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|PS3.Build.0 = Debug|PS3
{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
@@ -276,8 +254,6 @@ Global
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|ORBIS.ActiveCfg = Release|ORBIS
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|ORBIS.Build.0 = Release|ORBIS
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|PS3.ActiveCfg = Release|PS3
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|PS3.Build.0 = Release|PS3
{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
@@ -287,8 +263,6 @@ Global
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|ORBIS.Build.0 = Debug|ORBIS
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|PS3.ActiveCfg = Debug|PS3
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|PS3.Build.0 = Debug|PS3
{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
@@ -298,8 +272,6 @@ Global
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|ORBIS.ActiveCfg = Release|ORBIS
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|ORBIS.Build.0 = Release|ORBIS
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|PS3.ActiveCfg = Release|PS3
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|PS3.Build.0 = Release|PS3
{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
@@ -309,8 +281,6 @@ Global
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|ORBIS.Build.0 = Debug|ORBIS
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|PS3.ActiveCfg = Debug|PS3
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|PS3.Build.0 = Debug|PS3
{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
@@ -320,8 +290,6 @@ Global
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|ORBIS.ActiveCfg = Release|ORBIS
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|ORBIS.Build.0 = Release|ORBIS
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|PS3.ActiveCfg = Release|PS3
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|PS3.Build.0 = Release|PS3
{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
@@ -331,8 +299,6 @@ Global
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|ORBIS.Build.0 = Debug|ORBIS
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|PS3.ActiveCfg = Debug|PS3
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|PS3.Build.0 = Debug|PS3
{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
@@ -342,8 +308,6 @@ Global
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|ORBIS.ActiveCfg = Release|ORBIS
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|ORBIS.Build.0 = Release|ORBIS
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|PS3.ActiveCfg = Release|PS3
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|PS3.Build.0 = Release|PS3
{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
@@ -352,366 +316,310 @@ Global
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Xbox 360.Build.0 = Release|Xbox 360
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|ORBIS.ActiveCfg = Debug|Win32
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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
@@ -719,8 +627,6 @@ Global
{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|PS3.ActiveCfg = Debug|PS3
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|PS3.Build.0 = Debug|PS3
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|Win32.ActiveCfg = Debug|Win32
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|Win32.Build.0 = Debug|Win32
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|Win32.Deploy.0 = Debug|Win32
@@ -732,8 +638,6 @@ Global
{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|PS3.ActiveCfg = Release|PS3
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|PS3.Build.0 = Release|PS3
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|Win32.ActiveCfg = Release|Win32
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|Win32.Build.0 = Release|Win32
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|Win32.Deploy.0 = Release|Win32
@@ -744,49 +648,42 @@ Global
{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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.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|PS3.ActiveCfg = Debug|Win32
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Debug|Win32.ActiveCfg = Debug|Win32
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Debug|Win32.Build.0 = Debug|Win32
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Debug|Win32.Deploy.0 = Debug|Win32
@@ -795,7 +692,6 @@ Global
{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|PS3.ActiveCfg = Release|Win32
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|Win32.ActiveCfg = Release|Win32
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|Win32.Build.0 = Release|Win32
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|Win32.Deploy.0 = Release|Win32


+ 1
- 1
build/Makefile.am ファイルの表示

@@ -3,7 +3,7 @@ include $(top_srcdir)/build/autotools/common.am

EXTRA_DIST += lol-build \
check-source.sh run-bitten.sh \
build-linux build-mingw build-mingw64 build-ps3 \
build-linux build-mingw build-mingw64 \
build-nacl32 build-nacl64 build-android build-html \
\
autotools/common.am


+ 0
- 24
build/autotools/common.am ファイルの表示

@@ -74,30 +74,6 @@ SUFFIXES += .lolfx
# | $(CXXCOMPILE) -xc++ -c - -o $@


#
# PS3 fself support rules
#

fself_gen = $(fself_gen_$(V))
fself_gen_ = $(fself_gen_$(AM_DEFAULT_VERBOSITY))
fself_gen_0 = echo " FSELF " $${x}.self;
fself_gen_1 = echo make_fself $${x}$(EXEEXT) $${x}.self;

all-local: all-local-ps3
all-local-ps3: $(PROGRAMS) $(noinst_PROGRAMS)
@if test -n "$^"; then for x in $(^:%$(EXEEXT)=%); do \
if test x$(MAKE_FSELF) != xno; then \
$(fself_gen) \
make_fself $${x}$(EXEEXT) $${x}.self; \
fi; \
done; fi

CLEANFILES += $(PROGRAMS:%$(EXEEXT)=%.self) \
$(PROGRAMS:%$(EXEEXT)=%.elf) \
$(noinst_PROGRAMS:%$(EXEEXT)=%.self) \
$(noinst_PROGRAMS:%$(EXEEXT)=%.elf)


#
# Win32 rules
#


+ 0
- 7
build/autotools/m4/lol-gl.m4 ファイルの表示

@@ -47,13 +47,6 @@ if test "x${ac_cv_my_stop_looking_for_gl}" = "xno"; then
GL_LIBS="${GL_LIBS} -lGLESv2 -lEGL -lvcos -lvchiq_arm -lbcm_host"])])
fi

dnl Use the PS3 PSGL?
if test "x${ac_cv_my_stop_looking_for_gl}" = "xno"; then
AC_CHECK_HEADERS(PSGL/psgl.h,
[ac_cv_my_have_gl="yes"
ac_cv_my_stop_looking_for_gl="yes"])
fi

if test "x${ac_cv_my_stop_looking_for_gl}" = "xno"; then
PKG_CHECK_MODULES(GLES2, glesv2,
[ac_cv_my_have_gl="yes"


+ 0
- 10
build/build-ps3 ファイルの表示

@@ -1,10 +0,0 @@
#!/bin/sh

# This can't hurt
make distclean

set -e
./build/lol-build "$@" bootstrap ps3-ppu
./build/lol-build "$@" configure ps3-ppu
./build/lol-build "$@" build ps3-ppu


+ 0
- 6
build/lol-build ファイルの表示

@@ -25,7 +25,6 @@
# - ios-arm
# - osx-amd64
# - android-arm
# - ps3-ppu
# - win*-i386
# - win*-amd64
# - raspi-arm
@@ -249,9 +248,6 @@ configure()
# HACK: use clang++ because of a memory leak in llvm-g++.
do_configure CXX=clang++ CC=clang
;;
ps3-ppu)
PATH="$PATH" do_configure CXX=ppu-lv2-g++ CC=ppu-lv2-gcc ac_cv_exeext=.elf --host=powerpc
;;
win*-i386|win*-amd64)
CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-2.0.3/include"
CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-image-2.0.0/include"
@@ -315,8 +311,6 @@ check()
;;
raspi-arm)
;;
ps3-ppu)
;;
nacl-*)
;;
web-*)


+ 0
- 3
build/msbuild/lol.config.props ファイルの表示

@@ -47,9 +47,6 @@
<PlatformToolset Condition="'$(SolutionName)'=='Lol (vs2013)'">v120</PlatformToolset>
<PlatformToolset Condition="'$(SolutionName)'=='Lol (vs2014)'">v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Platform)'=='PS3'" Label="Configuration">
<PlatformToolset>SNC</PlatformToolset>
</PropertyGroup>

<!--
- Import final settings from Visual Studio


+ 4
- 11
build/msbuild/lol.rules.props ファイルの表示

@@ -20,19 +20,16 @@
<AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(GlIncludes);$(SdlIncludes);$(FfmpegIncludes);$(D3d9Includes);$(XinputIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

<!-- Escape backslashes for C++, but replace \ with / on the PS3
because the SNC VSI seems to have trouble with backslashes -->
<PreprocessorDefinitions Condition="'$(Platform)'!='PS3' And '$(Platform)'!='Orbis'">LOL_CONFIG_PROJECTDIR="$(ProjectDir.Replace('\','\\'))";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Platform)'!='PS3' And '$(Platform)'!='Orbis'">LOL_CONFIG_SOLUTIONDIR="$(SolutionDir.Replace('\','\\'))";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Platform)'=='PS3'">LOL_CONFIG_PROJECTDIR="$(ProjectDir.Replace('\','/'))";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Platform)'=='PS3'">LOL_CONFIG_SOLUTIONDIR="$(SolutionDir.Replace('\','/'))";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<!-- Escape backslashes for C++, but replace \ with / on the PS4
because the SCE VSI seems to have trouble with backslashes -->
<PreprocessorDefinitions Condition="'$(Platform)'!='Orbis'">LOL_CONFIG_PROJECTDIR="$(ProjectDir.Replace('\','\\'))";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Platform)'!='Orbis'">LOL_CONFIG_SOLUTIONDIR="$(SolutionDir.Replace('\','\\'))";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Platform)'=='Orbis'">LOL_CONFIG_PROJECTDIR="$(ProjectDir.Replace('\','/'))";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Platform)'=='Orbis'">LOL_CONFIG_SOLUTIONDIR="$(SolutionDir.Replace('\','/'))";%(PreprocessorDefinitions)</PreprocessorDefinitions>

<PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">WIN32;$(Win32Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Platform)'=='x64'">WIN32;$(Win32Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Platform)'=='Xbox 360'">_XBOX;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Platform)'=='PS3'">$(Ps3Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Platform)'=='Orbis'">$(OrbisDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BufferSecurityCheck Condition="'$(Platform)'=='Xbox 360'">false</BufferSecurityCheck>
</ClCompile>
@@ -73,10 +70,6 @@
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">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)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories Condition="'$(Platform)'=='PS3'">$(Ps3Libs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories Condition="'$(Platform)'=='PS3'">$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies Condition="'$(Platform)'=='PS3'">$(Ps3Deps);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Platform)'=='PS3'">$(GlDeps);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories Condition="'$(Platform)'=='Orbis'">$(OrbisLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies Condition="'$(Platform)'=='Orbis'">$(OrbisDeps);%(AdditionalDependencies)</AdditionalDependencies>
</Link>


+ 0
- 13
build/msbuild/lol.vars.props ファイルの表示

@@ -64,13 +64,9 @@
<GlIncludes>$(GlewDir)\include\GL</GlIncludes>
<GlLibs Condition="'$(Platform)'=='Win32'">$(GlewDir)\lib\i686-w64-mingw32</GlLibs>
<GlLibs Condition="'$(Platform)'=='x64'">$(GlewDir)\lib\x86_64-w64-mingw32</GlLibs>
<GlLibs Condition="'$(Platform)|$(Configuration)'=='PS3|Debug'">$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\debug</GlLibs>
<GlLibs Condition="'$(Platform)|$(Configuration)'=='PS3|Release'">$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\opt</GlLibs>
<GlDeps Condition="'$(Platform)'=='Win32'">opengl32.lib;glew32s.lib</GlDeps>
<GlDeps Condition="'$(Platform)'=='x64'">opengl32.lib;glew32s.lib</GlDeps>
<GlDeps Condition="'$(Platform)'=='PS3'">libPSGL.a;libgcm_cmd.a;libgcm_sys_stub.a;libcgc.a;libPSGLcgc.a</GlDeps>
<Win32Defines Condition="'$(UseOpenGL)'=='true'">HAVE_GL_2X;USE_GLEW;GLEW_STATIC;$(Win32Defines)</Win32Defines>
<Ps3Defines>HAVE_GLES_2X;$(Ps3Defines)</Ps3Defines>

<!-- Direct3D 9 -->
<D3d9Includes>$(DXSDK_DIR)\Include</D3d9Includes>
@@ -90,12 +86,6 @@
<!-- Windows-specific -->
<Win32Defines>HAVE_STDIO_H;$(Win32Defines)</Win32Defines>

<!-- PS3-specific -->
<Ps3Deps>libsysmodule_stub.a;libsysutil_stub.a;libresc_stub.a;
libpngdec_stub.a;
libio_stub.a;libusbd_stub.a;libpadfilter.a;
libaudio_stub.a;libspurs_stub.a;libmstreamSPURSMP3.a</Ps3Deps>

<!-- PS4-specific -->
<OrbisDefines>HAVE_STDIO_H;
HAVE_PTHREAD_H;
@@ -152,9 +142,6 @@
<BuildMacro Include="XinputDeps"><Value>$(XinputDeps)</Value></BuildMacro>
<BuildMacro Include="Win32Defines"><Value>$(Win32Defines)</Value></BuildMacro>
<BuildMacro Include="XboxDefines"><Value>$(XboxDefines)</Value></BuildMacro>
<BuildMacro Include="Ps3Deps"><Value>$(Ps3Deps)</Value></BuildMacro>
<BuildMacro Include="Ps3Libs"><Value>$(Ps3Libs)</Value></BuildMacro>
<BuildMacro Include="Ps3Defines"><Value>$(Ps3Defines)</Value></BuildMacro>
<BuildMacro Include="OrbisDeps"><Value>$(OrbisDeps)</Value></BuildMacro>
<BuildMacro Include="OrbisLibs"><Value>$(OrbisLibs)</Value></BuildMacro>
<BuildMacro Include="OrbisDefines"><Value>$(OrbisDefines)</Value></BuildMacro>


+ 0
- 15
build/run-bitten.sh ファイルの表示

@@ -161,21 +161,6 @@ if [ -n "$XEDK" ]; then
fi
append ""

#
# PS3 development kit
#

append "[ps3sdk]"
# Try to "detect" the SNC compiler on Windows
if [ -n "$SN_PS3_PATH" ]; then
append "version = 410"
fi
# The setup is easier to detect on Linux
if [ -f "$CELLSDK/version-SDK" ]; then
append "version = $(cat "$CELLSDK/version-SDK")"
fi
append ""

#
# mingw32 / mingw-w64
#


+ 0
- 39
configure.ac ファイルの表示

@@ -237,45 +237,6 @@ AC_TRY_LINK(
AC_LANG_POP(C++)


dnl Are we on the PS3?
ac_cv_my_have_ps3="no"
AC_CHECK_LIB(sysmodule_stub, cellSysmoduleLoadModule,
[ac_cv_my_have_ps3="yes"
LOL_LIBS="${LOL_LIBS} -lsysmodule_stub -lsysutil_stub -lresc_stub"
dnl For PSGL
AC_DEFINE(HAVE_GLES_2X, 1, Define to 1 if GLES 2.x is available) # FIXME: hack
GL_LIBS="${GL_LIBS} -lPSGL -lgcm_cmd -lgcm_sys_stub"
dnl This is the old way; we now use CELL_SDK instead of CELLSDK
if test "x${CELLSDK}" != x -a "x${CELL_SDK}" = x; then
CELL_SDK="${CELLSDK}"
fi
if test "x${enable_debug}" = xyes; then
GL_LIBS="${GL_LIBS} -L${CELL_SDK}/target/ppu/lib/PSGL/RSX/debug"
elif test "x${enable_release}" = xyes; then
GL_LIBS="${GL_LIBS} -L${CELL_SDK}/target/ppu/lib/PSGL/RSX/ultra-opt"
else
GL_LIBS="${GL_LIBS} -L${CELL_SDK}/target/ppu/lib/PSGL/RSX/opt"
fi
dnl For the runtime Cg compiler
GL_LIBS="${GL_LIBS} -lcgc -lPSGLcgc"
dnl For the PNG decoder
LOL_LIBS="${LOL_LIBS} -lpngdec_stub"
dnl For the pad library
LOL_LIBS="${LOL_LIBS} -lio_stub -lusbd_stub -lpadfilter"
dnl For the audio library
LOL_LIBS="${LOL_LIBS} -laudio_stub -lspurs_stub -lmstreamSPURSMP3"
dnl For the filesystem support
LOL_LIBS="${LOL_LIBS} -lfs_stub"
dnl Disable this warning, it's too verbose with vector.h
AM_CXXFLAGS="${AM_CXXFLAGS} -Wno-sign-compare"
AC_PATH_PROG(MAKE_FSELF, make_fself, no)
if test "${MAKE_FSELF}" = "no"; then
AC_MSG_ERROR([[Building for PS3 but make_fself not found]])
fi],
[MAKE_FSELF=no])
AM_CONDITIONAL(USE_PS3, test "${ac_cv_my_have_ps3}" != "no")


dnl Are we building using MinGW?
LOL_TRY_CXXFLAGS(-mwindows -mwin32,
[AM_CXXFLAGS="${AM_CXXFLAGS} -mwindows -mwin32"


+ 0
- 8
demos/test/benchsuite.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>


+ 0
- 8
demos/test/btphystest.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>


+ 0
- 8
demos/test/meshviewer.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>


+ 1
- 9
demos/test/nacl_phystest.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@@ -84,4 +76,4 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
</ImportGroup>
</Project>
</Project>

+ 0
- 8
demos/tutorial/01_triangle.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>


+ 0
- 8
demos/tutorial/02_cube.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>


+ 0
- 8
demos/tutorial/03_noise.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>


+ 0
- 8
demos/tutorial/04_texture.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>


+ 0
- 8
demos/tutorial/05_easymesh.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>


+ 1
- 9
demos/tutorial/06_sprite.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@@ -76,4 +68,4 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
</ImportGroup>
</Project>
</Project>

+ 0
- 8
demos/tutorial/07_input.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>


+ 0
- 8
demos/tutorial/08_fbo.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>


+ 5
- 11
demos/tutorial/11_fractal.cpp ファイルの表示

@@ -63,7 +63,7 @@ public:
m_deltascale[i] = real("1");
m_dirty[i] = 2;
}
#if defined __CELLOS_LV2__ || defined _XBOX
#if defined _XBOX
//m_center = rcmplx(-.22815528839841, -1.11514249704382);
//m_center = rcmplx(0.001643721971153, 0.822467633298876);
m_center = rcmplx("-0.65823419062254", "0.50221777363480");
@@ -96,7 +96,7 @@ public:
uint8_t red = r * 255.99f;
uint8_t green = g * 255.99f;
uint8_t blue = b * 255.99f;
#if defined __CELLOS_LV2__ || defined _XBOX
#if defined _XBOX
m_palette.Push(u8vec4(255, red, green, blue));
#elif defined __native_client__
m_palette.Push(u8vec4(red, green, blue, 255));
@@ -182,7 +182,7 @@ public:

uint32_t buttons = 0;
//uint32_t buttons = Input::GetMouseButtons();
#if !defined __CELLOS_LV2__ && !defined _XBOX
#if !defined _XBOX
if (buttons & 0x2)
{
if (!m_drag)
@@ -242,7 +242,7 @@ public:
zoom = 1e-14 / m_radius;
}
m_radius *= zoom;
#if !defined __CELLOS_LV2__ && !defined _XBOX
#if !defined _XBOX
m_center += m_translate;
m_center = (m_center - worldmouse) * real(zoom) + worldmouse;
worldmouse = m_center
@@ -421,7 +421,7 @@ public:
}
else
{
#if defined __CELLOS_LV2__ || defined _XBOX
#if defined _XBOX
*m_pixelstart++ = u8vec4(255, 0, 0, 0);
#else
*m_pixelstart++ = u8vec4(0, 0, 0, 255);
@@ -502,15 +502,9 @@ public:

m_dirty[m_frame]--;

#if defined __CELLOS_LV2__
/* glTexSubImage2D is extremely slow on the PS3, to the point
* that uploading the whole texture is 40 times faster. */
m_texture->SetData(&m_pixels[0]);
#else
m_texture->SetSubData(ivec2(0, m_frame * m_size.y / 2),
m_size / 2,
&m_pixels[m_size.x * m_size.y / 4 * m_frame]);
#endif
}

m_shader->Bind();


+ 0
- 8
demos/tutorial/11_fractal.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>


+ 0
- 8
demos/tutorial/12_voronoi.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>


+ 1
- 9
demos/tutorial/13_shader_builder.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@@ -76,4 +68,4 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
</ImportGroup>
</Project>
</Project>

+ 0
- 1
doc/doxygen.cfg.in ファイルの表示

@@ -584,7 +584,6 @@ INPUT = .. \
../src/platform/android \
../src/platform/d3d9 \
../src/platform/nacl \
../src/platform/ps3 \
../src/platform/sdl \
../src/platform/xbox \
../src/thread


+ 0
- 9
src/Makefile.am ファイルの表示

@@ -20,7 +20,6 @@ liblolcore_a_SOURCES = \
$(liblolcore_headers) \
$(liblolcore_sources) \
\
$(ps3_sources) \
$(xbox_sources) \
$(nacl_sources) \
$(sdl_sources) \
@@ -146,14 +145,6 @@ nacl_sources = \
platform/nacl/opengl_context_ptrs.h
endif

if USE_PS3
ps3_sources = \
image/codec/ps3-image.cpp \
platform/ps3/threadbase.h \
platform/ps3/ps3app.cpp platform/ps3/ps3app.h \
platform/ps3/ps3input.cpp platform/ps3/ps3input.h
endif

if USE_X360
xbox_sources = \
platform/xbox/xboxapp.cpp platform/xbox/xboxapp.h \


+ 2
- 6
src/application/application.cpp ファイルの表示

@@ -16,9 +16,7 @@

#include "lolgl.h"

#if __CELLOS_LV2__
# include "platform/ps3/ps3app.h"
#elif _XBOX
#if _XBOX
# include "platform/xbox/xboxapp.h"
#elif __native_client__
# include "platform/nacl/nacl-app.h"
@@ -42,9 +40,7 @@ class ApplicationData
: app(name, resolution, framerate)
{ }

#if __CELLOS_LV2__
Ps3App app;
#elif _XBOX
#if _XBOX
XboxApp app;
#elif __native_client__
NaClApp app;


+ 0
- 4
src/base/string.cpp ファイルの表示

@@ -36,10 +36,6 @@ String String::Printf(char const *format, ...)

String String::VPrintf(char const *format, va_list ap)
{
#if defined __CELLOS_LV2__
using std::vsnprintf;
#endif

String ret;

va_list ap2;


+ 0
- 8
src/bullet/lolbullet.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>


+ 0
- 15
src/gpu/framebuffer.cpp ファイルの表示

@@ -98,14 +98,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 __CELLOS_LV2__
/* Supported drawable formats on the PS3: GL_ARGB_SCE, GL_RGB16F_ARB,
* GL_RGBA16F_ARB, GL_RGB32F_ARB, GL_RGBA32F_ARB, GL_LUMINANCE32F_ARB. */
case RGB_16_F: return GL_RGB16F_ARB;
case RGB_32_F: return GL_RGB32F_ARB;
case RGBA_8: return GL_ARGB_SCE;
case RGBA_16_F: return GL_RGBA16F_ARB;
case RGBA_32_F: return GL_RGBA32F_ARB;
#elif defined HAVE_GLES_2X
/* FIXME: incomplete */
case RGBA_8:
@@ -240,8 +232,6 @@ uint32_t FramebufferFormat::GetFormatOrder()
{
#if defined USE_D3D9 || defined _XBOX
/* FIXME: not implemented at all */
#elif defined __CELLOS_LV2__
/* FIXME: not implemented at all */
#elif defined HAVE_GLES_2X
/* FIXME: incomplete */
case R_8: case RG_8: case RGB_8: case RGBA_8:
@@ -342,11 +332,6 @@ Framebuffer::Framebuffer(ivec2 size, FramebufferFormat fbo_format)
GLenum internal_format = fbo_format.GetFormat();
GLenum format = fbo_format.GetFormatOrder();
GLenum depth = GL_DEPTH_COMPONENT;
# elif defined __CELLOS_LV2__
/* Supported drawable formats on the PS3: GL_ARGB_SCE, GL_RGB16F_ARB,
* GL_RGBA16F_ARB, GL_RGB32F_ARB, GL_RGBA32F_ARB, GL_LUMINANCE32F_ARB. */
GLenum internal_format = fbo_format.GetFormat();
GLenum format = fbo_format.GetFormatOrder();
# elif GL_ES_VERSION_2_0
/* In OpenGL ES, internal format and format must match. */
GLenum internal_format = fbo_format.GetFormat();


+ 1
- 1
src/gpu/renderer.cpp ファイルの表示

@@ -799,7 +799,7 @@ void Renderer::SetPolygonMode(PolygonMode mode)
m_data->m_d3d_dev->SetRenderState(D3DRS_FILLMODE, D3DFILL_SOLID);
break;
}
#elif defined __CELLOS_LV2__ || defined GL_VERSION_1_1
#elif defined GL_VERSION_1_1
switch (mode)
{
case PolygonMode::Point:


+ 27
- 149
src/gpu/shader.cpp ファイルの表示

@@ -95,13 +95,11 @@ private:
D3DVertexShader *vert_shader;
D3DPixelShader *frag_shader;
ID3DXConstantTable *vert_table, *frag_table;
#elif !defined __CELLOS_LV2__
#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
map<uint64_t, GLint> attrib_locations;
map<uint64_t, bool> attrib_errors;
#else
CGprogram vert_id, frag_id;
#endif
uint32_t vert_crc, frag_crc;

@@ -249,16 +247,12 @@ Shader::Shader(String const &name,
#endif
{ nullptr, nullptr }
};
#elif !defined __CELLOS_LV2__
#else
char errbuf[4096];
String shader_code;
GLchar const *gl_code;
GLint status;
GLsizei len;
#else
/* Initialise the runtime shader compiler. FIXME: this needs only
* to be done once. */
cgRTCgcInit();
#endif

/* Compile vertex shader */
@@ -282,7 +276,7 @@ Shader::Shader(String const &name,
data->m_dev->CreateVertexShader((DWORD *)shader_code->GetBufferPointer(),
&data->vert_shader);
shader_code->Release();
#elif !defined __CELLOS_LV2__
#else
shader_code = ShaderData::Patch(vert, ShaderType::Vertex);
data->vert_id = glCreateShader(GL_VERTEX_SHADER);
gl_code = shader_code.C();
@@ -302,15 +296,6 @@ Shader::Shader(String const &name,
Log::Debug("compile log for vertex shader %s: %s\n", name.C(), errbuf);
Log::Debug("shader source:\n%s\n", shader_code.C());
}
#else
data->vert_id = cgCreateProgram(cgCreateContext(), CG_SOURCE, vert,
cgGLGetLatestProfile(CG_GL_VERTEX),
nullptr, nullptr);
if (data->vert_id == nullptr)
{
Log::Error("failed to compile vertex shader %s\n", name.C());
Log::Error("shader source:\n%s\n", vert);
}
#endif

/* Compile fragment shader */
@@ -328,7 +313,7 @@ Shader::Shader(String const &name,
data->m_dev->CreatePixelShader((DWORD *)shader_code->GetBufferPointer(),
&data->frag_shader);
shader_code->Release();
#elif !defined __CELLOS_LV2__
#else
shader_code = ShaderData::Patch(frag, ShaderType::Fragment);
data->frag_id = glCreateShader(GL_FRAGMENT_SHADER);
gl_code = shader_code.C();
@@ -349,15 +334,6 @@ Shader::Shader(String const &name,
name.C(), errbuf);
Log::Debug("shader source:\n%s\n", shader_code.C());
}
#else
data->frag_id = cgCreateProgram(cgCreateContext(), CG_SOURCE, frag,
cgGLGetLatestProfile(CG_GL_FRAGMENT),
nullptr, nullptr);
if (data->frag_id == nullptr)
{
Log::Error("failed to compile fragment shader %s\n", name.C());
Log::Error("shader source:\n%s\n", frag);
}
#endif

#if defined USE_D3D9 || defined _XBOX
@@ -379,7 +355,7 @@ Shader::Shader(String const &name,
D3DXHANDLE h = data->vert_table->GetConstant(nullptr, i);
data->frag_table->GetConstantDesc(h, &cdesc, &count);
}
#elif !defined __CELLOS_LV2__
#else
/* Create program */
data->prog_id = glCreateProgram();
glAttachShader(data->prog_id, data->vert_id);
@@ -466,12 +442,7 @@ Shader::Shader(String const &name,

int Shader::GetAttribCount() const
{
#if !defined __CELLOS_LV2__
return data->attrib_locations.count();
#else
// TODO
return 0;
#endif
}

ShaderAttrib Shader::GetAttribLocation(VertexUsage usage, int index) const
@@ -480,7 +451,7 @@ ShaderAttrib Shader::GetAttribLocation(VertexUsage usage, int index) const
ret.m_flags = (uint64_t)(uint16_t)usage.ToScalar() << 16;
ret.m_flags |= (uint64_t)(uint16_t)index;
#if defined USE_D3D9 || defined _XBOX
#elif !defined __CELLOS_LV2__
#else
GLint l = -1;

if (!data->attrib_locations.try_get(ret.m_flags, l))
@@ -494,8 +465,6 @@ ShaderAttrib Shader::GetAttribLocation(VertexUsage usage, int index) const
}
}
ret.m_flags |= (uint64_t)(uint32_t)l << 32;
#else
/* FIXME: can we do this at all on the PS3? */
#endif
return ret;
}
@@ -529,12 +498,9 @@ ShaderUniform Shader::GetUniformLocation(char const *uni) const
ret.vert = cdesc.RegisterIndex;
ret.flags |= 2;
}
#elif !defined __CELLOS_LV2__
#else
ret.frag = (uintptr_t)glGetUniformLocation(data->prog_id, uni);
ret.vert = 0;
#else
ret.frag = (uintptr_t)cgGetNamedParameter(data->frag_id, uni);
ret.vert = (uintptr_t)cgGetNamedParameter(data->vert_id, uni);
#endif
return ret;
}
@@ -547,10 +513,8 @@ void Shader::SetUniform(ShaderUniform const &uni, int i)
{
#if defined USE_D3D9 || defined _XBOX
SetUniform(uni, ivec4(i, 0, 0, 0));
#elif !defined __CELLOS_LV2__
glUniform1i(uni.frag, i);
#else
/* FIXME: does this exist at all? cgGLSetParameter1i doesn't. */
glUniform1i(uni.frag, i);
#endif
}

@@ -558,10 +522,8 @@ void Shader::SetUniform(ShaderUniform const &uni, ivec2 const &v)
{
#if defined USE_D3D9 || defined _XBOX
SetUniform(uni, ivec4(v, 0, 0));
#elif !defined __CELLOS_LV2__
glUniform2i(uni.frag, v.x, v.y);
#else
/* FIXME: does this exist at all? */
glUniform2i(uni.frag, v.x, v.y);
#endif
}

@@ -569,10 +531,8 @@ void Shader::SetUniform(ShaderUniform const &uni, ivec3 const &v)
{
#if defined USE_D3D9 || defined _XBOX
SetUniform(uni, ivec4(v, 0));
#elif !defined __CELLOS_LV2__
glUniform3i(uni.frag, v.x, v.y, v.z);
#else
/* FIXME: does this exist at all? */
glUniform3i(uni.frag, v.x, v.y, v.z);
#endif
}

@@ -583,10 +543,8 @@ void Shader::SetUniform(ShaderUniform const &uni, ivec4 const &v)
data->m_dev->SetPixelShaderConstantI((UINT)uni.frag, &v[0], 1);
if (uni.flags & 2)
data->m_dev->SetVertexShaderConstantI((UINT)uni.vert, &v[0], 1);
#elif !defined __CELLOS_LV2__
glUniform4i(uni.frag, v.x, v.y, v.z, v.w);
#else
/* FIXME: does this exist at all? */
glUniform4i(uni.frag, v.x, v.y, v.z, v.w);
#endif
}

@@ -594,13 +552,8 @@ void Shader::SetUniform(ShaderUniform const &uni, float f)
{
#if defined USE_D3D9 || defined _XBOX
SetUniform(uni, vec4(f, 0, 0, 0));
#elif !defined __CELLOS_LV2__
glUniform1f(uni.frag, f);
#else
if (uni.frag)
cgGLSetParameter1f((CGparameter)uni.frag, f);
if (uni.vert)
cgGLSetParameter1f((CGparameter)uni.vert, f);
glUniform1f(uni.frag, f);
#endif
}

@@ -608,13 +561,8 @@ void Shader::SetUniform(ShaderUniform const &uni, vec2 const &v)
{
#if defined USE_D3D9 || defined _XBOX
SetUniform(uni, vec4(v, 0, 0));
#elif !defined __CELLOS_LV2__
glUniform2fv(uni.frag, 1, &v[0]);
#else
if (uni.frag)
cgGLSetParameter2fv((CGparameter)uni.frag, &v[0]);
if (uni.vert)
cgGLSetParameter2fv((CGparameter)uni.vert, &v[0]);
glUniform2fv(uni.frag, 1, &v[0]);
#endif
}

@@ -622,13 +570,8 @@ void Shader::SetUniform(ShaderUniform const &uni, vec3 const &v)
{
#if defined USE_D3D9 || defined _XBOX
SetUniform(uni, vec4(v, 0));
#elif !defined __CELLOS_LV2__
glUniform3fv(uni.frag, 1, &v[0]);
#else
if (uni.frag)
cgGLSetParameter3fv((CGparameter)uni.frag, &v[0]);
if (uni.vert)
cgGLSetParameter3fv((CGparameter)uni.vert, &v[0]);
glUniform3fv(uni.frag, 1, &v[0]);
#endif
}

@@ -639,13 +582,8 @@ void Shader::SetUniform(ShaderUniform const &uni, vec4 const &v)
data->m_dev->SetPixelShaderConstantF((UINT)uni.frag, &v[0], 1);
if (uni.flags & 2)
data->m_dev->SetVertexShaderConstantF((UINT)uni.vert, &v[0], 1);
#elif !defined __CELLOS_LV2__
glUniform4fv(uni.frag, 1, &v[0]);
#else
if (uni.frag)
cgGLSetParameter4fv((CGparameter)uni.frag, &v[0]);
if (uni.vert)
cgGLSetParameter4fv((CGparameter)uni.vert, &v[0]);
glUniform4fv(uni.frag, 1, &v[0]);
#endif
}

@@ -657,14 +595,8 @@ void Shader::SetUniform(ShaderUniform const &uni, mat2 const &m)
data->m_dev->SetPixelShaderConstantF((UINT)uni.frag, &m[0][0], 1);
if (uni.flags & 2)
data->m_dev->SetVertexShaderConstantF((UINT)uni.vert, &m[0][0], 1);
#elif !defined __CELLOS_LV2__
glUniformMatrix2fv(uni.frag, 1, GL_FALSE, &m[0][0]);
#else
mat4 tmp(m, 1.0f, 1.0f);
if (uni.frag)
cgGLSetMatrixParameterfc((CGparameter)uni.frag, &m[0][0]);
if (uni.vert)
cgGLSetMatrixParameterfc((CGparameter)uni.vert, &m[0][0]);
glUniformMatrix2fv(uni.frag, 1, GL_FALSE, &m[0][0]);
#endif
}

@@ -678,15 +610,8 @@ void Shader::SetUniform(ShaderUniform const &uni, mat3 const &m)
data->m_dev->SetPixelShaderConstantF((UINT)uni.frag, &tmp[0][0], 3);
if (uni.flags & 2)
data->m_dev->SetVertexShaderConstantF((UINT)uni.vert, &tmp[0][0], 3);
#elif !defined __CELLOS_LV2__
glUniformMatrix3fv(uni.frag, 1, GL_FALSE, &m[0][0]);
#else
/* FIXME: check it's the proper way to do this */
mat4 tmp(m, 1.0f);
if (uni.frag)
cgGLSetMatrixParameterfc((CGparameter)uni.frag, &m[0][0]);
if (uni.vert)
cgGLSetMatrixParameterfc((CGparameter)uni.vert, &m[0][0]);
glUniformMatrix3fv(uni.frag, 1, GL_FALSE, &m[0][0]);
#endif
}

@@ -697,13 +622,8 @@ void Shader::SetUniform(ShaderUniform const &uni, mat4 const &m)
data->m_dev->SetPixelShaderConstantF((UINT)uni.frag, &m[0][0], 4);
if (uni.flags & 2)
data->m_dev->SetVertexShaderConstantF((UINT)uni.vert, &m[0][0], 4);
#elif !defined __CELLOS_LV2__
glUniformMatrix4fv(uni.frag, 1, GL_FALSE, &m[0][0]);
#else
if (uni.frag)
cgGLSetMatrixParameterfc((CGparameter)uni.frag, &m[0][0]);
if (uni.vert)
cgGLSetMatrixParameterfc((CGparameter)uni.vert, &m[0][0]);
glUniformMatrix4fv(uni.frag, 1, GL_FALSE, &m[0][0]);
#endif
}

@@ -714,13 +634,11 @@ void Shader::SetUniform(ShaderUniform const &uni, TextureUniform tex, int index)
data->m_dev->SetSamplerState(index, D3DSAMP_MAGFILTER, tex.m_attrib & 0xff);
data->m_dev->SetSamplerState(index, D3DSAMP_MINFILTER, (tex.m_attrib >> 8) & 0xff);
data->m_dev->SetSamplerState(index, D3DSAMP_MIPFILTER, (tex.m_attrib >> 16) & 0xff);
#elif !defined __CELLOS_LV2__
#else
glActiveTexture(GL_TEXTURE0 + index);
//glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, (int)tex.m_flags);
SetUniform(uni, index);
#else
/* FIXME: unimplemented */
#endif
}

@@ -739,15 +657,8 @@ void Shader::SetUniform(ShaderUniform const &uni, array<float> const &v)
if (uni.flags & 2)
data->m_dev->SetVertexShaderConstantF((UINT)uni.vert,
&v[0], v.Count() / 4);
#elif !defined __CELLOS_LV2__
glUniform1fv(uni.frag, v.Count(), &v[0]);
#else
if (uni.frag)
cgGLSetParameterArray1f((CGparameter)uni.frag,
0, v.Count(), &v[0]);
if (uni.vert)
cgGLSetParameterArray1f((CGparameter)uni.vert,
0, v.Count(), &v[0]);
glUniform1fv(uni.frag, v.Count(), &v[0]);
#endif
}

@@ -762,15 +673,8 @@ void Shader::SetUniform(ShaderUniform const &uni, array<vec2> const &v)
if (uni.flags & 2)
data->m_dev->SetVertexShaderConstantF((UINT)uni.vert,
&v[0][0], v.Count() / 2);
#elif !defined __CELLOS_LV2__
glUniform2fv(uni.frag, v.Count(), &v[0][0]);
#else
if (uni.frag)
cgGLSetParameterArray2f((CGparameter)uni.frag,
0, v.Count(), &v[0][0]);
if (uni.vert)
cgGLSetParameterArray2f((CGparameter)uni.vert,
0, v.Count(), &v[0][0]);
glUniform2fv(uni.frag, v.Count(), &v[0][0]);
#endif
}

@@ -785,15 +689,8 @@ void Shader::SetUniform(ShaderUniform const &uni, array<vec3> const &v)
if (uni.flags & 2)
data->m_dev->SetVertexShaderConstantF((UINT)uni.vert,
&v[0][0], v.Count());
#elif !defined __CELLOS_LV2__
glUniform3fv(uni.frag, v.Count(), &v[0][0]);
#else
if (uni.frag)
cgGLSetParameterArray3f((CGparameter)uni.frag,
0, v.Count(), &v[0][0]);
if (uni.vert)
cgGLSetParameterArray3f((CGparameter)uni.vert,
0, v.Count(), &v[0][0]);
glUniform3fv(uni.frag, v.Count(), &v[0][0]);
#endif
}

@@ -806,15 +703,8 @@ void Shader::SetUniform(ShaderUniform const &uni, array<vec4> const &v)
if (uni.flags & 2)
data->m_dev->SetVertexShaderConstantF((UINT)uni.vert,
&v[0][0], v.Count());
#elif !defined __CELLOS_LV2__
glUniform4fv(uni.frag, v.Count(), &v[0][0]);
#else
if (uni.frag)
cgGLSetParameterArray4f((CGparameter)uni.frag,
0, v.Count(), &v[0][0]);
if (uni.vert)
cgGLSetParameterArray4f((CGparameter)uni.vert,
0, v.Count(), &v[0][0]);
glUniform4fv(uni.frag, v.Count(), &v[0][0]);
#endif
}

@@ -824,13 +714,8 @@ void Shader::Bind() const
HRESULT hr;
hr = data->m_dev->SetVertexShader(data->vert_shader);
hr = data->m_dev->SetPixelShader(data->frag_shader);
#elif !defined __CELLOS_LV2__
glUseProgram(data->prog_id);
#else
cgGLEnableProfile(cgGLGetLatestProfile(CG_GL_VERTEX));
cgGLBindProgram(data->vert_id);
cgGLEnableProfile(cgGLGetLatestProfile(CG_GL_FRAGMENT));
cgGLBindProgram(data->frag_id);
glUseProgram(data->prog_id);
#endif
}

@@ -840,13 +725,9 @@ void Shader::Unbind() const
HRESULT hr;
hr = data->m_dev->SetVertexShader(nullptr);
hr = data->m_dev->SetPixelShader(nullptr);
#elif !defined __CELLOS_LV2__
/* FIXME: untested */
glUseProgram(0);
#else
/* FIXME: untested */
cgGLDisableProfile(cgGLGetLatestProfile(CG_GL_VERTEX));
cgGLDisableProfile(cgGLGetLatestProfile(CG_GL_FRAGMENT));
glUseProgram(0);
#endif
}

@@ -857,15 +738,12 @@ Shader::~Shader()
data->vert_table->Release();
data->frag_shader->Release();
data->frag_table->Release();
#elif !defined __CELLOS_LV2__
#else
glDetachShader(data->prog_id, data->vert_id);
glDetachShader(data->prog_id, data->frag_id);
glDeleteShader(data->vert_id);
glDeleteShader(data->frag_id);
glDeleteProgram(data->prog_id);
#else
cgDestroyProgram(data->vert_id);
cgDestroyProgram(data->frag_id);
#endif
delete data;
}
@@ -875,7 +753,7 @@ int ShaderData::GetVersion()
{
static int version = 0;

#if !defined USE_D3D9 && !defined _XBOX && !defined __CELLOS_LV2__
#if !defined USE_D3D9 && !defined _XBOX
if (!version)
{
#if defined HAVE_GLES_2X


+ 1
- 14
src/gpu/texture.cpp ファイルの表示

@@ -129,11 +129,7 @@ Texture::Texture(ivec2 size, PixelFormat format)
{ 0, 0, 0, 0 }, /* Unknown */

/* FIXME: this is all mixed up for the RGBA/ARGB combinations */
#if __CELLOS_LV2__
{ GL_LUMINANCE8, GL_LUMINANCE, GL_UNSIGNED_BYTE, 1 },
{ GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE, 3 },
{ GL_ARGB_SCE, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4 },
#elif defined __native_client__ || defined HAVE_GLES_2X
#if defined __native_client__ || defined HAVE_GLES_2X
{ GL_LUMINANCE, GL_LUMINANCE, GL_UNSIGNED_BYTE, 1 },
{ GL_RGB, GL_RGB, GL_UNSIGNED_BYTE, 3 },
{ GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, 4 },
@@ -158,12 +154,6 @@ Texture::Texture(ivec2 size, PixelFormat format)
glGenTextures(1, &m_data->m_texture);
glBindTexture(GL_TEXTURE_2D, m_data->m_texture);

# if defined __CELLOS_LV2__
/* We need this hint because by default the storage type is
* GL_TEXTURE_SWIZZLED_GPU_SCE. */
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_ALLOCATION_HINT_SCE,
GL_TEXTURE_TILED_GPU_SCE);
# endif
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
#endif
@@ -334,9 +324,6 @@ void Texture::GenerateMipmaps()
m_data->m_texture->->GenerateMipSubLevels();
#elif defined _XBOX
/* FIXME: No direct mipmap generation support on X360 */
#elif defined __CELLOS_LV2__
glBindTexture(GL_TEXTURE_2D, m_data->m_texture);
glGenerateMipmapOES(GL_TEXTURE_2D);
#else
glBindTexture(GL_TEXTURE_2D, m_data->m_texture);
glGenerateMipmap(GL_TEXTURE_2D);


+ 1
- 52
src/gpu/vertexbuffer.cpp ファイルの表示

@@ -270,7 +270,7 @@ void VertexDeclaration::Unbind()
}
/* "NULL is an invalid input to SetVertexDeclaration" (DX9 guide), so
* we just don't touch the current vertex declaration. */
#elif !defined __CELLOS_LV2__
#else
for (int i = 0; i < m_count; i++)
{
if (m_streams[i].reg >= 0)
@@ -283,12 +283,6 @@ void VertexDeclaration::Unbind()
}
}
glBindBuffer(GL_ARRAY_BUFFER, 0);
#else
/* Or even: */
glDisableClientState(GL_VERTEX_ARRAY);
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
glDisableClientState(GL_NORMAL_ARRAY);
glDisableClientState(GL_COLOR_ARRAY);
#endif
}

@@ -361,27 +355,8 @@ void VertexDeclaration::SetStream(VertexBuffer *vb, ShaderAttrib attribs[])
uint32_t index = attribs[n].m_flags & 0xffff;
uint32_t reg = attribs[n].m_flags >> 32;

# if !defined __CELLOS_LV2__
if (reg != 0xffffffffu)
glEnableVertexAttribArray((GLint)reg);
# else
switch (usage.ToScalar())
{
case VertexUsage::Position:
glEnableClientState(GL_VERTEX_ARRAY);
break;
case VertexUsage::TexCoord:
case VertexUsage::TexCoordExt:
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
break;
case VertexUsage::Normal:
glEnableClientState(GL_NORMAL_ARRAY);
break;
case VertexUsage::Color:
glEnableClientState(GL_COLOR_ARRAY);
break;
}
# endif

/* We need to parse the whole vertex declaration to retrieve
* the information. It sucks. */
@@ -446,7 +421,6 @@ void VertexDeclaration::SetStream(VertexBuffer *vb, ShaderAttrib attribs[])
type_index = 0;


# if !defined __CELLOS_LV2__
if (reg != 0xffffffff)
{
if (tlut[type_index].type == GL_FLOAT
@@ -476,31 +450,6 @@ void VertexDeclaration::SetStream(VertexBuffer *vb, ShaderAttrib attribs[])
}
# endif
}
# else
switch (usage)
{
case VertexUsage::Position:
glVertexPointer(tlut[type_index].size, tlut[type_index].type,
stride, (GLvoid const *)(uintptr_t)offset);
break;
case VertexUsage::TexCoord:
case VertexUsage::TexCoordExt:
glTexCoordPointer(tlut[type_index].size, tlut[type_index].type,
stride, (GLvoid const *)(uintptr_t)offset);
break;
case VertexUsage::Normal:
glNormalPointer(tlut[type_index].type,
stride, (GLvoid const *)(uintptr_t)offset);
break;
case VertexUsage::Color:
glColorPointer(tlut[type_index].size, tlut[type_index].type,
stride, (GLvoid const *)(uintptr_t)offset);
break;
default:
Log::Error("vertex usage %d is not supported yet\n", usage);
break;
}
# endif
}
#endif
}


+ 0
- 196
src/image/codec/ps3-image.cpp ファイルの表示

@@ -1,196 +0,0 @@
//
// Lol Engine
//
// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
// 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 <lol/engine-internal.h>

#if defined __CELLOS_LV2__

#include <sys/paths.h>
#include <cell/sysmodule.h>
#include <cell/codec/pngdec.h>

#include "../../image/image-private.h"

namespace lol
{

/*
* Image implementation class
*/

class Ps3ImageCodec : public ImageCodec
{
public:
virtual bool Load(Image *image, char const *path);
virtual bool Save(Image *image, char const *path);
virtual bool Close();

virtual uint8_t *GetData() const;

private:
static void* Malloc(uint32_t size, void* data) { return malloc(size); };
static int32_t Free(void* ptr, void* data) { free(ptr); return 0; };
};

DECLARE_IMAGE_CODEC(Ps3ImageCodec, 100)

/*
* Public Image class
*/

bool Ps3ImageCodec::Load(Image *image, char const *path)
{
int32_t err;

/* Initialise decoding library */
CellPngDecMainHandle hmain;

err = cellSysmoduleLoadModule(CELL_SYSMODULE_FS);
if (err != CELL_OK)
{
Log::Error("could not open Fs sysmodule (0x%08x)\n", err);
return false;
}

err = cellSysmoduleLoadModule(CELL_SYSMODULE_PNGDEC);
if (err != CELL_OK)
{
Log::Error("could not open PngDec sysmodule (0x%08x)\n", err);
return false;
}

CellPngDecThreadInParam in_param;
in_param.spuThreadEnable = CELL_PNGDEC_SPU_THREAD_ENABLE;
in_param.ppuThreadPriority = 1000;
in_param.spuThreadPriority = 200;
in_param.cbCtrlMallocFunc = Ps3ImageCodec::Malloc;
in_param.cbCtrlMallocArg = nullptr;
in_param.cbCtrlFreeFunc = Ps3ImageCodec::Free;
in_param.cbCtrlFreeArg = nullptr;
CellPngDecThreadOutParam out_param;
err = cellPngDecCreate(&hmain, &in_param, &out_param);
if (err != CELL_OK)
{
Log::Error("could not create PngDec library (0x%08x)\n", err);
return false;
}

/* Create decoder */
CellPngDecSrc dec_src;
dec_src.srcSelect = CELL_PNGDEC_FILE;
dec_src.fileOffset = 0;
dec_src.fileSize = 0;
dec_src.streamPtr = nullptr;
dec_src.streamSize = 0;
dec_src.spuThreadEnable = CELL_PNGDEC_SPU_THREAD_ENABLE;
CellPngDecSubHandle hsub;
CellPngDecOpnInfo open_info;

array<String> pathlist = System::GetPathList(path);
for (int i = 0; i < pathlist.Count(); ++i)
{
String name = String(SYS_APP_HOME) + '/' + pathlist[i];
dec_src.fileName = name.C();
err = cellPngDecOpen(hmain, &hsub, &dec_src, &open_info);
if (err == CELL_OK)
break;
cellPngDecClose(hmain, hsub);
}

if (err != CELL_OK)
{
Log::Error("could not open %s for decoding (0x%08x)\n", path, err);
return false;
}

CellPngDecInfo info;
err = cellPngDecReadHeader(hmain, hsub, &info);
if (err != CELL_OK)
{
Log::Error("could not read image header in %s (0x%08x)\n", path, err);
return false;
}

CellPngDecInParam in_dec_param;
in_dec_param.commandPtr = nullptr;
in_dec_param.outputMode = CELL_PNGDEC_TOP_TO_BOTTOM;
in_dec_param.outputColorSpace = CELL_PNGDEC_RGBA;
in_dec_param.outputBitDepth = 8;
in_dec_param.outputPackFlag = CELL_PNGDEC_1BYTE_PER_1PIXEL;
in_dec_param.outputAlphaSelect = CELL_PNGDEC_STREAM_ALPHA;
in_dec_param.outputColorAlpha = 0xff;
CellPngDecOutParam out_dec_param;
err = cellPngDecSetParameter(hmain, hsub, &in_dec_param, &out_dec_param);
if (err != CELL_OK)
{
Log::Error("could not configure PngDec decoder (0x%08x)\n", err);
return false;
}

/* Decode image */
m_size = ivec2(info.imageWidth, info.imageHeight);
m_format = PixelFormat::RGBA_8;
pixels = (uint8_t *)malloc(info.imageWidth * 4 * info.imageHeight);
CellPngDecDataCtrlParam data_ctrl_param;
data_ctrl_param.outputBytesPerLine = info.imageWidth * 4;
CellPngDecDataOutInfo data_out_info;
err = cellPngDecDecodeData(hmain, hsub, pixels,
&data_ctrl_param, &data_out_info);
if (err != CELL_OK)
{
Log::Error("could not run PngDec decoder on %s (0x%08x)\n", path, err);
return false;
}

/* Close decoder */
err = cellPngDecClose(hmain, hsub);
if (err != CELL_OK)
{
Log::Error("could not close PngDec decoder (0x%08x)\n", err);
return false;
}

/* Deinitialise library */
err = cellPngDecDestroy(hmain);
if (err != CELL_OK)
{
Log::Error("could not destroy PngDec decoder (0x%08x)\n", err);
return false;
}
err = cellSysmoduleUnloadModule(CELL_SYSMODULE_PNGDEC);
err = cellSysmoduleUnloadModule(CELL_SYSMODULE_FS);

return true;
}

bool Ps3ImageCodec::Load(Image *image, char const *path)
{
UNUSED(path);

/* TODO: unimplemented */
return true;
}

bool Ps3ImageCodec::Close()
{
free(pixels);

return true;
}

uint8_t * Ps3ImageCodec::GetData() const
{
return pixels;
}

} /* namespace lol */

#endif /* defined __CELLOS_LV2__ */


+ 0
- 3
src/image/image.cpp ファイルの表示

@@ -40,9 +40,6 @@ static bool RegisterAllCodecs(array<ImageCodec *> &codeclist)
#if defined __APPLE__ && defined __MACH__ && defined __arm__
REGISTER_IMAGE_CODEC(IosImageCodec)
#endif
#if defined __CELLOS_LV2__
REGISTER_IMAGE_CODEC(Ps3ImageCodec)
#endif
#if defined USE_SDL_IMAGE
REGISTER_IMAGE_CODEC(SdlImageCodec)
#endif


+ 1
- 4
src/lol/base/assert.h ファイルの表示

@@ -19,11 +19,8 @@ namespace lol

static inline void Abort()
{
#if defined __CELLOS_LV2__
*(uint32_t *)nullptr = 0xdead;
#else
//*(uint32_t *)nullptr = 0xdead;
std::abort();
#endif
}

extern void DumpStack();


+ 0
- 5
src/lol/base/features.h ファイルの表示

@@ -29,11 +29,6 @@
# define LOL_FEATURE_THREADS 0
#endif

#if defined __CELLOS_LV2__
# undef LOL_FEATURE_CHEAP_BRANCHES
# define LOL_FEATURE_CHEAP_BRANCHES 0
#endif

/* Use this to disable code that causes compiler crashes. */
#if defined _MSC_VER
# undef LOL_FEATURE_VISUAL_STUDIO_THAT_FUCKING_PIECE_OF_SHIT_COMPILER


+ 1
- 6
src/lol/sys/thread.h ファイルの表示

@@ -18,12 +18,7 @@
// ---------------------
//

#if defined __CELLOS_LV2__
# include "platform/ps3/threadbase.h"
#else
# include "sys/threadbase.h"
#endif

#include "sys/threadbase.h"
#include "entity.h"

#include <functional>


+ 0
- 37
src/lolcore.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@@ -59,9 +51,6 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration">
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="Configuration">
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'" Label="Configuration">
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
@@ -79,10 +68,6 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="Configuration">
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'" Label="Configuration">
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
@@ -144,7 +129,6 @@
<ClCompile Include="image\codec\gdiplus-image.cpp" />
<ClCompile Include="image\codec\ios-image.cpp" />
<ClCompile Include="image\codec\oric-image.cpp" />
<ClCompile Include="image\codec\ps3-image.cpp" />
<ClCompile Include="image\codec\sdl-image.cpp" />
<ClCompile Include="image\codec\zed-image.cpp" />
<ClCompile Include="image\codec\zed-palette-image.cpp" />
@@ -189,8 +173,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -201,8 +183,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -213,8 +193,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -225,15 +203,11 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="platform\ps3\ps3app.cpp" />
<ClCompile Include="platform\ps3\ps3input.cpp" />
<ClCompile Include="platform\sdl\sdlapp.cpp" />
<ClCompile Include="platform\sdl\sdlinput.cpp" />
<ClCompile Include="platform\xbox\xboxapp.cpp" />
@@ -360,8 +334,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -372,8 +344,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -384,8 +354,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -396,16 +364,11 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="platform\ps3\ps3app.h" />
<ClInclude Include="platform\ps3\ps3input.h" />
<ClInclude Include="platform\ps3\threadbase.h" />
<ClInclude Include="platform\sdl\sdlapp.h" />
<ClInclude Include="platform\sdl\sdlinput.h" />
<ClInclude Include="platform\xbox\xboxapp.h" />


+ 0
- 21
src/lolcore.vcxproj.filters ファイルの表示

@@ -82,9 +82,6 @@
<Filter Include="platform\d3d9">
<UniqueIdentifier>{a914e15d-3201-467a-a9c9-d7c5244b13ee}</UniqueIdentifier>
</Filter>
<Filter Include="platform\ps3">
<UniqueIdentifier>{c6c6b597-ed6c-4d82-a166-964beeeeb525}</UniqueIdentifier>
</Filter>
<Filter Include="platform\nacl">
<UniqueIdentifier>{f6cc3470-c841-4581-969b-e60cea841c27}</UniqueIdentifier>
</Filter>
@@ -180,9 +177,6 @@
<ClCompile Include="image\codec\oric-image.cpp">
<Filter>image\codec</Filter>
</ClCompile>
<ClCompile Include="image\codec\ps3-image.cpp">
<Filter>image\codec</Filter>
</ClCompile>
<ClCompile Include="image\codec\sdl-image.cpp">
<Filter>image\codec</Filter>
</ClCompile>
@@ -291,12 +285,6 @@
<ClCompile Include="generated\lolfx-scanner.cpp">
<Filter>generated</Filter>
</ClCompile>
<ClCompile Include="platform\ps3\ps3app.cpp">
<Filter>platform\ps3</Filter>
</ClCompile>
<ClCompile Include="platform\ps3\ps3input.cpp">
<Filter>platform\ps3</Filter>
</ClCompile>
<ClCompile Include="gpu\lolfx-compiler.cpp">
<Filter>gpu</Filter>
</ClCompile>
@@ -627,15 +615,6 @@
<ClInclude Include="generated\lolfx-parser.h">
<Filter>gpu</Filter>
</ClInclude>
<ClInclude Include="platform\ps3\ps3app.h">
<Filter>platform\ps3</Filter>
</ClInclude>
<ClInclude Include="platform\ps3\ps3input.h">
<Filter>platform\ps3</Filter>
</ClInclude>
<ClInclude Include="platform\ps3\threadbase.h">
<Filter>platform\ps3</Filter>
</ClInclude>
<ClInclude Include="lol\base\array.h">
<Filter>lol\base</Filter>
</ClInclude>


+ 0
- 3
src/lolgl.h ファイルの表示

@@ -49,9 +49,6 @@
# if defined __APPLE__ && defined __MACH__
# include <OpenGLES/ES2/gl.h>
# include <OpenGLES/ES2/glext.h>
# elif defined __CELLOS_LV2__
# include <PSGL/psgl.h>
# include <PSGL/psglu.h>
# else
# include <GLES2/gl2.h>
# include <GLES2/gl2ext.h>


+ 0
- 8
src/lua/lollua.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>


+ 1
- 12
src/math/half.cpp ファイルの表示

@@ -10,14 +10,6 @@

#include <lol/engine-internal.h>

#if defined __CELLOS_LV2__
# if defined __SNC__
# include <ppu_altivec_internals.h>
# else
# include <altivec.h>
# endif
#endif

namespace lol
{

@@ -244,13 +236,10 @@ size_t half::convert(float *dst, half const *src, size_t nelem)
for (size_t i = 0; i < nelem; i++)
{
union { float f; uint32_t x; } u;
#if !defined __CELLOS_LV2__
/* This code is really too slow on the PS3, even with the denormal
* handling stripped off. */
u.x = half_to_float_nobranch((*src++).bits);
#else
u.x = half_to_float_branch((*src++).bits);
#endif
*dst++ = u.f;
}



+ 6
- 148
src/math/trig.cpp ファイルの表示

@@ -19,9 +19,7 @@
# define __likely(x) __builtin_expect(!!(x), 1)
# define __unlikely(x) __builtin_expect(!!(x), 0)
# define INLINEATTR __attribute__((always_inline))
# if defined __CELLOS_LV2__ && !defined __SNC__
# define FP_USE(x) __asm__("" : "+f" (x))
# elif defined __x86_64__
# if defined __x86_64__
# define FP_USE(x) __asm__("" : "+x" (x))
# elif defined __i386__ /* FIXME: this isn't good */
# define FP_USE(x) __asm__("" : "+m" (x))
@@ -104,119 +102,15 @@ static const double TC[] =
2.373e5,
};

#if defined __CELLOS_LV2__
static inline double lol_fctid(double x) INLINEATTR;
static inline double lol_fctidz(double x) INLINEATTR;
static inline double lol_fcfid(double x) INLINEATTR;
static inline double lol_frsqrte(double x) INLINEATTR;
static inline double lol_fsel(double c, double gte, double lt) INLINEATTR;
static inline double lol_fres(double x) INLINEATTR;
static inline double lol_fdiv(double a, double b) INLINEATTR;
#endif
static inline double lol_fabs(double x) INLINEATTR;
#if defined __GNUC__
static inline double lol_round(double x) INLINEATTR;
static inline double lol_trunc(double x) INLINEATTR;
#endif

#if defined __CELLOS_LV2__
static inline double lol_fctid(double x)
{
double r;
#if defined __SNC__
r = __builtin_fctid(x);
#else
__asm__ ("fctid %0, %1"
: "=f" (r) : "f" (x));
#endif
return r;
}

static double lol_fctidz(double x)
{
double r;
#if defined __SNC__
r = __builtin_fctidz(x);
#else
__asm__ ("fctidz %0, %1"
: "=f" (r) : "f" (x));
#endif
return r;
}

static double lol_fcfid(double x)
{
double r;
#if defined __SNC__
r = __builtin_fcfid(x);
#else
__asm__ ("fcfid %0, %1"
: "=f" (r) : "f" (x));
#endif
return r;
}

static double lol_frsqrte(double x)
{
#if defined __SNC__
return __builtin_frsqrte(x);
#else
double r;
__asm__ ("frsqrte %0, %1"
: "=f" (r) : "f" (x));
return r;
#endif
}

static inline double lol_fsel(double c, double gte, double lt)
{
#if defined __CELLOS_LV2__ && defined __SNC__
return __fsel(c, gte, lt);
#elif defined __CELLOS_LV2__
double r;
__asm__ ("fsel %0, %1, %2, %3"
: "=f" (r) : "f" (c), "f" (gte), "f" (lt));
return r;
#else
return (c >= 0) ? gte : lt;
#endif
}

static inline double lol_fres(double x)
{
double ret;
#if defined __SNC__
ret = __builtin_fre(x);
#else
__asm__ ("fres %0, %1"
: "=f" (ret) : "f" (x));
#endif
return ret;
}

static inline double lol_fdiv(double a, double b)
{
/* Estimate */
double x0 = lol_fres(b);

/* Two steps of Newton-Raphson */
x0 = (b * x0 - ONE) * -x0 + x0;
x0 = (b * x0 - ONE) * -x0 + x0;

return a * x0;
}
#endif /* __CELLOS_LV2__ */

static inline double lol_fabs(double x)
{
#if defined __CELLOS_LV2__ && defined __SNC__
return __fabs(x);
#elif defined __CELLOS_LV2__
double r;
__asm__ ("fabs %0, %1"
: "=f" (r) : "f" (x));
return r;
#elif defined __GNUC__
#if defined __GNUC__
return __builtin_fabs(x);
#else
using std::fabs;
@@ -227,20 +121,12 @@ static inline double lol_fabs(double x)
#if defined __GNUC__
static inline double lol_round(double x)
{
#if defined __CELLOS_LV2__
return lol_fcfid(lol_fctid(x));
#else
return __builtin_round(x);
#endif
}

static inline double lol_trunc(double x)
{
#if defined __CELLOS_LV2__
return lol_fcfid(lol_fctidz(x));
#else
return __builtin_trunc(x);
#endif
}
#endif

@@ -267,12 +153,6 @@ double lol_sin(double x)
/* Wrap |x| to the range [-1, 1] and keep track of the number of
* cycles required. If odd, we'll need to change the sign of the
* result. */
#if defined __CELLOS_LV2__
double sign = lol_fsel(x, D_PI, -D_PI);
double num_cycles = lol_round(absx);
double is_even = lol_trunc(num_cycles * HALF) - (num_cycles * HALF);
sign = lol_fsel(is_even, sign, -sign);
#else
double num_cycles = absx + TWO_EXP_52;
FP_USE(num_cycles); num_cycles -= TWO_EXP_52;

@@ -282,7 +162,7 @@ double lol_sin(double x)
FP_USE(is_even);
is_even -= TWO * num_cycles - ONE;
double sign = is_even;
#endif
absx -= num_cycles;

/* If branches are very cheap, we have the option to do the Taylor
@@ -303,9 +183,7 @@ double lol_sin(double x)
}
#endif

#if !defined __CELLOS_LV2__
sign *= (x >= 0.0) ? D_PI : -D_PI;
#endif

/* Compute a Tailor series for sin() and combine sign information. */
double x2 = absx * absx;
@@ -338,11 +216,6 @@ double lol_cos(double x)
}
#endif

#if defined __CELLOS_LV2__
double num_cycles = lol_round(absx);
double is_even = lol_trunc(num_cycles * HALF) - (num_cycles * HALF);
double sign = lol_fsel(is_even, ONE, NEG_ONE);
#else
double num_cycles = absx + TWO_EXP_52;
FP_USE(num_cycles); num_cycles -= TWO_EXP_52;

@@ -352,7 +225,7 @@ double lol_cos(double x)
FP_USE(is_even);
is_even -= TWO * num_cycles - ONE;
double sign = is_even;
#endif
absx -= num_cycles;

#if LOL_FEATURE_VERY_CHEAP_BRANCHES
@@ -410,14 +283,6 @@ void lol_sincos(double x, double *sinx, double *cosx)
}
#endif

#if defined __CELLOS_LV2__
double num_cycles = lol_round(absx);
double is_even = lol_trunc(num_cycles * HALF) - (num_cycles * HALF);

double sin_sign = lol_fsel(x, D_PI, -D_PI);
sin_sign = lol_fsel(is_even, sin_sign, -sin_sign);
double cos_sign = lol_fsel(is_even, ONE, NEG_ONE);
#else
double num_cycles = absx + TWO_EXP_52;
FP_USE(num_cycles); num_cycles -= TWO_EXP_52;

@@ -428,7 +293,7 @@ void lol_sincos(double x, double *sinx, double *cosx)
is_even -= TWO * num_cycles - ONE;
double sin_sign = is_even;
double cos_sign = is_even;
#endif
absx -= num_cycles;

#if LOL_FEATURE_VERY_CHEAP_BRANCHES
@@ -455,9 +320,7 @@ void lol_sincos(double x, double *sinx, double *cosx)
}
#endif

#if !defined __CELLOS_LV2__
sin_sign *= (x >= 0.0) ? D_PI : -D_PI;
#endif

double x2 = absx * absx;
double x4 = x2 * x2;
@@ -514,15 +377,10 @@ double lol_tan(double x)

/* Ensure cosx isn't zero. FIXME: we lose the cosx sign here. */
double absc = lol_fabs(cosx);
#if defined __CELLOS_LV2__
double is_cos_not_zero = absc - VERY_SMALL_NUMBER;
cosx = lol_fsel(is_cos_not_zero, cosx, VERY_SMALL_NUMBER);
return lol_fdiv(sinx, cosx);
#else

if (__unlikely(absc < VERY_SMALL_NUMBER))
cosx = VERY_SMALL_NUMBER;
return sinx / cosx;
#endif
}

} /* namespace lol */


+ 1
- 1
src/platform/nacl/nacl-app.cpp ファイルの表示

@@ -17,7 +17,7 @@ namespace lol
{

/*
* PS3 App implementation class
* NaCl App implementation class
*/

class NaClAppData


+ 0
- 275
src/platform/ps3/ps3app.cpp ファイルの表示

@@ -1,275 +0,0 @@
//
// Lol Engine
//
// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
// 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 <lol/engine-internal.h>

#if defined __CELLOS_LV2__
# include <sys/ppu_thread.h> /* sys_ppu_thread_get_stack_information */
# include <sys/spu_initialize.h>
# include <sys/paths.h> /* SYS_HOST_ROOT */
# include <cell/sysmodule.h>
# include <PSGL/psgl.h>

# include <cell/mstream.h> /* multistream */

# include <cell/spurs/control.h> /* SPURS */
# include <cell/spurs/task.h>
# include <cell/spurs/event_flag.h>
#endif

#include "lolgl.h"
#include "ps3app.h"
#include "ps3input.h"

namespace lol
{

/*
* PS3 App implementation class
*/

/* FIXME: this shouldn't be a global */
static unsigned int port_num;

class Ps3AppData
{
friend class Ps3App;

private:
#if defined __CELLOS_LV2__
static void SysCallBack(uint64_t status, uint64_t param, void *data)
{
if (status == CELL_SYSUTIL_REQUEST_EXITGAME)
Ticker::Shutdown();
}

static void MultiStreamThread(uint64_t param)
{
Timer t;
cellAudioPortStart(port_num);
/* FIXME: quit gracefully if needed */
while (true)
{
if (!cellMSSystemSignalSPU())
{
t.Get();
t.Wait(1.f / 60.f / 32);
}

cellMSSystemGenerateCallbacks();
}
cellAudioPortStop(port_num);
sys_ppu_thread_exit(0);
}

CellSpurs m_spurs __attribute__((aligned (128)));
#endif
};

/*
* Public Ps3App class
*/

Ps3App::Ps3App(char const *title, ivec2 res, float fps) :
data(new Ps3AppData())
{
#if defined __CELLOS_LV2__
sys_spu_initialize(6, 1);

/* FIXME: we should check for CELL_SYSMODULE_ERROR_UNKNOWN and others,
* but what could we do anyway? */
cellSysmoduleLoadModule(CELL_SYSMODULE_GCM_SYS);
cellSysmoduleLoadModule(CELL_SYSMODULE_FS);
cellSysmoduleLoadModule(CELL_SYSMODULE_USBD);
cellSysmoduleLoadModule(CELL_SYSMODULE_IO);

cellSysutilRegisterCallback(0, Ps3AppData::SysCallBack, nullptr);

PSGLinitOptions psglio;
psglio.enable = PSGL_INIT_MAX_SPUS
| PSGL_INIT_INITIALIZE_SPUS
| PSGL_INIT_HOST_MEMORY_SIZE;
psglio.maxSPUs = 1;
psglio.initializeSPUs = false;
psglio.hostMemorySize = 128 * 1024 * 1024;

psglInit(&psglio);

#if 0
sys_ppu_thread_stack_t stack;
sys_ppu_thread_get_stack_information(&stack);
printf("stack starts at %p, ends at %p\n", stack.pst_addr,
(uint8_t *)stack.pst_addr + stack.pst_size);
#endif

PSGLdeviceParameters psgldp;
psgldp.enable = PSGL_DEVICE_PARAMETERS_COLOR_FORMAT
| PSGL_DEVICE_PARAMETERS_DEPTH_FORMAT
| PSGL_DEVICE_PARAMETERS_MULTISAMPLING_MODE
| PSGL_DEVICE_PARAMETERS_WIDTH_HEIGHT;
psgldp.colorFormat = GL_ARGB_SCE; /* can also be GL_RGBA16F_ARB */
psgldp.depthFormat = GL_DEPTH_COMPONENT16; /* can also be 24-bit */
psgldp.multisamplingMode = GL_MULTISAMPLING_4X_SQUARE_ROTATED_SCE;
psgldp.width = 720;
psgldp.height = 480;

/* Find closest valid resolution */
ivec2 const valid_resolutions[8] =
{
ivec2( 720, 480),
ivec2( 720, 576),
ivec2(1280, 720),
ivec2(1920, 1080),
ivec2( 960, 1080),
ivec2(1280, 1080),
ivec2(1440, 1080),
ivec2(1600, 1080),
};

for (int i = 0; i < 8; ++i)
{
ivec2 cur(psgldp.width, psgldp.height);
if (sqlength(valid_resolutions[i] - res) < sqlength(cur - res))
{
psgldp.width = valid_resolutions[i].x;
psgldp.height = valid_resolutions[i].y;
}
}

/* Create graphics device */
PSGLdevice* psgl = psglCreateDeviceExtended(&psgldp);
if (!psgl)
Log::Error("could not create PSGL device; expect imminent crash\n");

GLuint w, h;
psglGetDeviceDimensions(psgl, &w, &h);
ivec2 newres(w, h);
Log::Debug("resolution asked %d×%d, closest valid %d×%d, final %d×%d\n",
res.x, res.y, psgldp.width, psgldp.height, newres.x, newres.y);

PSGLcontext *ctx = psglCreateContext();
psglMakeCurrent(ctx, psgl);
/* TODO: load our shaders when we actually ship them */
//psglLoadShaderLibrary("/shaders.bin");
psglResetCurrentContext();

/* Create audio device */
cellSysmoduleLoadModule(CELL_SYSMODULE_IO);
cellSysmoduleLoadModule(CELL_SYSMODULE_AUDIO);
cellSysmoduleLoadModule(CELL_SYSMODULE_RESC);
cellSysmoduleLoadModule(CELL_SYSMODULE_SPURS);

int ret = cellMSSystemConfigureSysUtilEx(CELL_MS_AUDIOMODESELECT_SUPPORTSLPCM
| CELL_MS_AUDIOMODESELECT_SUPPORTSDOLBY
| CELL_MS_AUDIOMODESELECT_SUPPORTSDTS
| CELL_MS_AUDIOMODESELECT_PREFERDOLBY);
int num_chans = ret & 0xf;
int has_dolby = (ret & 0x10) >> 4;
int has_dts = (ret & 0x20) >> 5;

Log::Debug("audio channels %d, dolby %d, DTS %d\n",
num_chans, has_dolby, has_dts);
ret = cellAudioInit();

CellAudioPortParam ap;
memset(&ap, 0, sizeof(ap));
ap.nChannel = CELL_AUDIO_PORT_8CH;
ap.nBlock = CELL_AUDIO_BLOCK_8;
ret = cellAudioPortOpen(&ap, &port_num);
Log::Debug("audio port %d\n", port_num);

CellAudioPortConfig pc;
ret = cellAudioGetPortConfig(port_num, &pc);

cellMSSystemConfigureLibAudio(&ap, &pc);

CellMSSystemConfig cfg;
cfg.channelCount = 400; /* Maximum number of streams */
cfg.subCount = 31; /* ? */
cfg.dspPageCount = 5;
cfg.flags = CELL_MS_NOFLAGS;

uint8_t const prios[8] = { 1, 0, 0, 0, 0, 0, 0, 0 };
int mem_needed = cellMSSystemGetNeededMemorySize(&cfg);
void *ms_mem = memalign(128, mem_needed);
sys_ppu_thread_t tid;
sys_ppu_thread_get_id(&tid);
int tprio;
sys_ppu_thread_get_priority(tid, &tprio);
cellSpursInitialize(&data->m_spurs, 1, 250 /* thread group priority */,
tprio - 1, false);
cellMSSystemInitSPURS(ms_mem, &cfg, &data->m_spurs, &prios[0]);

float const bus_vols[64] =
{
1.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 1.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 0.f, 1.f, 0.f, 0.f, 0.f, 0.f, 0.f,
0.f, 0.f, 0.f, 1.f, 0.f, 0.f, 0.f, 0.f,
0.f, 0.f, 0.f, 0.f, 1.f, 0.f, 0.f, 0.f,
0.f, 0.f, 0.f, 0.f, 0.f, 1.f, 0.f, 0.f,
0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 1.f, 0.f,
0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 1.f,
};

sys_ppu_thread_t thread;
ret = sys_ppu_thread_create(&thread, Ps3AppData::MultiStreamThread,
nullptr, 0 /* Server prio */,
0x4000 /* 16 KiB stack */,
SYS_PPU_THREAD_CREATE_JOINABLE,
"Audio Thread");

cellMSCoreSetVolume64(CELL_MS_SUBBUS_1, CELL_MS_DRY, bus_vols);
cellMSCoreSetVolume64(CELL_MS_MASTER_BUS, CELL_MS_DRY, bus_vols);

/* Initialise everything */
Ticker::Setup(fps);
Video::Setup(newres);
Audio::Setup(2);

/* Autoreleased objects */
new Ps3Input();
#endif
}

void Ps3App::ShowPointer(bool show)
{
;
}

void Ps3App::Tick()
{
/* Tick the renderer, show the frame and clamp to desired framerate. */
Ticker::TickDraw();

#if defined __CELLOS_LV2__
psglSwap();

/* Check if exit callback was called */
cellSysutilCheckCallback();
#endif
}

Ps3App::~Ps3App()
{
#if defined __CELLOS_LV2__
glFinish();

/* Unload audio modules */
cellSysmoduleUnloadModule(CELL_SYSMODULE_IO);
cellSysmoduleUnloadModule(CELL_SYSMODULE_AUDIO);
cellSysmoduleUnloadModule(CELL_SYSMODULE_RESC);
cellSysmoduleUnloadModule(CELL_SYSMODULE_SPURS);
#endif
delete data;
}

} /* namespace lol */


+ 0
- 39
src/platform/ps3/ps3app.h ファイルの表示

@@ -1,39 +0,0 @@
//
// Lol Engine
//
// Copyright: (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
// 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 Ps3App class
// ----------------
//

#include "lol/math/vector.h"

namespace lol
{

class Ps3AppData;

class Ps3App
{
public:
Ps3App(char const *title, ivec2 res, float fps);
virtual ~Ps3App();

void ShowPointer(bool show);
void Tick();

private:
Ps3AppData *data;
};

} /* namespace lol */


+ 0
- 180
src/platform/ps3/ps3input.cpp ファイルの表示

@@ -1,180 +0,0 @@
//
// Lol Engine
//
// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
// 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 <lol/engine-internal.h>

#include <cstdlib>

#if defined __CELLOS_LV2__
# include <cell/pad.h>
# include <cell/padfilter.h>
# include <sysutil/sysutil_sysparam.h>
#endif

#include "ps3input.h"

namespace lol
{

static int const NUM_PADS = 7; /* CellPadUtil also has 7 */

/*
* PS3 Input implementation class
*/

class Ps3InputData
{
friend class Ps3Input;

#if defined __CELLOS_LV2__
array<int, Stick *> m_joysticks;

vec2 mousepos;
ivec3 mousebuttons;

CellPadData pad_data[NUM_PADS];
CellPadFilterIIRSos filter_sos[NUM_PADS][4];
bool circle_validates;
#endif
};

/*
* Public Ps3Input class
*/

Ps3Input::Ps3Input()
: m_data(new Ps3InputData())
{
#if defined __CELLOS_LV2__
int32_t ret = cellPadInit(NUM_PADS);
if (ret != CELL_OK && ret != CELL_PAD_ERROR_ALREADY_INITIALIZED)
{
Log::Error("could not initialise PS3 pad library\n");
exit(1);
}

int tmp;
ret = cellSysutilGetSystemParamInt(
CELL_SYSUTIL_SYSTEMPARAM_ID_ENTER_BUTTON_ASSIGN, &tmp);
m_data->circle_validates =
(ret == CELL_OK && tmp == CELL_SYSUTIL_ENTER_BUTTON_ASSIGN_CIRCLE);

for (int i = 0; i < NUM_PADS; i++)
for (int j = 0; j < 4; j++)
cellPadFilterIIRInit(&m_data->filter_sos[i][j],
CELL_PADFILTER_IIR_CUTOFF_2ND_LPF_BT_010);

m_data->mousepos = vec2(320.0f, 240.0f);
m_data->mousebuttons = ivec3(0, 0, 0);

m_gamegroup = GAMEGROUP_BEFORE;
#endif
}

void Ps3Input::TickGame(float seconds)
{
Entity::TickGame(seconds);

#if defined __CELLOS_LV2__
CellPadInfo2 pad_info2;
int32_t ret = cellPadGetInfo2(&pad_info2);
if (ret != CELL_PAD_OK)
return;

/* Try to detect newly connected pads. */
for (int i = 0; i < NUM_PADS; i++)
{
if (!(pad_info2.port_status[i] & CELL_PAD_STATUS_CONNECTED))
continue;

bool new_stick = true;
for (int j = 0; j < m_data->m_joysticks.Count(); ++j)
if (m_data->m_joysticks[j].m1 == i)
new_stick = false;

if (new_stick)
{
Stick *stick = Input::CreateStick();
stick->SetAxisCount(4);
stick->SetButtonCount(16);
m_data->m_joysticks.Push(i, stick);
}
}

/* Update pad status */
for (int i = 0; i < m_data->m_joysticks.Count(); i++)
{
int j = m_data->m_joysticks[i].m1;

if (!(pad_info2.port_status[j] & CELL_PAD_STATUS_CONNECTED))
continue;

/* Propagate all buttons */
uint16_t bitmap1 = m_data->pad_data[j].button[CELL_PAD_BTN_OFFSET_DIGITAL1];
for (int k = 0; k < 8; k++)
m_data->m_joysticks[i].m2->SetButton(k, bitmap1 & (1 << k));
uint16_t bitmap2 = m_data->pad_data[j].button[CELL_PAD_BTN_OFFSET_DIGITAL2];
for (int k = 0; k < 8; k++)
m_data->m_joysticks[i].m2->SetButton(8 + k, bitmap2 & (1 << k));

/* Get Pad status. If the data hasn't changed since the last call,
* data->pad[j].len will be 0 but we carry on anyway. */
ret = cellPadGetData(j, &m_data->pad_data[j]);
if (ret != CELL_PAD_OK)
continue;

if (!(pad_info2.system_info & CELL_PAD_INFO_INTERCEPTED))
{
int x = m_data->pad_data[j].button[CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X];
int y = m_data->pad_data[j].button[CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X + 1];
int x2 = m_data->pad_data[j].button[CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X];
int y2 = m_data->pad_data[j].button[CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X + 1];

/* Propagate all axes */
m_data->m_joysticks[i].m2->SetAxis(0, (x - 127) / 127.0f);
m_data->m_joysticks[i].m2->SetAxis(1, (y - 127) / 127.0f);
m_data->m_joysticks[i].m2->SetAxis(2, (x2 - 127) / 127.0f);
m_data->m_joysticks[i].m2->SetAxis(3, (y2 - 127) / 127.0f);

/* Right stick moves the mouse FIXME: deprecated */
vec2 delta(4.f * (abs(x - 127) < 16 ? 0 : x - 127),
-4.f * (abs(y - 127) < 16 ? 0 : y - 127));
m_data->mousepos += delta * seconds;
Input::SetMousePos((ivec2)m_data->mousepos);
}

/* L1 or R1 for mouse button FIXME: deprecated */
int but = (m_data->pad_data[j].button[CELL_PAD_BTN_OFFSET_DIGITAL2]
& CELL_PAD_CTRL_L1)
|| (m_data->pad_data[j].button[CELL_PAD_BTN_OFFSET_DIGITAL2]
& CELL_PAD_CTRL_R1);
if (but && !m_data->mousebuttons.x)
Input::SetMouseButton(0);
else if (!but && m_data->mousebuttons.x)
Input::UnsetMouseButton(0);

m_data->mousebuttons.x = but;
}
#endif
}

Ps3Input::~Ps3Input()
{
#if defined __CELLOS_LV2__
for (int i = 0; i < m_data->m_joysticks.Count(); ++i)
{
Input::DestroyStick(m_data->m_joysticks[0].m2);
}
#endif
delete m_data;
}

} /* namespace lol */


+ 0
- 39
src/platform/ps3/ps3input.h ファイルの表示

@@ -1,39 +0,0 @@
//
// Lol Engine
//
// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
// 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 Ps3Input class
// ------------------
//

#include "entity.h"

namespace lol
{

class Ps3InputData;

class Ps3Input : public Entity
{
public:
Ps3Input();
virtual ~Ps3Input();

protected:
virtual void TickGame(float seconds);

private:
Ps3InputData *m_data;
};

} /* namespace lol */


+ 0
- 179
src/platform/ps3/threadbase.h ファイルの表示

@@ -1,179 +0,0 @@
//
// Lol Engine
//
// Copyright: (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
// 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 ThreadBase class
// --------------------
//

#include <sys/ppu_thread.h>
#include <sys/event.h>

namespace lol
{

class MutexBase
{
public:
MutexBase()
{
sys_lwmutex_attribute_t attr;
sys_lwmutex_attribute_initialize(attr);
sys_lwmutex_create(&m_mutex, &attr);
}

~MutexBase()
{
while (sys_lwmutex_destroy(&m_mutex) == EBUSY)
;
}

void Lock()
{
sys_lwmutex_lock(&m_mutex, 0);
}

void Unlock()
{
sys_lwmutex_unlock(&m_mutex);
}

private:
sys_lwmutex_t m_mutex;
};

template<typename T, int N> class QueueBase
{
public:
QueueBase()
{
m_start = m_count = 0;
m_poppers = m_pushers = 0;

sys_lwmutex_attribute_t mattr;
sys_lwmutex_attribute_initialize(mattr);
sys_lwmutex_create(&m_mutex, &mattr);

sys_lwcond_attribute_t cattr;
sys_lwcond_attribute_initialize(cattr);
sys_lwcond_create(&m_empty_cond, &m_mutex, &cattr);
sys_lwcond_create(&m_full_cond, &m_mutex, &cattr);
}

~QueueBase()
{
while (sys_lwcond_destroy(&m_empty_cond) == EBUSY)
;
while (sys_lwcond_destroy(&m_full_cond) == EBUSY)
;
while (sys_lwmutex_destroy(&m_mutex) == EBUSY)
;
}

void Push(T value)
{
/* FIXME: this is a copy of the pthread implementation, but we
* should really use libsync2 instead. */
sys_lwmutex_lock(&m_mutex, 0);
m_pushers++;
while (m_count == CAPACITY)
sys_lwcond_wait(&m_full_cond, 0);
m_pushers--;
m_values[(m_start + m_count) % CAPACITY] = value;
m_count++;
if (m_poppers)
sys_lwcond_signal(&m_empty_cond);
sys_lwmutex_unlock(&m_mutex);
}

bool TryPush(T value)
{
sys_lwmutex_lock(&m_mutex, 0);
if (m_count == CAPACITY)
{
sys_lwmutex_unlock(&m_mutex);
return false;
}
m_values[(m_start + m_count) % CAPACITY] = value;
m_count++;
if (m_poppers)
sys_lwcond_signal(&m_empty_cond);
sys_lwmutex_unlock(&m_mutex);
return true;
}

T Pop()
{
sys_lwmutex_lock(&m_mutex, 0);
m_poppers++;
while (m_count == 0)
sys_lwcond_wait(&m_empty_cond, 0);
m_poppers--;
T ret = m_values[m_start];
m_start = (m_start + 1) % CAPACITY;
m_count--;
if (m_pushers)
sys_lwcond_signal(&m_full_cond);
sys_lwmutex_unlock(&m_mutex);
return ret;
}

bool TryPop(T &ret)
{
sys_lwmutex_lock(&m_mutex, 0);
if (m_count == 0)
{
sys_lwmutex_unlock(&m_mutex);
return false;
}
ret = m_values[m_start];
m_start = (m_start + 1) % CAPACITY;
m_count--;
if (m_pushers)
sys_lwcond_signal(&m_full_cond);
sys_lwmutex_unlock(&m_mutex);
return true;
}

private:
static size_t const CAPACITY = N;
T m_values[CAPACITY];
size_t m_start, m_count;
size_t m_poppers, m_pushers;
sys_lwmutex_t m_mutex;
sys_lwcond_t m_empty_cond, m_full_cond;
};

class ThreadBase
{
public:
ThreadBase(void *(*fn)(void *), void *data)
{
size_t stack_size = 128 * 1024;
char const *thread_name = "new thread";

/* FIXME: choose priority more wisely */
sys_ppu_thread_create(&m_thread, (void (*)(uint64_t))fn,
(uint64_t)data, 1000, stack_size, 0, thread_name);
}

virtual ~ThreadBase()
{
sys_ppu_thread_join(m_thread, nullptr);
}

private:
sys_ppu_thread_t m_thread;
};

} /* namespace lol */


+ 7
- 86
src/sample.cpp ファイルの表示

@@ -14,9 +14,7 @@
#include <cstdio>
#include <cstring>

#if __CELLOS_LV2__
# include <cell/mstream.h> /* multistream */
#elif defined USE_SDL_MIXER
#if defined USE_SDL_MIXER
# if defined HAVE_SDL_SDL_H
# include <SDL/SDL.h>
# else
@@ -42,29 +40,7 @@ class SampleData

private:
String m_name;
#if __CELLOS_LV2__
static void Callback(int stream, void *data, int type,
void *write_buf, int buf_size)
{
UNUSED(write_buf, buf_size);
switch (type)
{
case CELL_MS_CALLBACK_MOREDATA:
/* For streamed sound */
break;
case CELL_MS_CALLBACK_CLOSESTREAM:
case CELL_MS_CALLBACK_FINISHSTREAM:
/* Finished playing */
break;
default:
/* FIXME: we can't reach here */
break;
}
}

String m_data;
int m_channel;
#elif defined USE_SDL_MIXER
#if defined USE_SDL_MIXER
Mix_Chunk *m_chunk;
int m_channel;
#endif
@@ -79,24 +55,7 @@ Sample::Sample(char const *path)
{
data->m_name = String("<sample> ") + path;

#if __CELLOS_LV2__
array<String> pathlist = System::GetPathList(path);
File f;
for (int i = 0; i < pathlist.Count(); ++i)
{
f.Open(pathlist[i], FileAccess::Read);
if (f.IsValid())
{
data->m_data = f.ReadString();
f.Close();
break;
}
}
if (data->m_data.Count() == 0)
{
Log::Error("could not load sample %s\n", path);
}
#elif defined USE_SDL_MIXER
#if defined USE_SDL_MIXER
array<String> pathlist = System::GetPathList(path);
for (int i = 0; i < pathlist.Count(); ++i)
{
@@ -114,9 +73,7 @@ Sample::Sample(char const *path)

Sample::~Sample()
{
#if __CELLOS_LV2__
/* Nothing to do */
#elif defined USE_SDL_MIXER
#if defined USE_SDL_MIXER
if (data->m_chunk)
Mix_FreeChunk(data->m_chunk);
#endif
@@ -135,36 +92,7 @@ char const *Sample::GetName()

void Sample::Play()
{
#if __CELLOS_LV2__
if (data->m_data.Count() <= 64 + 256)
return;

data->m_channel = cellMSStreamOpen();

CellMSInfo mi;
mi.SubBusGroup = CELL_MS_MASTER_BUS;
mi.FirstBuffer = &data->m_data[0] + 64;
/* FIXME: hardcoded crap */
mi.FirstBufferSize = data->m_data.Count() - 64 - 256;
mi.SecondBuffer = nullptr;
mi.SecondBufferSize = 0;

mi.Pitch = 44100;
mi.numChannels = 2;
mi.flags = CELL_MS_STREAM_AUTOCLOSE;

mi.initialOffset = 0;
mi.inputType = CELL_MS_16BIT_LITTLE;
cellMSStreamSetInfo(data->m_channel, &mi);

cellMSStreamSetCallbackFunc(data->m_channel, SampleData::Callback);

cellMSCoreSetVolume1(data->m_channel, CELL_MS_DRY,
CELL_MS_SPEAKER_FL, CELL_MS_CHANNEL_0, 1.0f);
cellMSCoreSetVolume1(data->m_channel, CELL_MS_DRY,
CELL_MS_SPEAKER_FR, CELL_MS_CHANNEL_0, 1.0f);
cellMSStreamPlay(data->m_channel);
#elif defined USE_SDL_MIXER
#if defined USE_SDL_MIXER
if (data->m_chunk)
data->m_channel = Mix_PlayChannel(-1, data->m_chunk, 0);
#endif
@@ -172,10 +100,7 @@ void Sample::Play()

void Sample::Loop()
{
#if __CELLOS_LV2__
/* FIXME: not implemented */
Play();
#elif defined USE_SDL_MIXER
#if defined USE_SDL_MIXER
if (data->m_chunk)
data->m_channel = Mix_PlayChannel(-1, data->m_chunk, -1);
#endif
@@ -183,11 +108,7 @@ void Sample::Loop()

void Sample::Stop()
{
#if __CELLOS_LV2__
if (data->m_channel >= 0)
cellMSStreamClose(data->m_channel);
data->m_channel = -1;
#elif defined USE_SDL_MIXER
#if defined USE_SDL_MIXER
if (data->m_channel >= 0)
Mix_HaltChannel(data->m_channel);
data->m_channel = -1;


+ 20
- 64
src/sys/file.cpp ファイルの表示

@@ -10,10 +10,7 @@

#include <lol/engine-internal.h>

#if __CELLOS_LV2__
# include <sys/paths.h>
# include <cell/cell_fs.h>
#elif __ANDROID__
#if __ANDROID__
# include <sys/types.h>
# include <android/asset_manager_jni.h>
#endif
@@ -53,9 +50,7 @@ class FileData
m_type = stream;
switch (stream.ToScalar())
{
#if __CELLOS_LV2__
/* FIXME: no modes, no error checking, no nothing */
#elif __ANDROID__
#if __ANDROID__
/* FIXME: no modes, no error checking, no nothing */
#elif HAVE_STDIO_H
case StreamType::StdIn: m_fd = stdin; break;
@@ -68,13 +63,7 @@ class FileData
void Open(String const &file, FileAccess mode, bool force_binary)
{
m_type = (force_binary) ? (StreamType::FileBinary) : (StreamType::File);
#if __CELLOS_LV2__
String realfile = String(SYS_APP_HOME) + '/' + file;
CellFsErrno err = cellFsOpen(realfile.C(), CELL_FS_O_RDONLY,
&m_fd, nullptr, 0);
if (err != CELL_FS_SUCCEEDED)
m_fd = -1;
#elif __ANDROID__
#if __ANDROID__
ASSERT(g_assets);
m_asset = AAssetManager_open(g_assets, file.C(), AASSET_MODE_UNKNOWN);
#elif HAVE_STDIO_H
@@ -88,9 +77,7 @@ class FileData

inline bool IsValid() const
{
#if __CELLOS_LV2__
return m_fd > -1;
#elif __ANDROID__
#if __ANDROID__
return !!m_asset;
#elif HAVE_STDIO_H
return !!m_fd;
@@ -104,11 +91,7 @@ class FileData
if (m_type != StreamType::File &&
m_type != StreamType::FileBinary)
return;
#if __CELLOS_LV2__
if (m_fd >= 0)
cellFsClose(m_fd);
m_fd = -1;
#elif __ANDROID__
#if __ANDROID__
if (m_asset)
AAsset_close(m_asset);
m_asset = nullptr;
@@ -121,15 +104,7 @@ class FileData

int Read(uint8_t *buf, int count)
{
#if __CELLOS_LV2__
uint64_t done;
CellFsErrno err = cellFsRead(m_fd, buf, count, &done);

if (err != CELL_FS_SUCCEEDED)
return -1;

return (int)done;
#elif __ANDROID__
#if __ANDROID__
return AAsset_read(m_asset, buf, count);
#elif HAVE_STDIO_H
size_t done = fread(buf, 1, count, m_fd);
@@ -165,18 +140,7 @@ class FileData

int Write(uint8_t const *buf, int count)
{
#if __CELLOS_LV2__
/*
uint64_t done;
CellFsErrno err = cellFsRead(m_fd, buf, count, &done);

if (err != CELL_FS_SUCCEEDED)
return -1;

return (int)done;
*/
return 0;
#elif __ANDROID__
#if __ANDROID__
//return AAsset_read(m_asset, buf, count);
return 0;
#elif HAVE_STDIO_H
@@ -197,9 +161,7 @@ class FileData

long int GetPosFromStart()
{
#if __CELLOS_LV2__
return 0;
#elif __ANDROID__
#if __ANDROID__
return 0;
#elif HAVE_STDIO_H
return ftell(m_fd);
@@ -210,9 +172,7 @@ class FileData

void SetPosFromStart(long int pos)
{
#if __CELLOS_LV2__
//NOT IMPLEMENTED
#elif __ANDROID__
#if __ANDROID__
//NOT IMPLEMENTED
#elif HAVE_STDIO_H
fseek(m_fd, pos, SEEK_SET);
@@ -223,9 +183,7 @@ class FileData

long int GetSize()
{
#if __CELLOS_LV2__
return 0;
#elif __ANDROID__
#if __ANDROID__
return 0;
#elif HAVE_STDIO_H
return m_stat.st_size;
@@ -235,9 +193,7 @@ class FileData
}


#if __CELLOS_LV2__
int m_fd;
#elif __ANDROID__
#if __ANDROID__
AAsset *m_asset;
#elif HAVE_STDIO_H
FILE *m_fd;
@@ -365,7 +321,7 @@ class DirectoryData

DirectoryData() : m_type(StreamType::File)
{
#if __CELLOS_LV2__ || __ANDROID__
#if __ANDROID__
/* FIXME: not implemented */
#elif defined(_WIN32)
m_handle = INVALID_HANDLE_VALUE;
@@ -377,7 +333,7 @@ class DirectoryData
void Open(String const &directory, FileAccess mode)
{
m_type = StreamType::File;
#if __CELLOS_LV2__ || __ANDROID__
#if __ANDROID__
/* FIXME: not implemented */
#elif defined(_WIN32)
m_directory = directory;
@@ -397,7 +353,7 @@ class DirectoryData

if (IsValid())
{
#if __CELLOS_LV2__ || __ANDROID__
#if __ANDROID__
/* FIXME: not implemented */
#elif defined(_WIN32)
FindClose(m_handle);
@@ -406,7 +362,7 @@ class DirectoryData
#endif
}

#if __CELLOS_LV2__ || __ANDROID__
#if __ANDROID__
/* FIXME: not implemented */
#elif defined(_WIN32)
m_handle = INVALID_HANDLE_VALUE;
@@ -420,7 +376,7 @@ class DirectoryData
if (!IsValid())
return false;

#if __CELLOS_LV2__ || __ANDROID__
#if __ANDROID__
/* FIXME: not implemented */
#elif defined(_WIN32)
String filter = m_directory + String("*");
@@ -456,7 +412,7 @@ class DirectoryData

inline bool IsValid() const
{
#if __CELLOS_LV2__ || __ANDROID__
#if __ANDROID__
/* FIXME: not implemented */
#elif defined(_WIN32)
return (m_handle != INVALID_HANDLE_VALUE);
@@ -467,7 +423,7 @@ class DirectoryData
#endif
}

#if __CELLOS_LV2__ || __ANDROID__
#if __ANDROID__
/* FIXME: not implemented */
#elif defined(_WIN32)
HANDLE m_handle;
@@ -590,7 +546,7 @@ String Directory::GetName()
String Directory::GetCurrent()
{
String result;
#if __CELLOS_LV2__ || __ANDROID__
#if __ANDROID__
/* FIXME: not implemented */
#elif defined(_WIN32)
TCHAR buff[MAX_PATH * 2];
@@ -606,7 +562,7 @@ String Directory::GetCurrent()
//--
bool Directory::SetCurrent(String directory)
{
#if __CELLOS_LV2__ || __ANDROID__
#if __ANDROID__
/* FIXME: not implemented */
#elif defined(_WIN32)
String result = directory;


+ 0
- 33
src/sys/timer.cpp ファイルの表示

@@ -25,10 +25,6 @@
#elif _WIN32
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
#elif __CELLOS_LV2__
# include <sys/sys_time.h>
# include <sys/timer.h>
# include <sys/time_util.h>
#elif HAVE_SDL_SDL_H
# include <SDL/SDL.h>
#else
@@ -109,35 +105,6 @@ private:

LARGE_INTEGER m_cycles;

#elif __CELLOS_LV2__
inline void Init()
{
m_cycles = 0;
}

float GetSeconds(bool reset)
{
static float secs_per_cycle = GetSecondsPerCycle();
uint64_t cycles, cycles0 = m_cycles;
SYS_TIMEBASE_GET(cycles);
if (reset)
m_cycles = cycles;
return secs_per_cycle * (cycles - cycles0);
}

static void WaitSeconds(float seconds)
{
if (seconds > 0.0f)
sys_timer_usleep((int)(seconds * 1e6f));
}

static float GetSecondsPerCycle()
{
return 1.f / sys_time_get_timebase_frequency();
}

uint64_t m_cycles;

#else
inline void Init()
{


+ 0
- 8
src/t/test-base.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>


+ 0
- 8
src/t/test-entity.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>


+ 0
- 8
src/t/test-image.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>


+ 0
- 8
src/t/test-math.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>


+ 0
- 8
src/t/test-sys.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>


+ 0
- 6
src/video.cpp ファイルの表示

@@ -107,13 +107,7 @@ void Video::Capture(uint32_t *buffer)
/* TODO */
#elif defined USE_GLEW || defined HAVE_GL_2X || defined HAVE_GLEX_2X
GLint v[4];
# if defined __CELLOS_LV2__
// FIXME: use psglCreateDeviceAuto && psglGetDeviceDimensions
v[2] = 1920;
v[3] = 1080;
# else
glGetIntegerv(GL_VIEWPORT, v);
# endif
int width = v[2], height = v[3];

# if defined HAVE_GL_2X


+ 0
- 8
tools/lolremez/lolremez.vcxproj ファイルの表示

@@ -5,10 +5,6 @@
<Configuration>Debug</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
<Configuration>Release</Configuration>
<Platform>ORBIS</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>


書き込み プレビュー
読み込み中…
キャンセル
保存