[Adonthell-commits] [ksterker/adonthell] dd6402: Removed unnecessary executable bit on some source ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ksterker/adonthell
  Commit: dd6402c25e6b6676745e151b732d8eb8b78dde56
      
https://github.com/ksterker/adonthell/commit/dd6402c25e6b6676745e151b732d8eb8b78dde56
  Author: Chris Frey <address@hidden>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    A doc/mainpage.dxt
    R doc/mainpage.dxt
    R src/event/types.cc
    A src/event/types.cc
    A src/event/types.h
    R src/event/types.h
    R src/py-wrappers/adonthell/py_main.cc
    A src/py-wrappers/adonthell/py_main.cc
    A src/rpg/quest.cc
    R src/rpg/quest.cc
    A src/rpg/quest.h
    R src/rpg/quest.h
    A test/audiotest.py
    R test/audiotest.py
    A test/configtest.py
    R test/configtest.py
    A test/data/game_events/audio_events.py
    R test/data/game_events/audio_events.py
    A test/eventtest.py
    R test/eventtest.py
    A test/filereport.py
    R test/filereport.py

  Log Message:
  -----------
  Removed unnecessary executable bit on some source files


  Commit: c70dae76ba57d402d6fa2c40fe3357b6d277d3e7
      
https://github.com/ksterker/adonthell/commit/c70dae76ba57d402d6fa2c40fe3357b6d277d3e7
  Author: Chris Frey <address@hidden>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M src/world/pathfinding_manager.cc

  Log Message:
  -----------
  Fixed signed/unsigned comparison compiler warning


  Commit: 4e5dc77aefe135606d3281d4647de1dc48306c07
      
https://github.com/ksterker/adonthell/commit/4e5dc77aefe135606d3281d4647de1dc48306c07
  Author: Chris Frey <address@hidden>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M CMakeLists.txt
    M src/CMakeLists.txt
    M src/audio/audio.cc
    M src/audio/audio.h
    M src/audio/audio_event.cc
    M src/audio/audio_event.h
    M src/audio/audio_event_manager.cc
    M src/audio/audio_event_manager.h
    M src/audio/audio_manager.cc
    M src/audio/audio_manager.h
    M src/audio/sound.cc
    M src/audio/sound.h
    M src/audio/test_audio.cc
    M src/audio/test_audio_event.cc
    M src/audio/test_audio_manager.cc
    M src/audio/test_sound.cc
    M src/audio/test_sound.h
    M src/base/base.cc
    M src/base/base.h
    M src/base/configio.cc
    M src/base/configio.h
    M src/base/configuration.cc
    M src/base/configuration.h
    M src/base/diskio.cc
    M src/base/diskio.h
    M src/base/diskwriter_base.h
    M src/base/diskwriter_gz.cc
    M src/base/diskwriter_gz.h
    M src/base/diskwriter_xml.cc
    M src/base/diskwriter_xml.h
    M src/base/endians.h
    M src/base/file.cc
    M src/base/flat.cc
    M src/base/flat.h
    M src/base/logging.cc
    M src/base/logging.h
    M src/base/nls.cc
    M src/base/nls.h
    M src/base/paths.cc
    M src/base/paths.h
    M src/base/savegame.cc
    M src/base/savegame.h
    M src/base/serializer.h
    M src/base/test_logging.cc
    M src/base/timer.cc
    M src/base/timer.h
    M src/base/utf8.cc
    M src/base/utf8.h
    M src/event/date.cc
    M src/event/date.h
    M src/event/event.cc
    M src/event/event.h
    M src/event/factory.cc
    M src/event/factory.h
    M src/event/listener.cc
    M src/event/listener.h
    M src/event/listener_cxx.cc
    M src/event/listener_cxx.h
    M src/event/listener_python.cc
    M src/event/listener_python.h
    M src/event/manager.h
    M src/event/manager_base.h
    M src/event/time_event.cc
    M src/event/time_event.h
    M src/event/time_event_manager.cc
    M src/event/time_event_manager.h
    M src/event/types.cc
    M src/event/types.h
    M src/gfx/drawable.h
    M src/gfx/drawing_area.h
    M src/gfx/gfx.cc
    M src/gfx/gfx.h
    M src/gfx/image.cc
    M src/gfx/image.h
    M src/gfx/png_wrapper.cc
    M src/gfx/png_wrapper.h
    M src/gfx/screen.cc
    M src/gfx/screen.h
    M src/gfx/sdl/gfx_sdl.cc
    M src/gfx/sdl/screen_sdl.cc
    M src/gfx/sdl/screen_sdl.h
    M src/gfx/sdl/surface_sdl.h
    M src/gfx/sdl2/gfx_sdl.cc
    M src/gfx/sdl2/screen_sdl.h
    M src/gfx/sdl2/surface_sdl.h
    M src/gfx/sdlgl/gfx_sdlgl.cc
    M src/gfx/sdlgl/screen_sdlgl.cc
    M src/gfx/sdlgl/screen_sdlgl.h
    M src/gfx/sdlgl/surface_sdlgl.h
    M src/gfx/sprite.cc
    M src/gfx/sprite.h
    M src/gfx/surface.cc
    M src/gfx/surface.h
    M src/gfx/surface_cacher.cc
    M src/gfx/surface_cacher.h
    M src/gfx/surface_ext.cc
    M src/gfx/surface_ext.h
    M src/gui/button.cpp
    M src/gui/button.h
    M src/gui/canvas.cc
    M src/gui/canvas.h
    M src/gui/conversation.cc
    M src/gui/conversation.h
    M src/gui/decoration.cc
    M src/gui/decoration.h
    M src/gui/font.cpp
    M src/gui/font.h
    M src/gui/fontcache.cc
    M src/gui/fontcache.h
    M src/gui/gui.h
    M src/gui/indicatorbar.cc
    M src/gui/indicatorbar.h
    M src/gui/label.cpp
    M src/gui/label.h
    M src/gui/layout.cc
    M src/gui/layout.h
    M src/gui/listlayout.cc
    M src/gui/listlayout.h
    M src/gui/option.cpp
    M src/gui/scrollview.cc
    M src/gui/scrollview.h
    M src/gui/test_layout.cc
    M src/gui/test_ui_event.cc
    M src/gui/test_ui_event_manager.cc
    M src/gui/textbox.cpp
    M src/gui/textbox.h
    M src/gui/ui_event.cc
    M src/gui/ui_event.h
    M src/gui/ui_event_manager.cc
    M src/gui/ui_event_manager.h
    M src/gui/widget.cpp
    M src/gui/widget.h
    M src/gui/window_manager.cc
    M src/gui/window_manager.h
    M src/input/control_event.h
    M src/input/event.h
    M src/input/input.cc
    M src/input/input.h
    M src/input/joystick_event.h
    M src/input/keyboard_event.h
    M src/input/listener.h
    M src/input/manager.cc
    M src/input/manager.h
    M src/input/mouse_event.cc
    M src/input/mouse_event.h
    M src/input/sdl/input_sdl.cc
    M src/input/sdl/manager_sdl.cc
    M src/input/sdl/manager_sdl.h
    M src/input/sdl2/input_sdl.cc
    M src/input/sdl2/manager_sdl.h
    M src/main/adonthell.cc
    M src/main/adonthell.h
    M src/main/sdl/linux.cc
    M src/main/sdl/osx.h
    M src/main/sdl/winnt.cc
    M src/py-runtime/py_runtime.i
    M src/py-wrappers/adonthell/py_audio.i
    M src/py-wrappers/adonthell/py_base.i
    M src/py-wrappers/adonthell/py_event.i
    M src/py-wrappers/adonthell/py_gfx.i
    M src/py-wrappers/adonthell/py_gui.i
    M src/py-wrappers/adonthell/py_input.i
    M src/py-wrappers/adonthell/py_main.h
    M src/py-wrappers/adonthell/py_main.i
    M src/py-wrappers/adonthell/py_rpg.i
    M src/py-wrappers/adonthell/py_world.i
    M src/python/callback.cc
    M src/python/callback.h
    M src/python/method.cc
    M src/python/method.h
    M src/python/pool.cc
    M src/python/pool.h
    M src/python/python.cc
    M src/python/python.h
    M src/python/script.cc
    M src/python/script.h
    M src/python/test_python.cc
    M src/rpg/character.cc
    M src/rpg/character.h
    M src/rpg/dialog.cc
    M src/rpg/dialog.h
    M src/rpg/dialog_line.cc
    M src/rpg/dialog_line.h
    M src/rpg/equipment.cc
    M src/rpg/equipment.h
    M src/rpg/faction.cc
    M src/rpg/faction.h
    M src/rpg/group.cc
    M src/rpg/group.h
    M src/rpg/inventory.cc
    M src/rpg/inventory.h
    M src/rpg/item.cc
    M src/rpg/item.h
    M src/rpg/item_storage.cc
    M src/rpg/item_storage.h
    M src/rpg/log_entry.cc
    M src/rpg/log_entry.h
    M src/rpg/log_index.cc
    M src/rpg/log_index.h
    M src/rpg/pathfinding_costs.cc
    M src/rpg/pathfinding_costs.h
    M src/rpg/quest.cc
    M src/rpg/quest.h
    M src/rpg/quest_event.cc
    M src/rpg/quest_event.h
    M src/rpg/quest_event_manager.cc
    M src/rpg/quest_event_manager.h
    M src/rpg/slot.cc
    M src/rpg/slot.h
    M src/rpg/specie.cc
    M src/rpg/specie.h
    M src/world/action.cc
    M src/world/action.h
    M src/world/area.cc
    M src/world/area.h
    M src/world/area_manager.cc
    M src/world/area_manager.h
    M src/world/character.cc
    M src/world/character.h
    M src/world/chunk.cc
    M src/world/chunk.h
    M src/world/chunk_info.cc
    M src/world/chunk_info.h
    M src/world/collision.cc
    M src/world/collision.h
    M src/world/coordinates.h
    M src/world/cube3.cc
    M src/world/cube3.h
    M src/world/entity.h
    M src/world/mapview.cc
    M src/world/mapview.h
    M src/world/move_event.cc
    M src/world/move_event.h
    M src/world/move_event_manager.cc
    M src/world/move_event_manager.h
    M src/world/moving.cc
    M src/world/moving.h
    M src/world/node.h
    M src/world/node_bank.h
    M src/world/node_cache.h
    M src/world/object.cc
    M src/world/object.h
    M src/world/open_list.h
    M src/world/pathfinding.cc
    M src/world/pathfinding.h
    M src/world/pathfinding_manager.cc
    M src/world/pathfinding_manager.h
    M src/world/pathfinding_task.h
    M src/world/placeable.cc
    M src/world/placeable.h
    M src/world/placeable_model.cc
    M src/world/placeable_model.h
    M src/world/placeable_shape.cc
    M src/world/placeable_shape.h
    M src/world/plane3.cc
    M src/world/plane3.h
    M src/world/render_info.h
    M src/world/renderer.cc
    M src/world/renderer.h
    M src/world/schedule.cc
    M src/world/schedule.h
    M src/world/schedule_data.cc
    M src/world/shadow.cc
    M src/world/shadow.h
    M src/world/shadow_info.h
    M src/world/test_placeable.cc
    M src/world/test_renderer.cc
    M src/world/triangle3.cc
    M src/world/triangle3.h
    M src/world/vector3.h
    M src/world/world.cc
    M src/world/world.h
    M src/world/zone.h

  Log Message:
  -----------
  Fixed header include priorities, to avoid confusion of system headers

This commit avoids confusion between adonthell headers and system headers
with the same name, and sometimes even the same directory.

The key is knowing that whenever #include is used with quotes, such as
as the file doing the including.  Repeat, in the same directory as the
file _doing_ the including.

So, for example, if an application does: #include <adonthell/blah/blah.h>
and that blah.h header does: #include "help.h"
then the compiler will search for help.h in adonthell/blah/ *first*,
because that is where blah.h lives.

This is not the case for #include <> style includes, which search the
path list first.

Therefore, we end up with these following simple rules:

        1) if the header you want is in the same directory as the file
           you are working with, use quotes

        2) if the header you want is always relative to the directory of
           the file you are working with, use quotes

        3) for everything else, use angle brackets and the full path of
           the header, including the library name

So, for example, if you're working on src/audio/sound.cc and need to
include sound.h, use: #include "sound.h", with no path, because sound.h
is in the same directory as sound.cc.

If you are working on src/audio/audio.cc and need to include the file
src/base/base.h, use: #include <adonthell/base/base.h>, since the file
is outside of the module you wish to use.

When Adonthell is installed as a library, its headers will also now be
installed under /usr/include/adonthell-<version>/adonthell/...

Therefore, when building an application that depends on, say, adonthell-1.1,
pass -I/usr/include/adonthell-1.1 to the application's compiler, which
will make its #include <adonthell/base/base.h> work properly.


  Commit: 3aa69cc726ea4599821d0f88960751c394a55f13
      
https://github.com/ksterker/adonthell/commit/3aa69cc726ea4599821d0f88960751c394a55f13
  Author: Chris Frey <address@hidden>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M Makefile.am
    M adonthell.pc.cmake
    M adonthell.pc.in
    M src/audio/Makefile.am
    M src/audio/sdl/audio_sdl.cc
    M src/base/Makefile.am
    M src/event/Makefile.am
    M src/gfx/Makefile.am
    M src/gui/Makefile.am
    M src/input/Makefile.am
    M src/main/Makefile.am
    M src/py-runtime/Makefile.am
    M src/py-wrappers/adonthell/Makefile.am
    M src/py-wrappers/adonthell/py_audio.i
    M src/py-wrappers/adonthell/py_event.i
    M src/py-wrappers/adonthell/py_gfx.i
    M src/py-wrappers/adonthell/py_gui.i
    M src/py-wrappers/adonthell/py_input.i
    M src/py-wrappers/adonthell/py_rpg.i
    M src/py-wrappers/adonthell/py_world.i
    M src/python/Makefile.am
    M src/rpg/Makefile.am
    M src/world/Makefile.am
    M test/Makefile.am
    M test/audiotest.cc
    M test/callbacktest.cc
    M test/dialogtest.cc
    M test/diskiotest.cc
    M test/gfxtest.cc
    M test/guitest.cc
    M test/imagetest.cc
    M test/inputtest.cc
    M test/path_test.cc
    M test/smallworld.cc
    M test/worldtest.cc

  Log Message:
  -----------
  Updated autoconf build to support new headers, and fixed python imports and 
tests


  Commit: 8f3f765a77a650d1e0cd160beb4b8afc71439545
      
https://github.com/ksterker/adonthell/commit/8f3f765a77a650d1e0cd160beb4b8afc71439545
  Author: Chris Frey <address@hidden>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M src/CMakeLists.txt

  Log Message:
  -----------
  Remove src/ from include directories, since it is not needed anymore

External module headers are accessed through the adonthell symlink
in the build directory.  Internal module headers are just included
with #include "file.h" quote style.


Compare: 
https://github.com/ksterker/adonthell/compare/e604a8e43a69...8f3f765a77a6