Permalink
Browse files

re-fracture: move game/ to cont/

  • Loading branch information...
1 parent b299324 commit 841a006f1a0384e314d36ccafd6330b7c7b71271 @hoijui hoijui committed Mar 21, 2010
Showing with 18 additions and 18 deletions.
  1. +1 −1 CMakeLists.txt
  2. +6 −6 SConstruct
  3. 0 {game → cont}/LuaUI/CHANGELOG.txt
  4. 0 {game → cont}/LuaUI/Config/README.txt
  5. 0 {game → cont}/LuaUI/Fonts/FreeMonoBold_12.lua
  6. 0 {game → cont}/LuaUI/Fonts/FreeMonoBold_12.png
  7. 0 {game → cont}/LuaUI/Fonts/README
  8. 0 {game → cont}/LuaUI/Headers/colors.h.lua
  9. 0 {game → cont}/LuaUI/Headers/keysym.h.lua
  10. 0 {game → cont}/LuaUI/Icons/chi.png
  11. 0 {game → cont}/LuaUI/Icons/cross.png
  12. 0 {game → cont}/LuaUI/Icons/diamond.png
  13. 0 {game → cont}/LuaUI/Icons/e.png
  14. 0 {game → cont}/LuaUI/Icons/hemi-down.png
  15. 0 {game → cont}/LuaUI/Icons/hemi-up.png
  16. 0 {game → cont}/LuaUI/Icons/hemi.png
  17. 0 {game → cont}/LuaUI/Icons/hourglass-side.png
  18. 0 {game → cont}/LuaUI/Icons/hourglass.png
  19. 0 {game → cont}/LuaUI/Icons/m-down.png
  20. 0 {game → cont}/LuaUI/Icons/m-up.png
  21. 0 {game → cont}/LuaUI/Icons/m.png
  22. 0 {game → cont}/LuaUI/Icons/sphere.png
  23. 0 {game → cont}/LuaUI/Icons/square.png
  24. 0 {game → cont}/LuaUI/Icons/square_+.png
  25. 0 {game → cont}/LuaUI/Icons/square_x.png
  26. 0 {game → cont}/LuaUI/Icons/star-dark.png
  27. 0 {game → cont}/LuaUI/Icons/star.png
  28. 0 {game → cont}/LuaUI/Icons/tri-down.png
  29. 0 {game → cont}/LuaUI/Icons/tri-up.png
  30. 0 {game → cont}/LuaUI/Icons/triangle-down.png
  31. 0 {game → cont}/LuaUI/Icons/triangle-up.png
  32. 0 {game → cont}/LuaUI/Icons/x.png
  33. 0 {game → cont}/LuaUI/Images/flags25x15.png
  34. 0 {game → cont}/LuaUI/Images/highlight_strip.png
  35. 0 {game → cont}/LuaUI/Images/players.png
  36. 0 {game → cont}/LuaUI/Models/colors.lua
  37. 0 {game → cont}/LuaUI/Models/colors.mtl
  38. 0 {game → cont}/LuaUI/Models/colors.obj
  39. 0 {game → cont}/LuaUI/NEWS.txt
  40. 0 {game → cont}/LuaUI/README.txt
  41. 0 {game → cont}/LuaUI/Sounds/README.txt
  42. 0 {game → cont}/LuaUI/Sounds/bounce.wav
  43. 0 {game → cont}/LuaUI/Sounds/flag_grab.wav
  44. 0 {game → cont}/LuaUI/Sounds/land.wav
  45. 0 {game → cont}/LuaUI/Sounds/message_admin.wav
  46. 0 {game → cont}/LuaUI/Sounds/message_private.wav
  47. 0 {game → cont}/LuaUI/Sounds/message_team.wav
  48. 0 {game → cont}/LuaUI/Sounds/pop.wav
  49. 0 {game → cont}/LuaUI/Sounds/teamgrab.wav
  50. 0 {game → cont}/LuaUI/Widgets/camera_shake.lua
  51. 0 {game → cont}/LuaUI/Widgets/camera_smooth_move.lua
  52. 0 {game → cont}/LuaUI/Widgets/gui_buildspacing.lua
  53. 0 {game → cont}/LuaUI/Widgets/gui_comm_ends.lua
  54. 0 {game → cont}/LuaUI/Widgets/gui_hilight_unit.lua
  55. 0 {game → cont}/LuaUI/Widgets/gui_selbuttons.lua
  56. 0 {game → cont}/LuaUI/Widgets/gui_team_platter.lua
  57. 0 {game → cont}/LuaUI/Widgets/gui_xray_shader.lua
  58. 0 {game → cont}/LuaUI/Widgets/minimap_relative.lua
  59. 0 {game → cont}/LuaUI/Widgets/minimap_startbox.lua
  60. 0 {game → cont}/LuaUI/Widgets/unit_factory_guard.lua
  61. 0 {game → cont}/LuaUI/Widgets/unit_immobile_buider.lua
  62. 0 {game → cont}/LuaUI/Widgets/unit_metal_maker.lua
  63. 0 {game → cont}/LuaUI/Widgets/unit_stockpile.lua
  64. 0 {game → cont}/LuaUI/actions.lua
  65. 0 {game → cont}/LuaUI/callins.lua
  66. 0 {game → cont}/LuaUI/ctrlpanel.txt
  67. 0 {game → cont}/LuaUI/debug.lua
  68. 0 {game → cont}/LuaUI/flags.lua
  69. 0 {game → cont}/LuaUI/fonts.lua
  70. 0 {game → cont}/LuaUI/layout.lua
  71. 0 {game → cont}/LuaUI/loadmodel.lua
  72. 0 {game → cont}/LuaUI/main.lua
  73. 0 {game → cont}/LuaUI/savetable.lua
  74. 0 {game → cont}/LuaUI/selector.lua
  75. 0 {game → cont}/LuaUI/setupdefs.lua
  76. 0 {game → cont}/LuaUI/system.lua
  77. 0 {game → cont}/LuaUI/tweakmode.lua
  78. 0 {game → cont}/LuaUI/utils.lua
  79. 0 {game → cont}/LuaUI/widgets.lua
  80. 0 {game → cont}/PALETTE.PAL
  81. 0 {game → cont}/cmdcolors.txt
  82. 0 {game → cont}/ctrlpanel.txt
  83. 0 {game → cont}/fonts/AUTHORS
  84. 0 {game → cont}/fonts/COPYING
  85. 0 {game → cont}/fonts/CREDITS
  86. 0 {game → cont}/fonts/FreeSansBold.otf
  87. 0 {game → cont}/fonts/README
  88. 0 {game → cont}/luaui.lua
  89. 0 {game → cont}/selectkeys.txt
  90. 0 {game → cont}/teamcolors.lua
  91. 0 {game → cont}/uikeys.txt
  92. +1 −1 installer/make_source_package.sh
  93. +5 −5 rts/build/vstudio8/rts.vcproj
  94. +5 −5 rts/build/vstudio9/rts.vcproj
View
2 CMakeLists.txt
@@ -303,7 +303,7 @@ add_custom_target(gamedata ALL
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/installer")
### install base data files
-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/game/ DESTINATION ${DATADIR} PATTERN ".gitignore" EXCLUDE)
+install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cont/ DESTINATION ${DATADIR} PATTERN ".gitignore" EXCLUDE)
install (DIRECTORY ${CMAKE_BINARY_DIR}/base DESTINATION ${DATADIR})
### Install freedesktop-files, mime-types etc.
View
12 SConstruct
@@ -439,14 +439,14 @@ inst = env.Install(os.path.join(env['installprefix'], env['datadir'], 'base/spri
Alias('install', inst)
# install fonts
-for font in os.listdir('game/fonts'):
- if not os.path.isdir(os.path.join('game/fonts', font)):
- inst = env.Install(os.path.join(env['installprefix'], env['datadir'], 'fonts'), os.path.join('game/fonts', font))
+for font in os.listdir('cont/fonts'):
+ if not os.path.isdir(os.path.join('cont/fonts', font)):
+ inst = env.Install(os.path.join(env['installprefix'], env['datadir'], 'fonts'), os.path.join('cont/fonts', font))
Alias('install', inst)
# install some files from root of datadir
for f in ['cmdcolors.txt', 'ctrlpanel.txt', 'selectkeys.txt', 'uikeys.txt', 'teamcolors.lua']:
- inst = env.Install(os.path.join(env['installprefix'], env['datadir']), os.path.join('game', f))
+ inst = env.Install(os.path.join(env['installprefix'], env['datadir']), os.path.join('cont', f))
Alias('install', inst)
# install menu entry & icon
@@ -457,9 +457,9 @@ Alias('install', inst)
# install LuaUI files
for f in ['luaui.lua']:
- inst = env.Install(os.path.join(env['installprefix'], env['datadir']), os.path.join('game', f))
+ inst = env.Install(os.path.join(env['installprefix'], env['datadir']), os.path.join('cont', f))
Alias('install', inst)
-luaui_files=filelist.list_files_recursive(env, 'game/LuaUI')
+luaui_files=filelist.list_files_recursive(env, 'cont/LuaUI')
for f in luaui_files:
if not os.path.isdir(f):
inst = env.Install(os.path.join(env['installprefix'], env['datadir'], os.path.dirname(f)[5:]), f)
View
0 game/LuaUI/CHANGELOG.txt → cont/LuaUI/CHANGELOG.txt
File renamed without changes.
View
0 game/LuaUI/Config/README.txt → cont/LuaUI/Config/README.txt
File renamed without changes.
View
0 game/LuaUI/Fonts/FreeMonoBold_12.lua → cont/LuaUI/Fonts/FreeMonoBold_12.lua
File renamed without changes.
View
0 game/LuaUI/Fonts/FreeMonoBold_12.png → cont/LuaUI/Fonts/FreeMonoBold_12.png
File renamed without changes
View
0 game/LuaUI/Fonts/README → cont/LuaUI/Fonts/README
File renamed without changes.
View
0 game/LuaUI/Headers/colors.h.lua → cont/LuaUI/Headers/colors.h.lua
File renamed without changes.
View
0 game/LuaUI/Headers/keysym.h.lua → cont/LuaUI/Headers/keysym.h.lua
File renamed without changes.
View
0 game/LuaUI/Icons/chi.png → cont/LuaUI/Icons/chi.png
File renamed without changes
View
0 game/LuaUI/Icons/cross.png → cont/LuaUI/Icons/cross.png
File renamed without changes
View
0 game/LuaUI/Icons/diamond.png → cont/LuaUI/Icons/diamond.png
File renamed without changes
View
0 game/LuaUI/Icons/e.png → cont/LuaUI/Icons/e.png
File renamed without changes
View
0 game/LuaUI/Icons/hemi-down.png → cont/LuaUI/Icons/hemi-down.png
File renamed without changes
View
0 game/LuaUI/Icons/hemi-up.png → cont/LuaUI/Icons/hemi-up.png
File renamed without changes
View
0 game/LuaUI/Icons/hemi.png → cont/LuaUI/Icons/hemi.png
File renamed without changes
View
0 game/LuaUI/Icons/hourglass-side.png → cont/LuaUI/Icons/hourglass-side.png
File renamed without changes
View
0 game/LuaUI/Icons/hourglass.png → cont/LuaUI/Icons/hourglass.png
File renamed without changes
View
0 game/LuaUI/Icons/m-down.png → cont/LuaUI/Icons/m-down.png
File renamed without changes
View
0 game/LuaUI/Icons/m-up.png → cont/LuaUI/Icons/m-up.png
File renamed without changes
View
0 game/LuaUI/Icons/m.png → cont/LuaUI/Icons/m.png
File renamed without changes
View
0 game/LuaUI/Icons/sphere.png → cont/LuaUI/Icons/sphere.png
File renamed without changes
View
0 game/LuaUI/Icons/square.png → cont/LuaUI/Icons/square.png
File renamed without changes
View
0 game/LuaUI/Icons/square_+.png → cont/LuaUI/Icons/square_+.png
File renamed without changes
View
0 game/LuaUI/Icons/square_x.png → cont/LuaUI/Icons/square_x.png
File renamed without changes
View
0 game/LuaUI/Icons/star-dark.png → cont/LuaUI/Icons/star-dark.png
File renamed without changes
View
0 game/LuaUI/Icons/star.png → cont/LuaUI/Icons/star.png
File renamed without changes
View
0 game/LuaUI/Icons/tri-down.png → cont/LuaUI/Icons/tri-down.png
File renamed without changes
View
0 game/LuaUI/Icons/tri-up.png → cont/LuaUI/Icons/tri-up.png
File renamed without changes
View
0 game/LuaUI/Icons/triangle-down.png → cont/LuaUI/Icons/triangle-down.png
File renamed without changes
View
0 game/LuaUI/Icons/triangle-up.png → cont/LuaUI/Icons/triangle-up.png
File renamed without changes
View
0 game/LuaUI/Icons/x.png → cont/LuaUI/Icons/x.png
File renamed without changes
View
0 game/LuaUI/Images/flags25x15.png → cont/LuaUI/Images/flags25x15.png
File renamed without changes
View
0 game/LuaUI/Images/highlight_strip.png → cont/LuaUI/Images/highlight_strip.png
Diff not rendered.
View
0 game/LuaUI/Images/players.png → cont/LuaUI/Images/players.png
Diff not rendered.
View
0 game/LuaUI/Models/colors.lua → cont/LuaUI/Models/colors.lua
File renamed without changes.
View
0 game/LuaUI/Models/colors.mtl → cont/LuaUI/Models/colors.mtl
File renamed without changes.
View
0 game/LuaUI/Models/colors.obj → cont/LuaUI/Models/colors.obj
File renamed without changes.
View
0 game/LuaUI/NEWS.txt → cont/LuaUI/NEWS.txt
File renamed without changes.
View
0 game/LuaUI/README.txt → cont/LuaUI/README.txt
File renamed without changes.
View
0 game/LuaUI/Sounds/README.txt → cont/LuaUI/Sounds/README.txt
File renamed without changes.
View
0 game/LuaUI/Sounds/bounce.wav → cont/LuaUI/Sounds/bounce.wav
File renamed without changes.
View
0 game/LuaUI/Sounds/flag_grab.wav → cont/LuaUI/Sounds/flag_grab.wav
File renamed without changes.
View
0 game/LuaUI/Sounds/land.wav → cont/LuaUI/Sounds/land.wav
File renamed without changes.
View
0 game/LuaUI/Sounds/message_admin.wav → cont/LuaUI/Sounds/message_admin.wav
File renamed without changes.
View
0 game/LuaUI/Sounds/message_private.wav → cont/LuaUI/Sounds/message_private.wav
File renamed without changes.
View
0 game/LuaUI/Sounds/message_team.wav → cont/LuaUI/Sounds/message_team.wav
File renamed without changes.
View
0 game/LuaUI/Sounds/pop.wav → cont/LuaUI/Sounds/pop.wav
File renamed without changes.
View
0 game/LuaUI/Sounds/teamgrab.wav → cont/LuaUI/Sounds/teamgrab.wav
File renamed without changes.
View
0 game/LuaUI/Widgets/camera_shake.lua → cont/LuaUI/Widgets/camera_shake.lua
File renamed without changes.
View
0 game/LuaUI/Widgets/camera_smooth_move.lua → cont/LuaUI/Widgets/camera_smooth_move.lua
File renamed without changes.
View
0 game/LuaUI/Widgets/gui_buildspacing.lua → cont/LuaUI/Widgets/gui_buildspacing.lua
File renamed without changes.
View
0 game/LuaUI/Widgets/gui_comm_ends.lua → cont/LuaUI/Widgets/gui_comm_ends.lua
File renamed without changes.
View
0 game/LuaUI/Widgets/gui_hilight_unit.lua → cont/LuaUI/Widgets/gui_hilight_unit.lua
File renamed without changes.
View
0 game/LuaUI/Widgets/gui_selbuttons.lua → cont/LuaUI/Widgets/gui_selbuttons.lua
File renamed without changes.
View
0 game/LuaUI/Widgets/gui_team_platter.lua → cont/LuaUI/Widgets/gui_team_platter.lua
File renamed without changes.
View
0 game/LuaUI/Widgets/gui_xray_shader.lua → cont/LuaUI/Widgets/gui_xray_shader.lua
File renamed without changes.
View
0 game/LuaUI/Widgets/minimap_relative.lua → cont/LuaUI/Widgets/minimap_relative.lua
File renamed without changes.
View
0 game/LuaUI/Widgets/minimap_startbox.lua → cont/LuaUI/Widgets/minimap_startbox.lua
File renamed without changes.
View
0 game/LuaUI/Widgets/unit_factory_guard.lua → cont/LuaUI/Widgets/unit_factory_guard.lua
File renamed without changes.
View
0 game/LuaUI/Widgets/unit_immobile_buider.lua → cont/LuaUI/Widgets/unit_immobile_buider.lua
File renamed without changes.
View
0 game/LuaUI/Widgets/unit_metal_maker.lua → cont/LuaUI/Widgets/unit_metal_maker.lua
File renamed without changes.
View
0 game/LuaUI/Widgets/unit_stockpile.lua → cont/LuaUI/Widgets/unit_stockpile.lua
File renamed without changes.
View
0 game/LuaUI/actions.lua → cont/LuaUI/actions.lua
File renamed without changes.
View
0 game/LuaUI/callins.lua → cont/LuaUI/callins.lua
File renamed without changes.
View
0 game/LuaUI/ctrlpanel.txt → cont/LuaUI/ctrlpanel.txt
File renamed without changes.
View
0 game/LuaUI/debug.lua → cont/LuaUI/debug.lua
File renamed without changes.
View
0 game/LuaUI/flags.lua → cont/LuaUI/flags.lua
File renamed without changes.
View
0 game/LuaUI/fonts.lua → cont/LuaUI/fonts.lua
File renamed without changes.
View
0 game/LuaUI/layout.lua → cont/LuaUI/layout.lua
File renamed without changes.
View
0 game/LuaUI/loadmodel.lua → cont/LuaUI/loadmodel.lua
File renamed without changes.
View
0 game/LuaUI/main.lua → cont/LuaUI/main.lua
File renamed without changes.
View
0 game/LuaUI/savetable.lua → cont/LuaUI/savetable.lua
File renamed without changes.
View
0 game/LuaUI/selector.lua → cont/LuaUI/selector.lua
File renamed without changes.
View
0 game/LuaUI/setupdefs.lua → cont/LuaUI/setupdefs.lua
File renamed without changes.
View
0 game/LuaUI/system.lua → cont/LuaUI/system.lua
File renamed without changes.
View
0 game/LuaUI/tweakmode.lua → cont/LuaUI/tweakmode.lua
File renamed without changes.
View
0 game/LuaUI/utils.lua → cont/LuaUI/utils.lua
File renamed without changes.
View
0 game/LuaUI/widgets.lua → cont/LuaUI/widgets.lua
File renamed without changes.
View
0 game/PALETTE.PAL → cont/PALETTE.PAL
File renamed without changes.
View
0 game/cmdcolors.txt → cont/cmdcolors.txt
File renamed without changes.
View
0 game/ctrlpanel.txt → cont/ctrlpanel.txt
File renamed without changes.
View
0 game/fonts/AUTHORS → cont/fonts/AUTHORS
File renamed without changes.
View
0 game/fonts/COPYING → cont/fonts/COPYING
File renamed without changes.
View
0 game/fonts/CREDITS → cont/fonts/CREDITS
File renamed without changes.
View
0 game/fonts/FreeSansBold.otf → cont/fonts/FreeSansBold.otf
File renamed without changes.
View
0 game/fonts/README → cont/fonts/README
File renamed without changes.
View
0 game/luaui.lua → cont/luaui.lua
File renamed without changes.
View
0 game/selectkeys.txt → cont/selectkeys.txt
File renamed without changes.
View
0 game/teamcolors.lua → cont/teamcolors.lua
File renamed without changes.
View
0 game/uikeys.txt → cont/uikeys.txt
File renamed without changes.
View
2 installer/make_source_package.sh
@@ -64,7 +64,7 @@ include=" \
$dir/AI/ \
$dir/doc/ \
$dir/Doxyfile \
- $dir/game/ \
+ $dir/cont/ \
$dir/installer/ \
$dir/LICENSE.html \
$dir/README.* \
View
10 rts/build/vstudio8/rts.vcproj
@@ -6118,23 +6118,23 @@
Name="shaders"
>
<File
- RelativePath="..\..\..\game\shaders\terrainCommon.glsl"
+ RelativePath="..\..\..\cont\shaders\terrainCommon.glsl"
>
</File>
<File
- RelativePath="..\..\..\game\shaders\terrainFragmentShader.glsl"
+ RelativePath="..\..\..\cont\shaders\terrainFragmentShader.glsl"
>
</File>
<File
- RelativePath="..\..\..\game\shaders\terrainSimpleCopyFS.glsl"
+ RelativePath="..\..\..\cont\shaders\terrainSimpleCopyFS.glsl"
>
</File>
<File
- RelativePath="..\..\..\game\shaders\terrainSimpleCopyVS.glsl"
+ RelativePath="..\..\..\cont\shaders\terrainSimpleCopyVS.glsl"
>
</File>
<File
- RelativePath="..\..\..\game\shaders\terrainVertexShader.glsl"
+ RelativePath="..\..\..\cont\shaders\terrainVertexShader.glsl"
>
</File>
</Filter>
View
10 rts/build/vstudio9/rts.vcproj
@@ -6493,23 +6493,23 @@
Name="shaders"
>
<File
- RelativePath="..\..\..\game\shaders\terrainCommon.glsl"
+ RelativePath="..\..\..\cont\shaders\terrainCommon.glsl"
>
</File>
<File
- RelativePath="..\..\..\game\shaders\terrainFragmentShader.glsl"
+ RelativePath="..\..\..\cont\shaders\terrainFragmentShader.glsl"
>
</File>
<File
- RelativePath="..\..\..\game\shaders\terrainSimpleCopyFS.glsl"
+ RelativePath="..\..\..\cont\shaders\terrainSimpleCopyFS.glsl"
>
</File>
<File
- RelativePath="..\..\..\game\shaders\terrainSimpleCopyVS.glsl"
+ RelativePath="..\..\..\cont\shaders\terrainSimpleCopyVS.glsl"
>
</File>
<File
- RelativePath="..\..\..\game\shaders\terrainVertexShader.glsl"
+ RelativePath="..\..\..\cont\shaders\terrainVertexShader.glsl"
>
</File>
</Filter>

0 comments on commit 841a006

Please sign in to comment.