From ea4f8e0bcdbe981c9845d9fb9e56998e17ef61fe Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Thu, 23 Dec 2010 00:00:30 +0000 Subject: [PATCH] - added IRC client to the Internet game menu (still need to update VC++ projects) --- CMakeLists.txt | 32 +- mk/cmake/Modules/Toolchain-mingw32.cmake | 7 - mk/windoze/glest_game.depend | 1012 +--------- mk/windoze/shared_lib.depend | 1679 ++++++++--------- source/configurator/CMakeLists.txt | 20 + source/g3d_viewer/CMakeLists.txt | 21 + source/glest_game/CMakeLists.txt | 24 +- source/glest_game/menu/main_menu.cpp | 6 + .../menu/menu_state_masterserver.cpp | 166 +- .../glest_game/menu/menu_state_masterserver.h | 54 +- source/glest_map_editor/CMakeLists.txt | 21 + source/shared_lib/CMakeLists.txt | 29 +- .../include/platform/posix/ircclient.h | 66 + .../sources/platform/posix/ircclient.cpp | 450 +++-- 14 files changed, 1517 insertions(+), 2070 deletions(-) create mode 100644 source/shared_lib/include/platform/posix/ircclient.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d8f0b007..27d3db5c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,23 +94,25 @@ ENDIF() IF(WIN32) SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} - ${PROJECT_SOURCE_DIR}/source/win32_deps/lib - ${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib - ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib) + ${PROJECT_SOURCE_DIR}/source/win32_deps/lib + ${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib + ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib + ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib) SET(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} - ${PROJECT_SOURCE_DIR}/source/win32_deps/include - ${PROJECT_SOURCE_DIR}/source/win32_deps/openal-soft-1.12.854/include - ${PROJECT_SOURCE_DIR}/source/win32_deps/openal-soft-1.12.854 - ${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/include - ${PROJECT_SOURCE_DIR}/source/win32_deps/libogg-1.2.1/include - ${PROJECT_SOURCE_DIR}/source/win32_deps/lua-5.1/src - ${PROJECT_SOURCE_DIR}/source/win32_deps/jpeg-8b - ${PROJECT_SOURCE_DIR}/source/win32_deps/lpng141 - ${PROJECT_SOURCE_DIR}/source/win32_deps/zlib-1.2.5 - ${PROJECT_SOURCE_DIR}/source/win32_deps/curl-7.20.1/include - ${PROJECT_SOURCE_DIR}/source/win32_deps/SDL-1.2.x/include - ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/include) + ${PROJECT_SOURCE_DIR}/source/win32_deps/include + ${PROJECT_SOURCE_DIR}/source/win32_deps/openal-soft-1.12.854/include + ${PROJECT_SOURCE_DIR}/source/win32_deps/openal-soft-1.12.854 + ${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/include + ${PROJECT_SOURCE_DIR}/source/win32_deps/libogg-1.2.1/include + ${PROJECT_SOURCE_DIR}/source/win32_deps/lua-5.1/src + ${PROJECT_SOURCE_DIR}/source/win32_deps/jpeg-8b + ${PROJECT_SOURCE_DIR}/source/win32_deps/lpng141 + ${PROJECT_SOURCE_DIR}/source/win32_deps/zlib-1.2.5 + ${PROJECT_SOURCE_DIR}/source/win32_deps/curl-7.20.1/include + ${PROJECT_SOURCE_DIR}/source/win32_deps/SDL-1.2.x/include + ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/include) + link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/lib) link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib) link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib) diff --git a/mk/cmake/Modules/Toolchain-mingw32.cmake b/mk/cmake/Modules/Toolchain-mingw32.cmake index 2f3a1360c..ff6b0e6cb 100644 --- a/mk/cmake/Modules/Toolchain-mingw32.cmake +++ b/mk/cmake/Modules/Toolchain-mingw32.cmake @@ -8,13 +8,6 @@ SET(CMAKE_CXX_COMPILER i586-mingw32msvc-g++) # here is the target environment located SET(CMAKE_FIND_ROOT_PATH /usr/i586-mingw32msvc ${PROJECT_SOURCE_DIR}/source/win32_deps/lib) -# which compilers to use for C and C++ -#SET(CMAKE_C_COMPILER amd64-mingw32msvc-gcc) -#SET(CMAKE_CXX_COMPILER amd64-mingw32msvc-g++) - -# here is the target environment located -#SET(CMAKE_FIND_ROOT_PATH /usr/amd64-mingw32msvc ${PROJECT_SOURCE_DIR}/source/win32_deps/lib) - # adjust the default behaviour of the FIND_XXX() commands: # search headers and libraries in the target environment, search # programs in the host environment diff --git a/mk/windoze/glest_game.depend b/mk/windoze/glest_game.depend index ba7ec072a..7ac5efe2c 100644 --- a/mk/windoze/glest_game.depend +++ b/mk/windoze/glest_game.depend @@ -94,7 +94,7 @@ "damage_multiplier.h" "leak_dumper.h" -1287163061 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/util/util.h +1292977016 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/util/util.h @@ -798,7 +798,7 @@ "vec.h" "leak_dumper.h" -1292730511 /home/softcoder/Code/megaglest/trunk/source/glest_game/world/unit_updater.h +1292947098 /home/softcoder/Code/megaglest/trunk/source/glest_game/world/unit_updater.h "gui.h" "particle.h" "randomgen.h" @@ -991,7 +991,7 @@ "vec.h" "leak_dumper.h" -1292893290 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/posix/socket.h +1292906793 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/posix/socket.h @@ -1458,6 +1458,25 @@ "sound_container.h" "leak_dumper.h" +1293061072 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/facilities/game_util.cpp + "game_util.h" + "util.h" + "lang.h" + "game_constants.h" + "config.h" + + "platform_util.h" + "conversion.h" + "cache_manager.h" + "leak_dumper.h" + +1283810433 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/common/cache_manager.h + "thread.h" + + + + "leak_dumper.h" + 1291925260 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/facilities/logger.cpp "logger.h" "util.h" @@ -1603,7 +1622,7 @@ "stats.h" "leak_dumper.h" -1292054591 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/global/config.cpp +1292977657 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/global/config.cpp "config.h" "util.h" "game_constants.h" @@ -1782,13 +1801,6 @@ "sound_factory.h" "leak_dumper.h" -1283810433 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/common/cache_manager.h - "thread.h" - - - - "leak_dumper.h" - 1286388715 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/graphics/unit_particle_type.cpp "unit_particle_type.h" "util.h" @@ -1881,981 +1893,3 @@ "texture.h" "leak_dumper.h" -1291927045 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/main/main.cpp - "math_wrapper.h" - "main.h" - - - "game.h" - "main_menu.h" - "program.h" - "config.h" - "metrics.h" - "game_util.h" - "platform_util.h" - "platform_main.h" - "network_interface.h" - "ImageReaders.h" - "renderer.h" - "simple_threads.h" - - "font.h" - - "menu_state_masterserver.h" - "checksum.h" - - "sound_renderer.h" - "font_gl.h" - "cache_manager.h" - - - "leak_dumper.h" - -1285619697 /home/softcoder/Code/megaglest/trunk/source/glest_game/main/main.h - - "program.h" - "window_gl.h" - "leak_dumper.h" - -1291504513 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/sdl/platform_main.h - - - "leak_dumper.h" - -1283809810 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/graphics/ImageReaders.h - "FileReader.h" - "BMPReader.h" - "JPGReader.h" - "PNGReader.h" - "TGAReader.h" - "leak_dumper.h" - -1287645654 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/graphics/FileReader.h - "platform_util.h" - - - - - - - - - "leak_dumper.h" - -1283809807 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/graphics/BMPReader.h - "FileReader.h" - "pixmap.h" - "leak_dumper.h" - -1283809810 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/graphics/JPGReader.h - "FileReader.h" - "pixmap.h" - "leak_dumper.h" - -1283809814 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/graphics/PNGReader.h - "FileReader.h" - "pixmap.h" - "leak_dumper.h" - -1283809817 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/graphics/TGAReader.h - "FileReader.h" - "pixmap.h" - "leak_dumper.h" - -1292628583 /home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_masterserver.h - "main_menu.h" - "masterserver_info.h" - "simple_threads.h" - "network_interface.h" - "leak_dumper.h" - -1283808672 /home/softcoder/Code/megaglest/trunk/source/glest_game/network/masterserver_info.h - - "leak_dumper.h" - -1290850290 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/dbghelp.h - - - -1292621322 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/main/program.cpp - "program.h" - "sound.h" - "renderer.h" - "config.h" - "game.h" - "main_menu.h" - "intro.h" - "world.h" - "main.h" - "sound_renderer.h" - "logger.h" - "profiler.h" - "core_data.h" - "metrics.h" - "network_manager.h" - "menu_state_custom_game.h" - "menu_state_join_game.h" - "menu_state_scenario.h" - "leak_dumper.h" - -1292892634 /home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_custom_game.h - "main_menu.h" - "chat_manager.h" - "simple_threads.h" - "map_preview.h" - "leak_dumper.h" - -1284060473 /home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_join_game.h - "properties.h" - "main_menu.h" - "chat_manager.h" - - - "leak_dumper.h" - -1291925439 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/menu/main_menu.cpp - "main_menu.h" - "renderer.h" - "sound.h" - "config.h" - "program.h" - "game_util.h" - "game.h" - "platform_util.h" - "sound_renderer.h" - "core_data.h" - "faction.h" - "metrics.h" - "network_manager.h" - "network_message.h" - "socket.h" - "menu_state_root.h" - "leak_dumper.h" - -1284060678 /home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_root.h - "main_menu.h" - "leak_dumper.h" - -1291925528 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_background.cpp - "menu_background.h" - - "renderer.h" - "core_data.h" - "config.h" - "xml_parser.h" - "util.h" - "game_constants.h" - "game_util.h" - "leak_dumper.h" - -1284061399 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_about.cpp - "menu_state_about.h" - "renderer.h" - "menu_state_root.h" - "sound_renderer.h" - "core_data.h" - "config.h" - "menu_state_options.h" - "leak_dumper.h" - -1284061346 /home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_about.h - "main_menu.h" - "leak_dumper.h" - -1286891785 /home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_options.h - "main_menu.h" - "leak_dumper.h" - -1292882427 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_connected_game.cpp - "menu_state_connected_game.h" - "menu_state_join_game.h" - "menu_state_masterserver.h" - "renderer.h" - "sound_renderer.h" - "core_data.h" - "config.h" - "menu_state_new_game.h" - "metrics.h" - "network_manager.h" - "network_message.h" - "client_interface.h" - "conversion.h" - "socket.h" - "game.h" - - - "cache_manager.h" - "leak_dumper.h" - -1290828295 /home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_connected_game.h - "main_menu.h" - "chat_manager.h" - "map_preview.h" - "leak_dumper.h" - -1292893367 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_custom_game.cpp - "menu_state_custom_game.h" - "renderer.h" - "sound_renderer.h" - "core_data.h" - "config.h" - "menu_state_new_game.h" - "menu_state_masterserver.h" - "metrics.h" - "network_manager.h" - "network_message.h" - "client_interface.h" - "conversion.h" - "socket.h" - "game.h" - "util.h" - - - - "cache_manager.h" - "leak_dumper.h" - -1284061382 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_graphic_info.cpp - "menu_state_graphic_info.h" - "renderer.h" - "sound_renderer.h" - "core_data.h" - "menu_state_options.h" - "config.h" - "leak_dumper.h" - -1284061301 /home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_graphic_info.h - "main_menu.h" - "leak_dumper.h" - -1292708757 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_join_game.cpp - "menu_state_join_game.h" - "menu_state_connected_game.h" - "renderer.h" - "sound_renderer.h" - "core_data.h" - "config.h" - "menu_state_root.h" - "metrics.h" - "network_manager.h" - "network_message.h" - "client_interface.h" - "conversion.h" - "game.h" - "socket.h" - "leak_dumper.h" - -1292882427 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_masterserver.cpp - "menu_state_masterserver.h" - "renderer.h" - "sound_renderer.h" - "core_data.h" - "config.h" - "menu_state_connected_game.h" - "menu_state_custom_game.h" - "menu_state_root.h" - "metrics.h" - "network_manager.h" - "network_message.h" - "auto_test.h" - "socket.h" - "masterserver_info.h" - - "leak_dumper.h" - -1284061176 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_new_game.cpp - "menu_state_new_game.h" - "renderer.h" - "sound_renderer.h" - "core_data.h" - "config.h" - "menu_state_custom_game.h" - "menu_state_scenario.h" - "menu_state_root.h" - "metrics.h" - "network_manager.h" - "network_message.h" - "auto_test.h" - "socket.h" - "leak_dumper.h" - -1291925982 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_options.cpp - "menu_state_options.h" - "renderer.h" - "sound_renderer.h" - "core_data.h" - "config.h" - "menu_state_root.h" - "util.h" - "menu_state_graphic_info.h" - "leak_dumper.h" - -1292050232 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_root.cpp - "menu_state_root.h" - "renderer.h" - "sound_renderer.h" - "core_data.h" - "config.h" - "menu_state_new_game.h" - "menu_state_join_game.h" - "menu_state_options.h" - "menu_state_about.h" - "menu_state_masterserver.h" - "metrics.h" - "network_manager.h" - "network_message.h" - "socket.h" - "auto_test.h" - "leak_dumper.h" - -1292050232 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_scenario.cpp - "menu_state_scenario.h" - "renderer.h" - "menu_state_new_game.h" - "sound_renderer.h" - "core_data.h" - "menu_state_options.h" - "network_manager.h" - "config.h" - "auto_test.h" - "game.h" - "leak_dumper.h" - -1287801420 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/network/client_interface.cpp - "client_interface.h" - - - "platform_util.h" - "game_util.h" - "conversion.h" - "config.h" - "lang.h" - "leak_dumper.h" - "map.h" - "config.h" - "logger.h" - -1287801465 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/network/connection_slot.cpp - "connection_slot.h" - - "conversion.h" - "game_util.h" - "config.h" - "server_interface.h" - "network_message.h" - "leak_dumper.h" - "platform_util.h" - "map.h" - -1281396515 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/network/network_interface.cpp - "network_interface.h" - - - "types.h" - "conversion.h" - "platform_util.h" - - "util.h" - "leak_dumper.h" - -1292283355 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/network/network_manager.cpp - "network_manager.h" - "util.h" - "leak_dumper.h" - -1292743481 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/network/network_message.cpp - "network_message.h" - - - "types.h" - "util.h" - "game_settings.h" - "leak_dumper.h" - "checksum.h" - "map.h" - "platform_util.h" - "config.h" - - -1283198503 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/network/network_types.cpp - "network_types.h" - "util.h" - "unit.h" - "world.h" - "unit_type.h" - "game.h" - "gui.h" - "leak_dumper.h" - -1268371625 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/sound/sound_container.cpp - "sound_container.h" - "util.h" - "leak_dumper.h" - -1283990458 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/sound/sound_renderer.cpp - "sound_renderer.h" - "core_data.h" - "config.h" - "sound_interface.h" - "factory_repository.h" - "util.h" - "leak_dumper.h" - -1283810443 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/sound/sound_interface.h - "sound_factory.h" - "leak_dumper.h" - -1291161894 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/type_instances/command.cpp - "command.h" - "command_type.h" - "util.h" - "conversion.h" - "unit_type.h" - "leak_dumper.h" - -1291925595 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/type_instances/faction.cpp - "faction.h" - - - "resource_type.h" - "unit.h" - "util.h" - "sound_renderer.h" - "renderer.h" - "tech_tree.h" - "game.h" - "config.h" - "leak_dumper.h" - -1288470965 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/type_instances/object.cpp - "object.h" - "faction_type.h" - "tech_tree.h" - "resource.h" - "upgrade.h" - "object_type.h" - "resource.h" - "util.h" - "randomgen.h" - "renderer.h" - "leak_dumper.h" - -1268371625 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/type_instances/resource.cpp - "resource.h" - "conversion.h" - "resource_type.h" - "leak_dumper.h" - -1291246319 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/type_instances/unit.cpp - "faction.h" - - "unit.h" - "unit_particle_type.h" - "world.h" - "upgrade.h" - "map.h" - "command.h" - "object.h" - "config.h" - "skill_type.h" - "core_data.h" - "renderer.h" - "game.h" - "socket.h" - "leak_dumper.h" - -1289111416 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/type_instances/upgrade.cpp - "upgrade.h" - - "unit.h" - "util.h" - "upgrade_type.h" - "conversion.h" - "leak_dumper.h" - -1289458292 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/types/command_type.cpp - "command_type.h" - - - "upgrade_type.h" - "unit_type.h" - "sound.h" - "util.h" - "leak_dumper.h" - "graphics_interface.h" - "tech_tree.h" - "faction_type.h" - "unit_updater.h" - "renderer.h" - "leak_dumper.h" - "socket.h" - -1268371624 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/types/damage_multiplier.cpp - "damage_multiplier.h" - "leak_dumper.h" - -1281396382 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/types/element_type.cpp - "element_type.h" - - "resource_type.h" - "upgrade_type.h" - "unit_type.h" - "resource.h" - "tech_tree.h" - "logger.h" - "lang.h" - "renderer.h" - "leak_dumper.h" - -1288224781 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/types/faction_type.cpp - "faction_type.h" - "logger.h" - "util.h" - "xml_parser.h" - "tech_tree.h" - "resource.h" - "platform_util.h" - "game_util.h" - "conversion.h" - "leak_dumper.h" - -1289287514 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/types/object_type.cpp - "object_type.h" - "renderer.h" - "leak_dumper.h" - -1288222076 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/types/resource_type.cpp - "resource_type.h" - "util.h" - "element_type.h" - "logger.h" - "renderer.h" - "xml_parser.h" - "game_util.h" - "leak_dumper.h" - -1277376564 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/types/skill_type.cpp - "skill_type.h" - - "sound.h" - "util.h" - "lang.h" - "renderer.h" - "particle_type.h" - "unit_particle_type.h" - "tech_tree.h" - "faction_type.h" - "leak_dumper.h" - -1288226739 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/types/tech_tree.cpp - "tech_tree.h" - - "util.h" - "resource.h" - "faction_type.h" - "logger.h" - "xml_parser.h" - "platform_util.h" - "game_util.h" - "leak_dumper.h" - -1289103505 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/types/unit_type.cpp - "unit_type.h" - - "util.h" - "upgrade_type.h" - "resource_type.h" - "sound.h" - "logger.h" - "xml_parser.h" - "tech_tree.h" - "resource.h" - "renderer.h" - "game_util.h" - "unit_particle_type.h" - "faction.h" - "leak_dumper.h" - -1286390360 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/types/upgrade_type.cpp - "upgrade_type.h" - - - "unit_type.h" - "util.h" - "logger.h" - "lang.h" - "xml_parser.h" - "tech_tree.h" - "faction_type.h" - "resource.h" - "renderer.h" - "game_util.h" - "leak_dumper.h" - -1292729134 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/world/map.cpp - "map.h" - - "tileset.h" - "unit.h" - "resource.h" - "logger.h" - "tech_tree.h" - "config.h" - "util.h" - "game_settings.h" - "platform_util.h" - "pos_iterator.h" - "faction.h" - "command.h" - "leak_dumper.h" - -1292745087 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/world/minimap.cpp - "minimap.h" - - "world.h" - "vec.h" - "renderer.h" - "config.h" - "object.h" - "game_settings.h" - "leak_dumper.h" - -1286390360 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/world/scenario.cpp - "scenario.h" - - "logger.h" - "xml_parser.h" - "util.h" - "game_util.h" - "leak_dumper.h" - - -1284101068 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/world/surface_atlas.cpp - "surface_atlas.h" - - - "renderer.h" - "util.h" - "math_util.h" - "leak_dumper.h" - -1288624190 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/world/tileset.cpp - "tileset.h" - - - "logger.h" - "util.h" - "renderer.h" - "game_util.h" - "leak_dumper.h" - "platform_util.h" - -1275752460 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/world/time_flow.cpp - "time_flow.h" - "sound_renderer.h" - "config.h" - "game_constants.h" - "util.h" - "leak_dumper.h" - -1292876302 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/world/unit_updater.cpp - "unit_updater.h" - - - "cartographer.h" - "core_data.h" - "config.h" - "game.h" - "faction.h" - "network_manager.h" - "object.h" - "particle_type.h" - "path_finder.h" - "renderer.h" - "route_planner.h" - "sound.h" - "sound_renderer.h" - "upgrade.h" - "unit.h" - "leak_dumper.h" - -1292863749 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/world/water_effects.cpp - "water_effects.h" - "config.h" - "map.h" - "leak_dumper.h" - -1292863749 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/world/world.cpp - "world.h" - - - "config.h" - "faction.h" - "unit.h" - "game.h" - "logger.h" - "sound_renderer.h" - "game_settings.h" - "cache_manager.h" - "route_planner.h" - - "leak_dumper.h" - -1292901366 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/facilities/game_util.cpp - "game_util.h" - "util.h" - "lang.h" - "game_constants.h" - "config.h" - - "platform_util.h" - "conversion.h" - "cache_manager.h" - "leak_dumper.h" - -1292863107 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/network/server_interface.cpp - "server_interface.h" - - - "platform_util.h" - "conversion.h" - "config.h" - "lang.h" - "logger.h" - - "util.h" - "game_util.h" - "leak_dumper.h" - -1278057011 /usr/include/SDL/SDL_thread.h - "SDL_stdinc.h" - "SDL_error.h" - "SDL_mutex.h" - "begin_code.h" - - "close_code.h" - -1278057011 /usr/include/SDL/SDL_stdinc.h - "SDL_config.h" - - - - - - - - - - - - - - - - - "begin_code.h" - - - - - - "close_code.h" - -1278057011 /usr/include/SDL/SDL_config.h - "SDL_platform.h" - - -1278057011 /usr/include/SDL/SDL_platform.h - -1278057011 /usr/include/SDL/begin_code.h - -1278057011 /usr/include/SDL/close_code.h - -1278057011 /usr/include/SDL/SDL_error.h - "SDL_stdinc.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_mutex.h - "SDL_stdinc.h" - "SDL_error.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_types.h - "SDL_stdinc.h" - -1278057011 /usr/include/SDL/SDL.h - "SDL_main.h" - "SDL_stdinc.h" - "SDL_audio.h" - "SDL_cdrom.h" - "SDL_cpuinfo.h" - "SDL_endian.h" - "SDL_error.h" - "SDL_events.h" - "SDL_loadso.h" - "SDL_mutex.h" - "SDL_rwops.h" - "SDL_thread.h" - "SDL_timer.h" - "SDL_video.h" - "SDL_version.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_main.h - "SDL_stdinc.h" - "begin_code.h" - "close_code.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_audio.h - "SDL_stdinc.h" - "SDL_error.h" - "SDL_endian.h" - "SDL_mutex.h" - "SDL_thread.h" - "SDL_rwops.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_endian.h - "SDL_stdinc.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_rwops.h - "SDL_stdinc.h" - "SDL_error.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_cdrom.h - "SDL_stdinc.h" - "SDL_error.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_cpuinfo.h - "SDL_stdinc.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_events.h - "SDL_stdinc.h" - "SDL_error.h" - "SDL_active.h" - "SDL_keyboard.h" - "SDL_mouse.h" - "SDL_joystick.h" - "SDL_quit.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_active.h - "SDL_stdinc.h" - "SDL_error.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_keyboard.h - "SDL_stdinc.h" - "SDL_error.h" - "SDL_keysym.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_keysym.h - -1278057011 /usr/include/SDL/SDL_mouse.h - "SDL_stdinc.h" - "SDL_error.h" - "SDL_video.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_video.h - "SDL_stdinc.h" - "SDL_error.h" - "SDL_rwops.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_joystick.h - "SDL_stdinc.h" - "SDL_error.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_quit.h - "SDL_stdinc.h" - "SDL_error.h" - -1278057011 /usr/include/SDL/SDL_loadso.h - "SDL_stdinc.h" - "SDL_error.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_timer.h - "SDL_stdinc.h" - "SDL_error.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_version.h - "SDL_stdinc.h" - "begin_code.h" - "close_code.h" - -1283810437 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/sdl/platform_util.h - - - "platform_common.h" - "leak_dumper.h" - -1278057011 /usr/include/SDL/SDL_opengl.h - "SDL_config.h" - - - - - - - - - - -1103763184 /usr/include/lua5.1/lua.hpp - "lua.h" - "lualib.h" - "lauxlib.h" - -1218029412 /usr/include/lua5.1/lua.h - - - "luaconf.h" - -1259004059 /usr/include/lua5.1/luaconf.h - - - - - - - - - - - - -1198760545 /usr/include/lua5.1/lualib.h - "lua.h" - -1198760545 /usr/include/lua5.1/lauxlib.h - - - "lua.h" - diff --git a/mk/windoze/shared_lib.depend b/mk/windoze/shared_lib.depend index 75bc40e0c..4fa415904 100644 --- a/mk/windoze/shared_lib.depend +++ b/mk/windoze/shared_lib.depend @@ -23,8 +23,7 @@ "leak_dumper.h" -1288939635 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/win32/platform_util.h - +1283810437 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/sdl/platform_util.h "platform_common.h" @@ -42,50 +41,14 @@ "leak_dumper.h" -1287676545 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/win32/types.h - +1287674976 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/sdl/types.h + "leak_dumper.h" -1283985454 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/util/leak_dumper.h - - - - -1283810444 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/util/checksum.h - - - "types.h" - "leak_dumper.h" - -1291360192 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/map - -1290846669 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL.h - "SDL_main.h" +1278057011 /usr/include/SDL/SDL_types.h "SDL_stdinc.h" - "SDL_audio.h" - "SDL_cdrom.h" - "SDL_cpuinfo.h" - "SDL_endian.h" - "SDL_error.h" - "SDL_events.h" - "SDL_loadso.h" - "SDL_mutex.h" - "SDL_rwops.h" - "SDL_thread.h" - "SDL_timer.h" - "SDL_video.h" - "SDL_version.h" - "begin_code.h" - "close_code.h" -1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_main.h - "SDL_stdinc.h" - "begin_code.h" - "close_code.h" - "begin_code.h" - "close_code.h" - -1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_stdinc.h +1278057011 /usr/include/SDL/SDL_stdinc.h "SDL_config.h" @@ -111,17 +74,56 @@ "close_code.h" -1291399086 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_config.h +1278057011 /usr/include/SDL/SDL_config.h "SDL_platform.h" -1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_platform.h +1278057011 /usr/include/SDL/SDL_platform.h -1290846669 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/begin_code.h +1278057011 /usr/include/SDL/begin_code.h -1290846669 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/close_code.h +1278057011 /usr/include/SDL/close_code.h -1290846669 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_audio.h +1283985454 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/util/leak_dumper.h + + + + +1283810444 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/util/checksum.h + + + "types.h" + "leak_dumper.h" + +1291360192 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/map + +1278057011 /usr/include/SDL/SDL.h + "SDL_main.h" + "SDL_stdinc.h" + "SDL_audio.h" + "SDL_cdrom.h" + "SDL_cpuinfo.h" + "SDL_endian.h" + "SDL_error.h" + "SDL_events.h" + "SDL_loadso.h" + "SDL_mutex.h" + "SDL_rwops.h" + "SDL_thread.h" + "SDL_timer.h" + "SDL_video.h" + "SDL_version.h" + "begin_code.h" + "close_code.h" + +1278057011 /usr/include/SDL/SDL_main.h + "SDL_stdinc.h" + "begin_code.h" + "close_code.h" + "begin_code.h" + "close_code.h" + +1278057011 /usr/include/SDL/SDL_audio.h "SDL_stdinc.h" "SDL_error.h" "SDL_endian.h" @@ -131,24 +133,23 @@ "begin_code.h" "close_code.h" -1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_error.h +1278057011 /usr/include/SDL/SDL_error.h "SDL_stdinc.h" "begin_code.h" "close_code.h" -1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_endian.h +1278057011 /usr/include/SDL/SDL_endian.h "SDL_stdinc.h" - "begin_code.h" "close_code.h" -1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_mutex.h +1278057011 /usr/include/SDL/SDL_mutex.h "SDL_stdinc.h" "SDL_error.h" "begin_code.h" "close_code.h" -1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_thread.h +1278057011 /usr/include/SDL/SDL_thread.h "SDL_stdinc.h" "SDL_error.h" "SDL_mutex.h" @@ -156,24 +157,24 @@ "close_code.h" -1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_rwops.h +1278057011 /usr/include/SDL/SDL_rwops.h "SDL_stdinc.h" "SDL_error.h" "begin_code.h" "close_code.h" -1290846669 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_cdrom.h +1278057011 /usr/include/SDL/SDL_cdrom.h "SDL_stdinc.h" "SDL_error.h" "begin_code.h" "close_code.h" -1290846669 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_cpuinfo.h +1278057011 /usr/include/SDL/SDL_cpuinfo.h "SDL_stdinc.h" "begin_code.h" "close_code.h" -1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_events.h +1278057011 /usr/include/SDL/SDL_events.h "SDL_stdinc.h" "SDL_error.h" "SDL_active.h" @@ -184,58 +185,58 @@ "begin_code.h" "close_code.h" -1290846669 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_active.h +1278057011 /usr/include/SDL/SDL_active.h "SDL_stdinc.h" "SDL_error.h" "begin_code.h" "close_code.h" -1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_keyboard.h +1278057011 /usr/include/SDL/SDL_keyboard.h "SDL_stdinc.h" "SDL_error.h" "SDL_keysym.h" "begin_code.h" "close_code.h" -1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_keysym.h +1278057011 /usr/include/SDL/SDL_keysym.h -1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_mouse.h +1278057011 /usr/include/SDL/SDL_mouse.h "SDL_stdinc.h" "SDL_error.h" "SDL_video.h" "begin_code.h" "close_code.h" -1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_video.h +1278057011 /usr/include/SDL/SDL_video.h "SDL_stdinc.h" "SDL_error.h" "SDL_rwops.h" "begin_code.h" "close_code.h" -1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_joystick.h +1278057011 /usr/include/SDL/SDL_joystick.h "SDL_stdinc.h" "SDL_error.h" "begin_code.h" "close_code.h" -1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_quit.h +1278057011 /usr/include/SDL/SDL_quit.h "SDL_stdinc.h" "SDL_error.h" -1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_loadso.h +1278057011 /usr/include/SDL/SDL_loadso.h "SDL_stdinc.h" "SDL_error.h" "begin_code.h" "close_code.h" -1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_timer.h +1278057011 /usr/include/SDL/SDL_timer.h "SDL_stdinc.h" "SDL_error.h" "begin_code.h" "close_code.h" -1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_version.h +1278057011 /usr/include/SDL/SDL_version.h "SDL_stdinc.h" "begin_code.h" "close_code.h" @@ -322,20 +323,6 @@ "leak_dumper.h" -1258371882 /home/softcoder/Code/megaglest/trunk/source/win32_deps/jpeg-8b/jpeglib.h - "jconfig.h" - "jmorecfg.h" - "jpegint.h" - "jerror.h" - -1291432433 /home/softcoder/Code/megaglest/trunk/source/win32_deps/jpeg-8b/jconfig.h - -1258704084 /home/softcoder/Code/megaglest/trunk/source/win32_deps/jpeg-8b/jmorecfg.h - -1253350284 /home/softcoder/Code/megaglest/trunk/source/win32_deps/jpeg-8b/jpegint.h - -1237929872 /home/softcoder/Code/megaglest/trunk/source/win32_deps/jpeg-8b/jerror.h - 1287645655 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/graphics/PNGReader.cpp "PNGReader.h" "types.h" @@ -345,32 +332,6 @@ "leak_dumper.h" -1290847506 /home/softcoder/Code/megaglest/trunk/source/win32_deps/lpng141/png.h - "zlib.h" - "pngconf.h" - -1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/zlib.h - "zconf.h" - -1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/zconf.h - - - - - -1290847506 /home/softcoder/Code/megaglest/trunk/source/win32_deps/lpng141/pngconf.h - - "config.h" - "pngusr.h" - - - - - - - - - 1284479244 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/graphics/TGAReader.cpp "TGAReader.h" "types.h" @@ -450,7 +411,7 @@ "randomgen.h" -1287163061 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/util/util.h +1292977016 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/util/util.h @@ -465,46 +426,6 @@ "leak_dumper.h" -1290847573 /home/softcoder/Code/megaglest/trunk/source/win32_deps/curl-7.20.1/include/curl/curl.h - "curlver.h" - "curlbuild.h" - "curlrules.h" - - - - - - - - - - - - - "easy.h" - "multi.h" - "typecheck-gcc.h" - -1290847573 /home/softcoder/Code/megaglest/trunk/source/win32_deps/curl-7.20.1/include/curl/curlver.h - -1291422070 /home/softcoder/Code/megaglest/trunk/source/win32_deps/curl-7.20.1/include/curl/curlbuild.h - - - - - - - - -1290847573 /home/softcoder/Code/megaglest/trunk/source/win32_deps/curl-7.20.1/include/curl/curlrules.h - -1290847573 /home/softcoder/Code/megaglest/trunk/source/win32_deps/curl-7.20.1/include/curl/easy.h - -1290847573 /home/softcoder/Code/megaglest/trunk/source/win32_deps/curl-7.20.1/include/curl/multi.h - "curl.h" - -1290847573 /home/softcoder/Code/megaglest/trunk/source/win32_deps/curl-7.20.1/include/curl/typecheck-gcc.h - 1283810447 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/util/randomgen.h "leak_dumper.h" @@ -543,19 +464,7 @@ "leak_dumper.h" -1290847560 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/glprocs.h - "glext.h" - "wglext.h" - - -1290847560 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/glext.h - - - -1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/wglext.h - - -1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_opengl.h +1278057011 /usr/include/SDL/SDL_opengl.h "SDL_config.h" @@ -567,15 +476,6 @@ -1290847560 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/gl.h - -1287674976 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/sdl/types.h - - "leak_dumper.h" - -1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_types.h - "SDL_stdinc.h" - 1287645655 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/graphics/gl/context_gl.cpp "context_gl.h" @@ -852,17 +752,17 @@ "leak_dumper.h" -1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/lua.hpp +1103763184 /usr/include/lua5.1/lua.hpp "lua.h" "lualib.h" "lauxlib.h" -1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/lua.h +1218029412 /usr/include/lua5.1/lua.h "luaconf.h" -1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/luaconf.h +1259004059 /usr/include/lua5.1/luaconf.h @@ -875,10 +775,10 @@ -1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/lualib.h +1198760545 /usr/include/lua5.1/lualib.h "lua.h" -1290847560 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/lauxlib.h +1198760545 /usr/include/lua5.1/lauxlib.h "lua.h" @@ -889,6 +789,17 @@ +1292712339 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/common/base_thread.cpp + "base_thread.h" + "platform_common.h" + "util.h" + + +1292712000 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/common/base_thread.h + "leak_dumper.h" + "thread.h" + + 1272676580 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/common/cache_manager.cpp "cache_manager.h" @@ -899,42 +810,39 @@ "leak_dumper.h" -1291512583 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/common/simple_threads.cpp - "simple_threads.h" - "util.h" +1292281921 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/common/platform_common.cpp "platform_common.h" - -1291510227 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/common/simple_threads.h - "base_thread.h" - - - "leak_dumper.h" - -1292712000 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/common/base_thread.h - "leak_dumper.h" - "thread.h" - - -1284712042 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/sdl/gl_wrap.cpp - "gl_wrap.h" + "cache_manager.h" + + + + + + + + - - "opengl.h" - "sdl_private.h" - "noimpl.h" + + + + "util.h" + "conversion.h" + "leak_dumper.h" + "sdl_private.h" "window.h" - + "noimpl.h" + "checksum.h" + "socket.h" + + "leak_dumper.h" 1283810437 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/sdl/sdl_private.h "leak_dumper.h" -1283810436 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/sdl/noimpl.h - "leak_dumper.h" - 1286498202 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/sdl/window.h @@ -944,20 +852,222 @@ "vec.h" "leak_dumper.h" -1281396638 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/sdl/window_gl.cpp - "window_gl.h" - "gl_wrap.h" - "graphics_interface.h" +1283810436 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/sdl/noimpl.h "leak_dumper.h" -1283810439 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/sdl/window_gl.h - "context_gl.h" - "window.h" +1292906793 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/posix/socket.h + + + + + + + "base_thread.h" + "simple_threads.h" + + + + + + + "leak_dumper.h" -1284648940 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/win32/factory_repository.cpp +1291510227 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/common/simple_threads.h + "base_thread.h" + + + "leak_dumper.h" + +1292975956 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/common/simple_threads.cpp + "simple_threads.h" + "util.h" + "platform_common.h" + +1279815665 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/igd_desc_parse.c + "igd_desc_parse.h" + + + +1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/igd_desc_parse.h + +1279815665 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/minisoap.c + + + + + + + + "minisoap.h" + "miniupnpcstrings.h" + + +1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/minisoap.h + +1292887418 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/miniupnpcstrings.h + +1292911346 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/minissdpc.c + + + + + + + + + + + "minissdpc.h" + "miniupnpc.h" + "codelength.h" + +1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/minissdpc.h + +1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/miniupnpc.h + "declspec.h" + "igd_desc_parse.h" + +1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/declspec.h + +1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/codelength.h + +1292887431 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/miniupnpc.c + + + + + + + + + + + + + + + + + + + + "miniupnpc.h" + "minissdpc.h" + "miniwget.h" + "minisoap.h" + "minixml.h" + "upnpcommands.h" + +1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/miniwget.h + "declspec.h" + +1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/minixml.h + +1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/upnpcommands.h + "upnpreplyparse.h" + "declspec.h" + +1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/upnpreplyparse.h + "bsdqueue.h" + + +1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/bsdqueue.h + +1279815665 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/miniwget.c + + + + "miniupnpc.h" + + + + + + + + + + + + "miniupnpcstrings.h" + "miniwget.h" + +1279815665 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/minixml.c + "minixml.h" + +1279815665 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/upnpcommands.c + + + + "upnpcommands.h" + "miniupnpc.h" + +1279815665 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/upnperrors.c + + "upnperrors.h" + "upnpcommands.h" + +1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/upnperrors.h + "declspec.h" + +1279815665 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/upnpreplyparse.c + + + + "upnpreplyparse.h" + "minixml.h" + +1293046466 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/posix/ircclient.cpp + "ircclient.h" + "util.h" + "platform_common.h" + + + + + +1293057343 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/posix/ircclient.h + "base_thread.h" + + + + "libircclient.h" + "leak_dumper.h" + +1292907323 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/posix/socket.cpp + "socket.h" + + + + + + + "conversion.h" + "util.h" + "platform_util.h" + + + + + + + + + + + + + + + "miniwget.h" + "miniupnpc.h" + "upnpcommands.h" + "leak_dumper.h" + + +1281396630 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/sdl/factory_repository.cpp "factory_repository.h" - "leak_dumper.h" 1283810436 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/sdl/factory_repository.h @@ -1033,21 +1143,6 @@ "shader_manager.h" "leak_dumper.h" -1268371626 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/sound/ds8/sound_factory_ds8.h - "sound_factory.h" - "sound_player_ds8.h" - -1292050233 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/sound/ds8/sound_player_ds8.h - "sound_player.h" - "platform_util.h" - - - - -1290847560 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/dsound.h - - - 1283810440 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/sound/openal/sound_factory_openal.h "sound_factory.h" "sound_player_openal.h" @@ -1065,15 +1160,11 @@ "leak_dumper.h" -1290846892 /home/softcoder/Code/megaglest/trunk/source/win32_deps/openal-soft-1.12.854/include/AL/alc.h - -1290846892 /home/softcoder/Code/megaglest/trunk/source/win32_deps/openal-soft-1.12.854/include/AL/al.h - 1283810442 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/sound/sound_factory_none.h "sound_factory.h" "leak_dumper.h" -1284712045 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/win32/gl_wrap_billy.cpp +1284712042 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/sdl/gl_wrap.cpp "gl_wrap.h" @@ -1087,32 +1178,36 @@ "leak_dumper.h" -1284648940 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/win32/glob.c - - - - - - -1283810439 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/win32/glob.h - "leak_dumper.h" - -1291451047 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/win32/platform_util.cpp +1272742525 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/sdl/platform_util.cpp "platform_util.h" - - - - - - "SDL_syswm.h" + + "leak_dumper.h" -1290850290 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/dbghelp.h - - +1292700162 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/sdl/thread.cpp + "thread.h" + + + + + "noimpl.h" -1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_syswm.h +1292368283 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/sdl/window.cpp + "window.h" + + + + + "conversion.h" + "platform_util.h" + "sdl_private.h" + "noimpl.h" + "util.h" + "SDL_syswm.h" + "leak_dumper.h" + +1278057011 /usr/include/SDL/SDL_syswm.h "SDL_stdinc.h" "SDL_error.h" "SDL_version.h" @@ -1125,11 +1220,31 @@ "close_code.h" -1287645655 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/sound/ds8/sound_player_ds8.cpp - "sound_player_ds8.h" +1281396638 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/sdl/window_gl.cpp + "window_gl.h" + "gl_wrap.h" + "graphics_interface.h" + "leak_dumper.h" + +1283810439 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/sdl/window_gl.h + "context_gl.h" + "window.h" + "leak_dumper.h" + +1286814204 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/unix/gl_wrap.cpp + "gl_wrap.h" + + + - "math_wrapper.h" + + "opengl.h" + "sdl_private.h" + "noimpl.h" "util.h" + "window.h" + + "font_gl.h" "leak_dumper.h" 1286391100 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/sound/openal/sound_player_openal.cpp @@ -1156,24 +1271,6 @@ "util.h" "leak_dumper.h" -1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/vorbis/codec.h - - -1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/ogg/ogg.h - - -1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/ogg/os_types.h - <_G_config.h> - - - - - - -1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/vorbis/vorbisfile.h - - "codec.h" - 1269665886 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/sound/sound_interface.cpp "sound_interface.h" "util.h" @@ -1261,7 +1358,7 @@ "leak_dumper.h" -1291520213 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/util/util.cpp +1292977176 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/util/util.cpp "util.h" @@ -1296,6 +1393,466 @@ "leak_dumper.h" +1288939635 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/win32/platform_util.h + + + + "platform_common.h" + "leak_dumper.h" + +1287676545 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/win32/types.h + + "leak_dumper.h" + +1290846669 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL.h + "SDL_main.h" + "SDL_stdinc.h" + "SDL_audio.h" + "SDL_cdrom.h" + "SDL_cpuinfo.h" + "SDL_endian.h" + "SDL_error.h" + "SDL_events.h" + "SDL_loadso.h" + "SDL_mutex.h" + "SDL_rwops.h" + "SDL_thread.h" + "SDL_timer.h" + "SDL_video.h" + "SDL_version.h" + "begin_code.h" + "close_code.h" + +1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_main.h + "SDL_stdinc.h" + "begin_code.h" + "close_code.h" + "begin_code.h" + "close_code.h" + +1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_stdinc.h + "SDL_config.h" + + + + + + + + + + + + + + + + + "begin_code.h" + + + + + + "close_code.h" + +1291399086 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_config.h + "SDL_platform.h" + + +1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_platform.h + +1290846669 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/begin_code.h + +1290846669 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/close_code.h + +1290846669 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_audio.h + "SDL_stdinc.h" + "SDL_error.h" + "SDL_endian.h" + "SDL_mutex.h" + "SDL_thread.h" + "SDL_rwops.h" + "begin_code.h" + "close_code.h" + +1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_error.h + "SDL_stdinc.h" + "begin_code.h" + "close_code.h" + +1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_endian.h + "SDL_stdinc.h" + + "begin_code.h" + "close_code.h" + +1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_mutex.h + "SDL_stdinc.h" + "SDL_error.h" + "begin_code.h" + "close_code.h" + +1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_thread.h + "SDL_stdinc.h" + "SDL_error.h" + "SDL_mutex.h" + "begin_code.h" + + "close_code.h" + +1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_rwops.h + "SDL_stdinc.h" + "SDL_error.h" + "begin_code.h" + "close_code.h" + +1290846669 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_cdrom.h + "SDL_stdinc.h" + "SDL_error.h" + "begin_code.h" + "close_code.h" + +1290846669 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_cpuinfo.h + "SDL_stdinc.h" + "begin_code.h" + "close_code.h" + +1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_events.h + "SDL_stdinc.h" + "SDL_error.h" + "SDL_active.h" + "SDL_keyboard.h" + "SDL_mouse.h" + "SDL_joystick.h" + "SDL_quit.h" + "begin_code.h" + "close_code.h" + +1290846669 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_active.h + "SDL_stdinc.h" + "SDL_error.h" + "begin_code.h" + "close_code.h" + +1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_keyboard.h + "SDL_stdinc.h" + "SDL_error.h" + "SDL_keysym.h" + "begin_code.h" + "close_code.h" + +1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_keysym.h + +1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_mouse.h + "SDL_stdinc.h" + "SDL_error.h" + "SDL_video.h" + "begin_code.h" + "close_code.h" + +1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_video.h + "SDL_stdinc.h" + "SDL_error.h" + "SDL_rwops.h" + "begin_code.h" + "close_code.h" + +1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_joystick.h + "SDL_stdinc.h" + "SDL_error.h" + "begin_code.h" + "close_code.h" + +1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_quit.h + "SDL_stdinc.h" + "SDL_error.h" + +1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_loadso.h + "SDL_stdinc.h" + "SDL_error.h" + "begin_code.h" + "close_code.h" + +1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_timer.h + "SDL_stdinc.h" + "SDL_error.h" + "begin_code.h" + "close_code.h" + +1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_version.h + "SDL_stdinc.h" + "begin_code.h" + "close_code.h" + +1258371882 /home/softcoder/Code/megaglest/trunk/source/win32_deps/jpeg-8b/jpeglib.h + "jconfig.h" + "jmorecfg.h" + "jpegint.h" + "jerror.h" + +1291432433 /home/softcoder/Code/megaglest/trunk/source/win32_deps/jpeg-8b/jconfig.h + +1258704084 /home/softcoder/Code/megaglest/trunk/source/win32_deps/jpeg-8b/jmorecfg.h + +1253350284 /home/softcoder/Code/megaglest/trunk/source/win32_deps/jpeg-8b/jpegint.h + +1237929872 /home/softcoder/Code/megaglest/trunk/source/win32_deps/jpeg-8b/jerror.h + +1290847506 /home/softcoder/Code/megaglest/trunk/source/win32_deps/lpng141/png.h + "zlib.h" + "pngconf.h" + +1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/zlib.h + "zconf.h" + +1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/zconf.h + + + + + +1290847506 /home/softcoder/Code/megaglest/trunk/source/win32_deps/lpng141/pngconf.h + + "config.h" + "pngusr.h" + + + + + + + + + +1290847573 /home/softcoder/Code/megaglest/trunk/source/win32_deps/curl-7.20.1/include/curl/curl.h + "curlver.h" + "curlbuild.h" + "curlrules.h" + + + + + + + + + + + + + "easy.h" + "multi.h" + "typecheck-gcc.h" + +1290847573 /home/softcoder/Code/megaglest/trunk/source/win32_deps/curl-7.20.1/include/curl/curlver.h + +1291422070 /home/softcoder/Code/megaglest/trunk/source/win32_deps/curl-7.20.1/include/curl/curlbuild.h + + + + + + + + +1290847573 /home/softcoder/Code/megaglest/trunk/source/win32_deps/curl-7.20.1/include/curl/curlrules.h + +1290847573 /home/softcoder/Code/megaglest/trunk/source/win32_deps/curl-7.20.1/include/curl/easy.h + +1290847573 /home/softcoder/Code/megaglest/trunk/source/win32_deps/curl-7.20.1/include/curl/multi.h + "curl.h" + +1290847573 /home/softcoder/Code/megaglest/trunk/source/win32_deps/curl-7.20.1/include/curl/typecheck-gcc.h + +1290847560 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/glprocs.h + "glext.h" + "wglext.h" + + +1290847560 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/glext.h + + + +1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/wglext.h + + +1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_opengl.h + "SDL_config.h" + + + + + + + + + + +1290847560 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/gl.h + +1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_types.h + "SDL_stdinc.h" + +1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/lua.hpp + "lua.h" + "lualib.h" + "lauxlib.h" + +1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/lua.h + + + "luaconf.h" + +1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/luaconf.h + + + + + + + + + + + + +1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/lualib.h + "lua.h" + +1290847560 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/lauxlib.h + + + "lua.h" + +1290850290 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/dbghelp.h + + + +1283810439 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/win32/glob.h + "leak_dumper.h" + +1293049124 /home/softcoder/Code/megaglest/trunk/source/win32_deps/libircclient/include/libircclient.h + + + + "libirc_errors.h" + "libirc_rfcnumeric.h" + "libirc_events.h" + "libirc_options.h" + "libirc_session.h" + "libirc_dcc.h" + +1293049124 /home/softcoder/Code/megaglest/trunk/source/win32_deps/libircclient/include/libirc_errors.h + +1293049124 /home/softcoder/Code/megaglest/trunk/source/win32_deps/libircclient/include/libirc_rfcnumeric.h + +1293049124 /home/softcoder/Code/megaglest/trunk/source/win32_deps/libircclient/include/libirc_events.h + +1293049124 /home/softcoder/Code/megaglest/trunk/source/win32_deps/libircclient/include/libirc_options.h + +1293049124 /home/softcoder/Code/megaglest/trunk/source/win32_deps/libircclient/include/libirc_session.h + "libirc_params.h" + "libirc_dcc.h" + "libirc_events.h" + +1293049124 /home/softcoder/Code/megaglest/trunk/source/win32_deps/libircclient/include/libirc_params.h + +1293049124 /home/softcoder/Code/megaglest/trunk/source/win32_deps/libircclient/include/libirc_dcc.h + +1290846670 /home/softcoder/Code/megaglest/trunk/source/win32_deps/SDL-1.2.x/include/SDL_syswm.h + "SDL_stdinc.h" + "SDL_error.h" + "SDL_version.h" + "begin_code.h" + + + + + + + "close_code.h" + +1284648940 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/win32/factory_repository.cpp + "factory_repository.h" + "leak_dumper.h" + +1268371626 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/sound/ds8/sound_factory_ds8.h + "sound_factory.h" + "sound_player_ds8.h" + +1292050233 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/sound/ds8/sound_player_ds8.h + "sound_player.h" + "platform_util.h" + + + + +1290847560 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/dsound.h + + + +1290846892 /home/softcoder/Code/megaglest/trunk/source/win32_deps/openal-soft-1.12.854/include/AL/alc.h + +1290846892 /home/softcoder/Code/megaglest/trunk/source/win32_deps/openal-soft-1.12.854/include/AL/al.h + +1284712045 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/win32/gl_wrap_billy.cpp + "gl_wrap.h" + + + + + "opengl.h" + "sdl_private.h" + "noimpl.h" + "util.h" + "window.h" + + "leak_dumper.h" + +1284648940 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/win32/glob.c + + + + + + +1291451047 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/win32/platform_util.cpp + "platform_util.h" + + + + + + "SDL_syswm.h" + + "leak_dumper.h" + +1287645655 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/sound/ds8/sound_player_ds8.cpp + "sound_player_ds8.h" + + "math_wrapper.h" + "util.h" + "leak_dumper.h" + +1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/vorbis/codec.h + + +1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/ogg/ogg.h + + +1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/ogg/os_types.h + <_G_config.h> + + + + + + +1290847561 /home/softcoder/Code/megaglest/trunk/source/win32_deps/include/vorbis/vorbisfile.h + + "codec.h" + 1188326692 /home/softcoder/Code/megaglest/trunk/source/win32_deps/xerces-c-src_2_8_0/src/xercesc/util/XercesDefs.hpp @@ -1748,583 +2305,3 @@ -1292712339 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/common/base_thread.cpp - "base_thread.h" - "platform_common.h" - "util.h" - - -1292281921 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/common/platform_common.cpp - "platform_common.h" - "cache_manager.h" - - - - - - - - - - - - - - - - "util.h" - "conversion.h" - "leak_dumper.h" - "sdl_private.h" - "window.h" - "noimpl.h" - "checksum.h" - "socket.h" - - - "leak_dumper.h" - -1292905247 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/posix/socket.h - - - - - - - "base_thread.h" - "simple_threads.h" - - - - - - - - "leak_dumper.h" - -1279815665 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/igd_desc_parse.c - "igd_desc_parse.h" - - - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/igd_desc_parse.h - -1283810437 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/sdl/platform_util.h - - - "platform_common.h" - "leak_dumper.h" - -1278057011 /usr/include/SDL/SDL_types.h - "SDL_stdinc.h" - -1278057011 /usr/include/SDL/SDL_stdinc.h - "SDL_config.h" - - - - - - - - - - - - - - - - - "begin_code.h" - - - - - - "close_code.h" - -1278057011 /usr/include/SDL/SDL_config.h - "SDL_platform.h" - - -1278057011 /usr/include/SDL/SDL_platform.h - -1278057011 /usr/include/SDL/begin_code.h - -1278057011 /usr/include/SDL/close_code.h - -1278057011 /usr/include/SDL/SDL.h - "SDL_main.h" - "SDL_stdinc.h" - "SDL_audio.h" - "SDL_cdrom.h" - "SDL_cpuinfo.h" - "SDL_endian.h" - "SDL_error.h" - "SDL_events.h" - "SDL_loadso.h" - "SDL_mutex.h" - "SDL_rwops.h" - "SDL_thread.h" - "SDL_timer.h" - "SDL_video.h" - "SDL_version.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_main.h - "SDL_stdinc.h" - "begin_code.h" - "close_code.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_audio.h - "SDL_stdinc.h" - "SDL_error.h" - "SDL_endian.h" - "SDL_mutex.h" - "SDL_thread.h" - "SDL_rwops.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_error.h - "SDL_stdinc.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_endian.h - "SDL_stdinc.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_mutex.h - "SDL_stdinc.h" - "SDL_error.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_thread.h - "SDL_stdinc.h" - "SDL_error.h" - "SDL_mutex.h" - "begin_code.h" - - "close_code.h" - -1278057011 /usr/include/SDL/SDL_rwops.h - "SDL_stdinc.h" - "SDL_error.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_cdrom.h - "SDL_stdinc.h" - "SDL_error.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_cpuinfo.h - "SDL_stdinc.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_events.h - "SDL_stdinc.h" - "SDL_error.h" - "SDL_active.h" - "SDL_keyboard.h" - "SDL_mouse.h" - "SDL_joystick.h" - "SDL_quit.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_active.h - "SDL_stdinc.h" - "SDL_error.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_keyboard.h - "SDL_stdinc.h" - "SDL_error.h" - "SDL_keysym.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_keysym.h - -1278057011 /usr/include/SDL/SDL_mouse.h - "SDL_stdinc.h" - "SDL_error.h" - "SDL_video.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_video.h - "SDL_stdinc.h" - "SDL_error.h" - "SDL_rwops.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_joystick.h - "SDL_stdinc.h" - "SDL_error.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_quit.h - "SDL_stdinc.h" - "SDL_error.h" - -1278057011 /usr/include/SDL/SDL_loadso.h - "SDL_stdinc.h" - "SDL_error.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_timer.h - "SDL_stdinc.h" - "SDL_error.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_version.h - "SDL_stdinc.h" - "begin_code.h" - "close_code.h" - -1278057011 /usr/include/SDL/SDL_opengl.h - "SDL_config.h" - - - - - - - - - - -1103763184 /usr/include/lua5.1/lua.hpp - "lua.h" - "lualib.h" - "lauxlib.h" - -1218029412 /usr/include/lua5.1/lua.h - - - "luaconf.h" - -1259004059 /usr/include/lua5.1/luaconf.h - - - - - - - - - - - - -1198760545 /usr/include/lua5.1/lualib.h - "lua.h" - -1198760545 /usr/include/lua5.1/lauxlib.h - - - "lua.h" - -1281396630 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/sdl/factory_repository.cpp - "factory_repository.h" - -1272742525 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/sdl/platform_util.cpp - "platform_util.h" - - - - "leak_dumper.h" - -1286814204 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/unix/gl_wrap.cpp - "gl_wrap.h" - - - - - - "opengl.h" - "sdl_private.h" - "noimpl.h" - "util.h" - "window.h" - - "font_gl.h" - "leak_dumper.h" - -1279815665 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/minisoap.c - - - - - - - - "minisoap.h" - "miniupnpcstrings.h" - - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/minisoap.h - -1292887418 /home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/miniupnpcstrings.h - -1279815665 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/minissdpc.c - - - - - - - - "lib/framework/types.h" - - - - "minissdpc.h" - "miniupnpc.h" - "codelength.h" - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/minissdpc.h - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/miniupnpc.h - "declspec.h" - "igd_desc_parse.h" - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/declspec.h - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/codelength.h - -1292887431 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/miniupnpc.c - - - - - - - - - - - - - - - - - - - - "miniupnpc.h" - "minissdpc.h" - "miniwget.h" - "minisoap.h" - "minixml.h" - "upnpcommands.h" - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/miniwget.h - "declspec.h" - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/minixml.h - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/upnpcommands.h - "upnpreplyparse.h" - "declspec.h" - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/upnpreplyparse.h - "bsdqueue.h" - - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/bsdqueue.h - -1279815665 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/miniwget.c - - - - "miniupnpc.h" - - - - - - - - - - - - "miniupnpcstrings.h" - "miniwget.h" - -1279815665 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/minixml.c - "minixml.h" - -1279815665 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/minixmlvalid.c - - - - "minixml.h" - -1279815665 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/testigddescparse.c - - - - "igd_desc_parse.h" - "minixml.h" - -1279815665 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/testminixml.c - - - - "minixml.h" - "igd_desc_parse.h" - -1279815665 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/testupnpreplyparse.c - - - "upnpreplyparse.h" - -1279815665 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/upnpc.c - - - - - "miniwget.h" - "miniupnpc.h" - "upnpcommands.h" - "upnperrors.h" - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/upnperrors.h - "declspec.h" - -1279815665 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/upnpcommands.c - - - - "upnpcommands.h" - "miniupnpc.h" - -1279815665 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/upnperrors.c - - "upnperrors.h" - "upnpcommands.h" - -1279815665 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/miniupnpc/upnpreplyparse.c - - - - "upnpreplyparse.h" - "minixml.h" - -1292700162 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/sdl/thread.cpp - "thread.h" - - - - - "noimpl.h" - -1292368283 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/sdl/window.cpp - "window.h" - - - - - "conversion.h" - "platform_util.h" - "sdl_private.h" - "noimpl.h" - "util.h" - "SDL_syswm.h" - "leak_dumper.h" - -1278057011 /usr/include/SDL/SDL_syswm.h - "SDL_stdinc.h" - "SDL_error.h" - "SDL_version.h" - "begin_code.h" - - - - - - - "close_code.h" - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/igd_desc_parse.h - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/minisoap.h - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/minissdpc.h - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/miniupnpc.h - "declspec.h" - "igd_desc_parse.h" - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/declspec.h - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/codelength.h - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/miniwget.h - "declspec.h" - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/minixml.h - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/upnpcommands.h - "upnpreplyparse.h" - "declspec.h" - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/upnpreplyparse.h - "bsdqueue.h" - - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/bsdqueue.h - -1279815665 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/miniupnpc/upnperrors.h - "declspec.h" - -1292892910 source:/home/softcoder/Code/megaglest/trunk/source/shared_lib/sources/platform/posix/socket.cpp - "socket.h" - - - - - - - "conversion.h" - "util.h" - "platform_util.h" - - - - - - - - - - - - - - - "miniwget.h" - "miniupnpc.h" - "upnpcommands.h" - "leak_dumper.h" - - diff --git a/source/configurator/CMakeLists.txt b/source/configurator/CMakeLists.txt index 4e5c038e9..984749f3c 100644 --- a/source/configurator/CMakeLists.txt +++ b/source/configurator/CMakeLists.txt @@ -53,6 +53,26 @@ ELSE() link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib) ENDIF() +# stupid hack because cmake WILL NOT find libircclient for some reason +if(WIN32) + + if(EXISTS ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include/libircclient.h) + set(LIBIRCCLIENT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include) + link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib) + endif() + +else() + #CHECK_INCLUDE_FILES(libircclient.h LIBIRCCLIENT_INCLUDE_DIR) + FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient.h) +endif() + +#check_include_files("libircclient/libircclient.h;libircclient/include/libircclient.h" LIBIRCCLIENT_H_) +if(NOT LIBIRCCLIENT_INCLUDE_DIR) + message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}] [${CMAKE_FIND_ROOT_PATH}]") +endif() +INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR}) +#SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ircclient) + ######################################################################################### # glest configurator diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt index 22517ac5c..15465fc4a 100644 --- a/source/g3d_viewer/CMakeLists.txt +++ b/source/g3d_viewer/CMakeLists.txt @@ -53,6 +53,27 @@ ELSE() link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib) ENDIF() +# stupid hack because cmake WILL NOT find libircclient for some reason +if(WIN32) + + if(EXISTS ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include/libircclient.h) + set(LIBIRCCLIENT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include) + link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib) + endif() + +else() + #CHECK_INCLUDE_FILES(libircclient.h LIBIRCCLIENT_INCLUDE_DIR) + FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient.h) +endif() + +#check_include_files("libircclient/libircclient.h;libircclient/include/libircclient.h" LIBIRCCLIENT_H_) +if(NOT LIBIRCCLIENT_INCLUDE_DIR) + message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}] [${CMAKE_FIND_ROOT_PATH}]") +endif() +INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR}) +#SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ircclient) + + ######################################################################################### # glest G3d Model Viewer diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt index cd3c473d9..775947554 100644 --- a/source/glest_game/CMakeLists.txt +++ b/source/glest_game/CMakeLists.txt @@ -6,7 +6,8 @@ SET(EXTERNAL_LIBS "") IF(WIN32) SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${PROJECT_SOURCE_DIR}/source/win32_deps/lib - ${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib) + ${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib + ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/include) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/openal-soft-1.12.854/include) @@ -24,6 +25,25 @@ IF(WIN32) link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib) ENDIF() +# stupid hack because cmake WILL NOT find libircclient for some reason +if(WIN32) + + if(EXISTS ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include/libircclient.h) + set(LIBIRCCLIENT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include) + link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib) + endif() +else() + CHECK_INCLUDE_FILES(libircclient/libircclient.h LIBIRCCLIENT_INCLUDE_DIR) + #FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient/libircclient.h) +endif() + +#check_include_files("libircclient/libircclient.h;libircclient/include/libircclient.h" LIBIRCCLIENT_H_) +if(NOT LIBIRCCLIENT_INCLUDE_DIR) + message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}]") +endif() +INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR}) +SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ircclient) + FIND_PACKAGE(SDL REQUIRED) INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR}) IF(UNIX) @@ -214,7 +234,7 @@ SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES}) IF(WIN32) - TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 streflop libglest stdc++ moldname mingwex msvcrt user32 kernel32) + TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 ircclient streflop libglest stdc++ moldname mingwex msvcrt user32 kernel32) ENDIF() IF(NOT WIN32) TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop) diff --git a/source/glest_game/menu/main_menu.cpp b/source/glest_game/menu/main_menu.cpp index 88701da33..1560cdfff 100644 --- a/source/glest_game/menu/main_menu.cpp +++ b/source/glest_game/menu/main_menu.cpp @@ -161,19 +161,25 @@ void MainMenu::keyPress(char c){ } void MainMenu::setState(MenuState *state){ + //printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); if(oldstate != NULL && oldstate != state) { delete oldstate; + //printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); if(oldstate != this->state) { oldstate=this->state; + //printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); } else { oldstate = NULL; + //printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); } } else { oldstate=this->state; + //printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); } + //printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); this->state= state; GraphicComponent::resetFade(); menuBackground.setTargetCamera(state->getCamera()); diff --git a/source/glest_game/menu/menu_state_masterserver.cpp b/source/glest_game/menu/menu_state_masterserver.cpp index 5d0a40f47..6170ce67e 100644 --- a/source/glest_game/menu/menu_state_masterserver.cpp +++ b/source/glest_game/menu/menu_state_masterserver.cpp @@ -32,6 +32,10 @@ namespace Glest{ namespace Game{ DisplayMessageFunction MenuStateMasterserver::pCB_DisplayMessage = NULL; +static const char *IRC_SERVER = "irc.freenode.net"; +static const char *IRC_CHANNEL = "#megaglest"; + + // ===================================================== // class ServerLine // ===================================================== @@ -192,6 +196,8 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen { containerName = "MasterServer"; updateFromMasterserverThread = NULL; + ircClient = NULL; + lastNickListUpdate = 0; SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); Lang &lang= Lang::getInstance(); @@ -229,7 +235,7 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen } // bottom - int buttonPos=130; + int buttonPos=230; labelChatUrl.registerGraphicComponent(containerName,"labelChatUrl"); labelChatUrl.init(150,buttonPos-50); @@ -328,6 +334,14 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen listBoxAutoRefresh.setSelectedItemIndex(1); autoRefreshTime=10*listBoxAutoRefresh.getSelectedItemIndex(); + ircOnlinePeopleLabel.registerGraphicComponent(containerName,"ircOnlinePeopleLabel"); + ircOnlinePeopleLabel.init(10,startOffset-lineOffset+30); + ircOnlinePeopleLabel.setText("IRC People Online:"); + + ircOnlinePeopleListLabel.registerGraphicComponent(containerName,"ircOnlinePeopleListLabel"); + ircOnlinePeopleListLabel.init(90,startOffset-lineOffset+30); + ircOnlinePeopleListLabel.setText("n/a"); + SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); NetworkManager::getInstance().end(); @@ -339,6 +353,7 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen GraphicComponent::applyAllCustomProperties(containerName); + chatManager.init(&consoleIRC, -1,true); MutexSafeWrapper safeMutexPtr(&masterServerThreadPtrChangeAccessor); masterServerThreadInDeletion = false; @@ -347,12 +362,33 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen updateFromMasterserverThread->setUniqueID(__FILE__); updateFromMasterserverThread->start(); + char szIRCNick[80]=""; + srand(time(NULL)); + int randomNickId = rand() % 999; + + sprintf(szIRCNick,"MG_%s_%d",Config::getInstance().getString("NetPlayerName",Socket::getHostName().c_str()).c_str(),randomNickId); + ircArgs.push_back(IRC_SERVER); + ircArgs.push_back(szIRCNick); + ircArgs.push_back(IRC_CHANNEL); + ircClient = new IRCThread(ircArgs,this); + ircClient->setUniqueID(__FILE__); + ircClient->start(); + SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); } -MenuStateMasterserver::~MenuStateMasterserver() { +void MenuStateMasterserver::IRC_CallbackEvent(const char* origin, const char **params, unsigned int count) { + //printf ("===> IRC: '%s' said in channel %s: %s\n",origin ? origin : "someone",params[0], params[1] ); + char szBuf[4096]=""; + sprintf(szBuf,"%s: %s",origin ? origin : "someone",params[1]); + consoleIRC.addLine(szBuf); +} + +void MenuStateMasterserver::cleanup() { SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); + printf("In [%s::%s Line: %d] [%p]\n",__FILE__,__FUNCTION__,__LINE__,ircClient); + if(masterServerThreadInDeletion == false) { MutexSafeWrapper safeMutexPtr(&masterServerThreadPtrChangeAccessor); if(updateFromMasterserverThread != NULL) { @@ -381,10 +417,32 @@ MenuStateMasterserver::~MenuStateMasterserver() { clearServerLines(); + printf("Exiting master server menu [%p]\n",ircClient); + if(ircClient != NULL) { + SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); + + ircClient->signalQuit(); + //if(ircClient->shutdownAndWait() == true) { + SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); + //delete ircClient; + //} + SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); + ircClient = NULL; + } + SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] END\n",__FILE__,__FUNCTION__,__LINE__); } -void MenuStateMasterserver::clearServerLines(){ +MenuStateMasterserver::~MenuStateMasterserver() { + SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); + + printf("In [%s::%s Line: %d] [%p]\n",__FILE__,__FUNCTION__,__LINE__,ircClient); + cleanup(); + + SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] END\n",__FILE__,__FUNCTION__,__LINE__); +} + +void MenuStateMasterserver::clearServerLines() { while(!serverLines.empty()){ delete serverLines.back(); serverLines.pop_back(); @@ -438,6 +496,10 @@ void MenuStateMasterserver::mouseClick(int x, int y, MouseButton mouseButton){ SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); + cleanup(); + + SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); + mainMenu->setState(new MenuStateRoot(program, mainMenu)); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); @@ -465,6 +527,9 @@ void MenuStateMasterserver::mouseClick(int x, int y, MouseButton mouseButton){ SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); + cleanup(); + SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); + mainMenu->setState(new MenuStateCustomGame(program, mainMenu,true,true)); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); @@ -561,6 +626,8 @@ void MenuStateMasterserver::render(){ renderer.renderLabel(&externalConnectPort,&titleLabelColor); renderer.renderLabel(&selectButton,&titleLabelColor); + renderer.renderLabel(&ircOnlinePeopleLabel,&titleLabelColor); + renderer.renderLabel(&ircOnlinePeopleListLabel,&titleLabelColor); // render console renderer.renderConsole(&console,false,false); @@ -568,11 +635,14 @@ void MenuStateMasterserver::render(){ for(int i=0; irender(); } + + renderer.renderChatManager(&chatManager); + renderer.renderConsole(&consoleIRC,false,true); } if(program != NULL) program->renderProgramMsgBox(); } -void MenuStateMasterserver::update(){ +void MenuStateMasterserver::update() { MutexSafeWrapper safeMutex(&masterServerThreadAccessor); if(autoRefreshTime!=0 && difftime(time(NULL),lastRefreshTimer) >= autoRefreshTime ) { needUpdateFromServer = true; @@ -592,6 +662,30 @@ void MenuStateMasterserver::update(){ console.update(); + //call the chat manager + chatManager.updateNetwork(); + + //console + consoleIRC.update(); + + if(ircClient != NULL) { + if(difftime(time(NULL),lastNickListUpdate) >= 5) { + lastNickListUpdate = time(NULL); + std::vector nickList = ircClient->getNickList(); + string nicks = ""; + for(int i = 0; i < nickList.size(); ++i) { + if(nicks != "") { + nicks += " "; + } + nicks += nickList[i]; + } + ircOnlinePeopleListLabel.setText(nicks); + } + } + else { + ircOnlinePeopleListLabel.setText(""); + } + if(threadedErrorMsg != "") { std::string sError = threadedErrorMsg; threadedErrorMsg = ""; @@ -815,30 +909,50 @@ void MenuStateMasterserver::showMessageBox(const string &text, const string &hea void MenuStateMasterserver::keyDown(char key) { Config &configKeys = Config::getInstance(std::pair(cfgMainKeys,cfgUserKeys)); - if(key == configKeys.getCharKey("ToggleMusic")) { - Config &config = Config::getInstance(); - Lang &lang= Lang::getInstance(); + if(chatManager.getEditEnabled() == true) { + //printf("keyDown key [%d] chatManager.getText() [%s]\n",key,chatManager.getText().c_str()); + if(key == vkReturn && ircClient != NULL) { + ircClient->SendIRCCmdMessage(IRC_CHANNEL, chatManager.getText()); + } + } - float configVolume = (config.getInt("SoundVolumeMusic") / 100.f); - float currentVolume = CoreData::getInstance().getMenuMusic()->getVolume(); - if(currentVolume > 0) { - CoreData::getInstance().getMenuMusic()->setVolume(0.f); - console.addLine(lang.get("GameMusic") + " " + lang.get("Off")); - } - else { - CoreData::getInstance().getMenuMusic()->setVolume(configVolume); - //If the config says zero, use the default music volume - //gameMusic->setVolume(configVolume ? configVolume : 0.9); - console.addLine(lang.get("GameMusic")); - } - } - else if(key == configKeys.getCharKey("SaveGUILayout")) { - bool saved = GraphicComponent::saveAllCustomProperties(containerName); - Lang &lang= Lang::getInstance(); - console.addLine(lang.get("GUILayoutSaved") + " [" + (saved ? lang.get("Yes") : lang.get("No"))+ "]"); - } + chatManager.keyDown(key); + if(chatManager.getEditEnabled() == false) { + if(key == configKeys.getCharKey("ToggleMusic")) { + Config &config = Config::getInstance(); + Lang &lang= Lang::getInstance(); + + float configVolume = (config.getInt("SoundVolumeMusic") / 100.f); + float currentVolume = CoreData::getInstance().getMenuMusic()->getVolume(); + if(currentVolume > 0) { + CoreData::getInstance().getMenuMusic()->setVolume(0.f); + console.addLine(lang.get("GameMusic") + " " + lang.get("Off")); + } + else { + CoreData::getInstance().getMenuMusic()->setVolume(configVolume); + //If the config says zero, use the default music volume + //gameMusic->setVolume(configVolume ? configVolume : 0.9); + console.addLine(lang.get("GameMusic")); + } + } + else if(key == configKeys.getCharKey("SaveGUILayout")) { + bool saved = GraphicComponent::saveAllCustomProperties(containerName); + Lang &lang= Lang::getInstance(); + console.addLine(lang.get("GUILayoutSaved") + " [" + (saved ? lang.get("Yes") : lang.get("No"))+ "]"); + } + } } -//CoreData::getInstance().getMenuMusic()->setVolume(strToInt(listBoxVolumeMusic.getSelectedItem())/100.f); +void MenuStateMasterserver::keyPress(char c) { + chatManager.keyPress(c); +} +void MenuStateMasterserver::keyUp(char key) { + chatManager.keyUp(key); + + if(chatManager.getEditEnabled()) { + //send key to the chat manager + chatManager.keyUp(key); + } +} }}//end namespace diff --git a/source/glest_game/menu/menu_state_masterserver.h b/source/glest_game/menu/menu_state_masterserver.h index 6078bb710..32e224998 100644 --- a/source/glest_game/menu/menu_state_masterserver.h +++ b/source/glest_game/menu/menu_state_masterserver.h @@ -3,9 +3,9 @@ // // Copyright (C) 2001-2005 Marti�o Figueroa // -// You can redistribute this code and/or modify it under -// the terms of the GNU General Public License as published -// by the Free Software Foundation; either version 2 of the +// You can redistribute this code and/or modify it under +// the terms of the GNU General Public License as published +// by the Free Software Foundation; either version 2 of the // License, or (at your option) any later version // ============================================================== @@ -16,6 +16,8 @@ #include "masterserver_info.h" #include "simple_threads.h" #include "network_interface.h" +#include "ircclient.h" +#include "chat_manager.h" #include "leak_dumper.h" namespace Glest{ namespace Game{ @@ -37,14 +39,14 @@ private: GraphicLabel glestVersionLabel; GraphicLabel platformLabel; //GraphicLabel binaryCompileDateLabel; - + //game info: GraphicLabel serverTitleLabel; GraphicLabel ipAddressLabel; - + //game setup info: GraphicLabel techLabel; - GraphicLabel mapLabel; + GraphicLabel mapLabel; GraphicLabel tilesetLabel; GraphicLabel activeSlotsLabel; @@ -62,16 +64,16 @@ public: bool buttonMouseMove(int x, int y); //void setIndex(int value); void render(); - + }; // =============================== -// class MenuStateMasterserver +// class MenuStateMasterserver // =============================== typedef vector ServerLines; typedef vector MasterServerInfos; -class MenuStateMasterserver : public MenuState, public SimpleTaskCallbackInterface { +class MenuStateMasterserver : public MenuState, public SimpleTaskCallbackInterface, public IRCCallbackInterface { private: @@ -83,10 +85,10 @@ private: GraphicLabel labelTitle; ServerLines serverLines; GraphicLabel labelChatUrl; - + GraphicLabel announcementLabel; GraphicLabel versionInfoLabel; - + GraphicLabel glestVersionLabel; @@ -106,17 +108,20 @@ private: GraphicLabel externalConnectPort; GraphicLabel selectButton; - + GraphicMessageBox mainMessageBox; int mainMessageBoxState; - + + GraphicLabel ircOnlinePeopleLabel; + GraphicLabel ircOnlinePeopleListLabel; + bool announcementLoaded; bool needUpdateFromServer; int autoRefreshTime; time_t lastRefreshTimer; SimpleTaskThread *updateFromMasterserverThread; bool playServerFoundSound; - + Console console; static DisplayMessageFunction pCB_DisplayMessage; @@ -125,26 +130,39 @@ private: Mutex masterServerThreadPtrChangeAccessor; bool masterServerThreadInDeletion; + std::vector ircArgs; + IRCThread *ircClient; + time_t lastNickListUpdate; + + Console consoleIRC; + ChatManager chatManager; + public: MenuStateMasterserver(Program *program, MainMenu *mainMenu); - virtual ~MenuStateMasterserver(); - + ~MenuStateMasterserver(); + void mouseClick(int x, int y, MouseButton mouseButton); void mouseMove(int x, int y, const MouseState *mouseState); void update(); void render(); - + virtual void keyDown(char key); + virtual void keyPress(char c); + virtual void keyUp(char key); + virtual void simpleTask(); static void setDisplayMessageFunction(DisplayMessageFunction pDisplayMessage) { pCB_DisplayMessage = pDisplayMessage; } + virtual void IRC_CallbackEvent(const char* origin, const char **params, unsigned int count); + private: void showMessageBox(const string &text, const string &header, bool toggle); bool connectToServer(string ipString, int port); void clearServerLines(); void updateServerInfo(); - + void cleanup(); + }; diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt index 9e682a4af..64170a5a9 100644 --- a/source/glest_map_editor/CMakeLists.txt +++ b/source/glest_map_editor/CMakeLists.txt @@ -49,6 +49,27 @@ ELSE() link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib) ENDIF() +# stupid hack because cmake WILL NOT find libircclient for some reason +if(WIN32) + + if(EXISTS ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include/libircclient.h) + set(LIBIRCCLIENT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include) + link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib) + endif() + +else() + #CHECK_INCLUDE_FILES(libircclient.h LIBIRCCLIENT_INCLUDE_DIR) + FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient.h) +endif() + +#check_include_files("libircclient/libircclient.h;libircclient/include/libircclient.h" LIBIRCCLIENT_H_) +if(NOT LIBIRCCLIENT_INCLUDE_DIR) + message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}] [${CMAKE_FIND_ROOT_PATH}]") +endif() +INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR}) +#SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ircclient) + + ######################################################################################### # glest map editor diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt index e394cd20a..e9ae817e4 100644 --- a/source/shared_lib/CMakeLists.txt +++ b/source/shared_lib/CMakeLists.txt @@ -9,11 +9,14 @@ ADD_SUBDIRECTORY(sources/streflop) SET(EXTERNAL_LIBS "") +INCLUDE (CheckIncludeFiles) + IF(WIN32) SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${PROJECT_SOURCE_DIR}/source/win32_deps/lib ${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib - ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib) + ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib + ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/include) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/openal-soft-1.12.854/include) @@ -31,14 +34,31 @@ IF(WIN32) link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/lib) link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib) link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib) -ENDIF() -IF(WIN32) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/include) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/shared_lib/include/platform/posix) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/shared_lib/include/platform/win32) ENDIF() +# stupid hack because cmake WILL NOT find libircclient for some reason +if(WIN32) + + if(EXISTS ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include/libircclient.h) + set(LIBIRCCLIENT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include) + link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib) + endif() +else() + CHECK_INCLUDE_FILES(libircclient/libircclient.h LIBIRCCLIENT_INCLUDE_DIR) + #FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient/libircclient.h) +endif() + +#check_include_files("libircclient/libircclient.h;libircclient/include/libircclient.h" LIBIRCCLIENT_H_) +if(NOT LIBIRCCLIENT_INCLUDE_DIR) + message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}]") +endif() +INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR}) +SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ircclient) + FIND_PACKAGE(SDL REQUIRED) INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR}) IF(UNIX) @@ -135,6 +155,7 @@ INCLUDE_DIRECTORIES( ${MG_INCLUDES_ROOT}platform/sdl ) IF(WIN32) SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/posix/socket.cpp) + SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/posix/ircclient.cpp) SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/sdl/gl_wrap.cpp) SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/sdl/thread.cpp) SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/sdl/window.cpp) @@ -218,7 +239,7 @@ ENDIF() #ADD_LIBRARY(libglest SHARED ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES}) #ADD_LIBRARY(libglest STATIC ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES}) IF(WIN32) - TARGET_LINK_LIBRARIES(libglest stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 streflop libglest stdc++ moldname mingwex msvcrt user32 kernel32) + TARGET_LINK_LIBRARIES(libglest stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 ircclient streflop libglest stdc++ moldname mingwex msvcrt user32 kernel32) ENDIF() TARGET_LINK_LIBRARIES(libglest streflop) TARGET_LINK_LIBRARIES(libglest ${EXTERNAL_LIBS}) diff --git a/source/shared_lib/include/platform/posix/ircclient.h b/source/shared_lib/include/platform/posix/ircclient.h new file mode 100644 index 000000000..a1742d9c2 --- /dev/null +++ b/source/shared_lib/include/platform/posix/ircclient.h @@ -0,0 +1,66 @@ +// ============================================================== +// This file is part of MegaGlest Shared Library (www.glest.org) +// +// Copyright (C) 2009-2010 Titus Tscharntke (info@titusgames.de) and +// Mark Vejvoda (mark_vejvoda@hotmail.com) +// +// You can redistribute this code and/or modify it under +// the terms of the GNU General Public License as published +// by the Free Software Foundation; either version 2 of the +// License, or (at your option) any later version +// ============================================================== +#ifndef _SHARED_PLATFORMCOMMON_IRCTHREAD_H_ +#define _SHARED_PLATFORMCOMMON_IRCTHREAD_H_ + +#include "base_thread.h" +#include +#include + +#ifndef WIN32 +#include +#else +#include "libircclient.h" +#endif + +#include "leak_dumper.h" + +using namespace std; + +namespace Shared { namespace PlatformCommon { + +// ===================================================== +// class IRCThreadThread +// ===================================================== + +class IRCCallbackInterface { +public: + virtual void IRC_CallbackEvent(const char* origin, const char **params, unsigned int count) = 0; +}; + +class IRCThread : public BaseThread +{ +protected: + std::vector argv; + irc_session_t *ircSession; + +public: + IRCThread(const std::vector &argv,IRCCallbackInterface *callbackObj); + virtual void execute(); + virtual void signalQuit(); + virtual bool shutdownAndWait(); + + void SendIRCCmdMessage(string target, string msg); + std::vector GetIRCConnectedNickList(string target); + + static IRCCallbackInterface *callbackObj; + + std::vector getNickList() { return eventData; } + + static std::vector eventData; + static bool eventDataDone; + static bool isConnected; +}; + +}}//end namespace + +#endif diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/shared_lib/sources/platform/posix/ircclient.cpp index 150265032..18f7d195d 100644 --- a/source/shared_lib/sources/platform/posix/ircclient.cpp +++ b/source/shared_lib/sources/platform/posix/ircclient.cpp @@ -1,52 +1,43 @@ -/* - * Copyright (C) 2004-2009 Georgy Yunaev gyunaev@ulduzsoft.com - * - * This example is free, and not covered by LGPL license. There is no - * restriction applied to their modification, redistribution, using and so on. - * You can study them, modify them, use them in your own program - either - * completely or partially. By using it you may give me some credits in your - * program, but you don't have to. - * - * - * This example tests most features of libirc. It can join the specific - * channel, welcoming all the people there, and react on some messages - - * 'help', 'quit', 'dcc chat', 'dcc send', 'ctcp'. Also it can reply to - * CTCP requests, receive DCC files and accept DCC chats. - * - * Features used: - * - nickname parsing; - * - handling 'channel' event to track the messages; - * - handling dcc and ctcp events; - * - using internal ctcp rely procedure; - * - generating channel messages; - * - handling dcc send and dcc chat events; - * - initiating dcc send and dcc chat. - * - * $Id: irctest.c 73 2009-01-03 11:14:59Z gyunaev $ - */ +// ============================================================== +// This file is part of MegaGlest Shared Library (www.glest.org) +// +// Copyright (C) 2009-2010 Titus Tscharntke (info@titusgames.de) and +// Mark Vejvoda (mark_vejvoda@hotmail.com) +// +// You can redistribute this code and/or modify it under +// the terms of the GNU General Public License as published +// by the Free Software Foundation; either version 2 of the +// License, or (at your option) any later version +// ============================================================== + +#include "ircclient.h" +#include "util.h" +#include "platform_common.h" + +using namespace Shared::Util; +using namespace Shared::PlatformCommon; + +namespace Shared { namespace PlatformCommon { + -/* #include #include #include #include -#include - - +IRCCallbackInterface *IRCThread::callbackObj=NULL; +std::vector IRCThread::eventData; +bool IRCThread::eventDataDone = false; +bool IRCThread::isConnected = false; // // We store data in IRC session context. // -typedef struct -{ - char * channel; - char * nick; - +typedef struct { + string channel; + string nick; } irc_ctx_t; - -void addlog (const char * fmt, ...) -{ +void addlog (const char * fmt, ...) { FILE * fp; char buf[1024]; va_list va_alist; @@ -58,68 +49,65 @@ void addlog (const char * fmt, ...) vsnprintf (buf, sizeof(buf), fmt, va_alist); #endif va_end (va_alist); + printf ("===> IRC: %s\n", buf); - printf ("%s\n", buf); - - if ( (fp = fopen ("irctest.log", "ab")) != 0 ) - { + if ( (fp = fopen ("irctest.log", "ab")) != 0 ) { fprintf (fp, "%s\n", buf); fclose (fp); } } - -void dump_event (irc_session_t * session, const char * event, const char * origin, const char ** params, unsigned int count) -{ - char buf[512]; - int cnt; - +void dump_event (irc_session_t * session, const char * event, const char * origin, const char ** params, unsigned int count) { + char buf[512]=""; + int cnt=0; buf[0] = '\0'; - for ( cnt = 0; cnt < count; cnt++ ) - { + for ( cnt = 0; cnt < count; cnt++ ) { if ( cnt ) strcat (buf, "|"); strcat (buf, params[cnt]); } - addlog ("Event \"%s\", origin: \"%s\", params: %d [%s]", event, origin ? origin : "NULL", cnt, buf); } - -void event_join (irc_session_t * session, const char * event, const char * origin, const char ** params, unsigned int count) -{ +void event_join(irc_session_t * session, const char * event, const char * origin, const char ** params, unsigned int count) { dump_event (session, event, origin, params, count); - irc_cmd_user_mode (session, "+i"); - irc_cmd_msg (session, params[0], "Hi all"); + + if(IRCThread::isConnected == false) { + irc_cmd_user_mode (session, "+i"); + irc_cmd_msg (session, params[0], "MG Bot says hello!"); + //GetIRCConnectedNickList(argv[2]); + } + else { + char realNick[128]=""; + irc_target_get_nick(origin,&realNick[0],127); + printf ("===> IRC: user joined channel realNick [%s] origin [%s]\n", realNick,origin); + IRCThread::eventData.push_back(realNick); + } + + IRCThread::isConnected = true; } - -void event_connect (irc_session_t * session, const char * event, const char * origin, const char ** params, unsigned int count) -{ +void event_connect (irc_session_t * session, const char * event, const char * origin, const char ** params, unsigned int count) { irc_ctx_t * ctx = (irc_ctx_t *) irc_get_ctx (session); dump_event (session, event, origin, params, count); - irc_cmd_join (session, ctx->channel, 0); + irc_cmd_join (session, ctx->channel.c_str(), 0); } - -void event_privmsg (irc_session_t * session, const char * event, const char * origin, const char ** params, unsigned int count) -{ +void event_privmsg (irc_session_t * session, const char * event, const char * origin, const char ** params, unsigned int count) { dump_event (session, event, origin, params, count); - printf ("'%s' said me (%s): %s\n", + printf ("'%s' said me (%s): %s\n", origin ? origin : "someone", params[0], params[1] ); } - -void dcc_recv_callback (irc_session_t * session, irc_dcc_t id, int status, void * ctx, const char * data, unsigned int length) -{ +void dcc_recv_callback (irc_session_t * session, irc_dcc_t id, int status, void * ctx, const char * data, unsigned int length) { static int count = 1; - char buf[12]; + char buf[12]=""; switch (status) { @@ -133,7 +121,7 @@ void dcc_recv_callback (irc_session_t * session, irc_dcc_t id, int status, void printf ("DCC %d: chat connected\n", id); irc_dcc_msg (session, id, "Hehe"); } - else + else { printf ("DCC %d: %s\n", id, data); sprintf (buf, "DCC [%d]: %d", id, count++); @@ -147,42 +135,36 @@ void dcc_recv_callback (irc_session_t * session, irc_dcc_t id, int status, void } } - -void dcc_file_recv_callback (irc_session_t * session, irc_dcc_t id, int status, void * ctx, const char * data, unsigned int length) -{ - if ( status == 0 && length == 0 ) - { +void dcc_file_recv_callback (irc_session_t * session, irc_dcc_t id, int status, void * ctx, const char * data, unsigned int length) { + if ( status == 0 && length == 0 ) { printf ("File sent successfully\n"); if ( ctx ) fclose ((FILE*) ctx); } - else if ( status ) - { + else if ( status ) { printf ("File sent error: %d\n", status); if ( ctx ) fclose ((FILE*) ctx); } - else - { + else { if ( ctx ) fwrite (data, 1, length, (FILE*) ctx); printf ("File sent progress: %d\n", length); } } - -void event_channel (irc_session_t * session, const char * event, const char * origin, const char ** params, unsigned int count) -{ - char nickbuf[128]; +void event_channel(irc_session_t * session, const char * event, const char * origin, const char ** params, unsigned int count) { + char nickbuf[128]=""; if ( count != 2 ) return; - printf ("'%s' said in channel %s: %s\n", - origin ? origin : "someone", - params[0], params[1] ); + printf ("===> IRC: '%s' said in channel %s: %s\n",origin ? origin : "someone",params[0], params[1] ); + if(IRCThread::callbackObj) { + IRCThread::callbackObj->IRC_CallbackEvent(origin, params, count); + } if ( !origin ) return; @@ -205,24 +187,24 @@ void event_channel (irc_session_t * session, const char * event, const char * or irc_cmd_ctcp_request (session, nickbuf, "TIME"); } - if ( !strcmp (params[1], "dcc chat") ) - { + if ( !strcmp (params[1], "dcc chat") ) { irc_dcc_t dccid; irc_dcc_chat (session, 0, nickbuf, dcc_recv_callback, &dccid); printf ("DCC chat ID: %d\n", dccid); } - if ( !strcmp (params[1], "dcc send") ) - { + if ( !strcmp (params[1], "dcc send") ) { irc_dcc_t dccid; irc_dcc_sendfile (session, 0, nickbuf, "irctest.c", dcc_file_recv_callback, &dccid); printf ("DCC send ID: %d\n", dccid); } - if ( !strcmp (params[1], "topic") ) + if ( !strcmp (params[1], "topic") ) { irc_cmd_topic (session, params[0], 0); - else if ( strstr (params[1], "topic ") == params[1] ) + } + else if ( strstr (params[1], "topic ") == params[1] ) { irc_cmd_topic (session, params[0], params[1] + 6); + } if ( strstr (params[1], "mode ") == params[1] ) irc_cmd_channel_mode (session, params[0], params[1] + 5); @@ -234,17 +216,13 @@ void event_channel (irc_session_t * session, const char * event, const char * or irc_cmd_whois (session, params[1] + 5); } - -void irc_event_dcc_chat (irc_session_t * session, const char * nick, const char * addr, irc_dcc_t dccid) -{ +void irc_event_dcc_chat(irc_session_t * session, const char * nick, const char * addr, irc_dcc_t dccid) { printf ("DCC chat [%d] requested from '%s' (%s)\n", dccid, nick, addr); irc_dcc_accept (session, dccid, 0, dcc_recv_callback); } - -void irc_event_dcc_send (irc_session_t * session, const char * nick, const char * addr, const char * filename, unsigned long size, irc_dcc_t dccid) -{ +void irc_event_dcc_send(irc_session_t * session, const char * nick, const char * addr, const char * filename, unsigned long size, irc_dcc_t dccid) { FILE * fp; printf ("DCC send [%d] requested from '%s' (%s): %s (%lu bytes)\n", dccid, nick, addr, filename, size); @@ -254,70 +232,226 @@ void irc_event_dcc_send (irc_session_t * session, const char * nick, const char irc_dcc_accept (session, dccid, fp, dcc_file_recv_callback); } -void event_numeric (irc_session_t * session, unsigned int event, const char * origin, const char ** params, unsigned int count) -{ - char buf[24]; +void event_leave(irc_session_t *session, const char *event, const char *origin, const char ** params, unsigned count) { + char buf[24]=""; + sprintf (buf, "%s", event); + + // someone left the channel. + + if(origin) { + printf ("===> IRC: user left channel [%s]\n", origin); + + char realNick[128]=""; + irc_target_get_nick(origin,&realNick[0],127); + + printf ("===> IRC: user left channel realNick [%s]\n", realNick); + + for(int i = 0; i < IRCThread::eventData.size(); ++i) { + printf ("===> IRC: lookingfor match [%s] realNick [%s]\n", IRCThread::eventData[i].c_str(),realNick); + + if(IRCThread::eventData[i] == realNick) { + IRCThread::eventData.erase(IRCThread::eventData.begin() + i); + break; + } + } + } + + dump_event (session, buf, origin, params, count); +} +void event_numeric(irc_session_t * session, unsigned int event, const char * origin, const char ** params, unsigned int count) { + char buf[24]=""; sprintf (buf, "%d", event); + switch (event) { + case LIBIRC_RFC_ERR_NICKNAMEINUSE : + case LIBIRC_RFC_ERR_NICKCOLLISION : + //irc_auto_rename_nick(session); + break; + case LIBIRC_RFC_RPL_TOPIC : + break; + case LIBIRC_RFC_RPL_NAMREPLY : + { + if(event == LIBIRC_RFC_RPL_NAMREPLY) { + IRCThread::eventData.clear(); + if(count >= 4) { + for(int i = 3; i < count && params[i]; ++i) { + + vector tokens; + Tokenize(params[i],tokens," "); + + for(int j = 0; j < tokens.size(); ++j) { + IRCThread::eventData.push_back(tokens[j]); + } + } + } + } + break; + } + case LIBIRC_RFC_RPL_ENDOFNAMES: + IRCThread::eventDataDone = true; + break; + } + dump_event (session, buf, origin, params, count); } -int main (int argc, char **argv) -{ - irc_callbacks_t callbacks; - irc_ctx_t ctx; - irc_session_t * s; - - if ( argc != 4 ) - { - printf ("Usage: %s \n", argv[0]); - return 1; - } - - memset (&callbacks, 0, sizeof(callbacks)); - - callbacks.event_connect = event_connect; - callbacks.event_join = event_join; - callbacks.event_nick = dump_event; - callbacks.event_quit = dump_event; - callbacks.event_part = dump_event; - callbacks.event_mode = dump_event; - callbacks.event_topic = dump_event; - callbacks.event_kick = dump_event; - callbacks.event_channel = event_channel; - callbacks.event_privmsg = event_privmsg; - callbacks.event_notice = dump_event; - callbacks.event_invite = dump_event; - callbacks.event_umode = dump_event; - callbacks.event_ctcp_rep = dump_event; - callbacks.event_ctcp_action = dump_event; - callbacks.event_unknown = dump_event; - callbacks.event_numeric = event_numeric; - - callbacks.event_dcc_chat_req = irc_event_dcc_chat; - callbacks.event_dcc_send_req = irc_event_dcc_send; - - s = irc_create_session (&callbacks); - - if ( !s ) - { - printf ("Could not create session\n"); - return 1; - } - - ctx.channel = argv[3]; - ctx.nick = argv[2]; - - irc_set_ctx (s, &ctx); - - if ( irc_connect (s, argv[1], 6667, 0, argv[2], 0, 0) ) - { - printf ("Could not connect: %s\n", irc_strerror (irc_errno(s))); - return 1; - } - - irc_run (s); - - return 1; +IRCThread::IRCThread(const std::vector &argv, IRCCallbackInterface *callbackObj) : BaseThread() { + this->argv = argv; + this->callbackObj = callbackObj; + ircSession = NULL; + IRCThread::eventData.clear(); + IRCThread::eventDataDone = false; + isConnected = false; } -*/ + +void IRCThread::signalQuit() { + printf ("===> IRC: signalQuit [%p]\n",ircSession); + + if(ircSession != NULL) { + callbackObj=NULL; + printf ("===> IRC: Quitting Channel\n"); + irc_cmd_quit(ircSession, "MG Bot is closing!"); + BaseThread::signalQuit(); + isConnected = false; + } +} + +bool IRCThread::shutdownAndWait() { + printf ("===> IRC: shutdownAndWait [%p]\n",ircSession); + + signalQuit(); + BaseThread::shutdownAndWait(); +} + +void IRCThread::SendIRCCmdMessage(string target, string msg) { + if(ircSession != NULL && isConnected == true) { + SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] sending IRC command to [%s] cmd [%s]\n",__FILE__,__FUNCTION__,__LINE__,target.c_str(),msg.c_str()); + int ret = irc_cmd_msg (ircSession, target.c_str(), msg.c_str()); + SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] sending IRC command to [%s] cmd [%s] ret = %d\n",__FILE__,__FUNCTION__,__LINE__,target.c_str(),msg.c_str(),ret); + } +} + +std::vector IRCThread::GetIRCConnectedNickList(string target) { + IRCThread::eventDataDone = false; + //IRCThread::eventData.clear(); + if(ircSession != NULL && isConnected == true) { + SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] sending IRC nick list command to [%s]\n",__FILE__,__FUNCTION__,__LINE__,target.c_str()); + int ret = irc_cmd_names (ircSession, target.c_str()); + SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] sending IRC nick list command to [%s] ret = %d\n",__FILE__,__FUNCTION__,__LINE__,target.c_str(),ret); + + for(time_t tElapsed = time(NULL); + IRCThread::eventDataDone == false && + this->getQuitStatus() == false && + difftime(time(NULL),tElapsed) <= 5;) { + sleep(50); + } + } + + return IRCThread::eventData; +} + +void IRCThread::execute() { + { + RunningStatusSafeWrapper runningStatus(this); + SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] argv.size() = %d\n",__FILE__,__FUNCTION__,__LINE__,argv.size()); + + if(getQuitStatus() == true) { + return; + } + + SystemFlags::OutputDebug(SystemFlags::debugNetwork,"IRC thread is running\n"); + + try { + irc_callbacks_t callbacks; + irc_ctx_t ctx; + ircSession=NULL; + + if(argv.size() != 3) { + printf ("===> IRC Usage: : got params [%ld]\n",argv.size()); + return; + } + + memset (&callbacks, 0, sizeof(callbacks)); + + callbacks.event_connect = event_connect; + callbacks.event_join = event_join; + callbacks.event_nick = dump_event; + callbacks.event_quit = dump_event; + callbacks.event_part = event_leave; + callbacks.event_mode = dump_event; + callbacks.event_topic = dump_event; + callbacks.event_kick = dump_event; + callbacks.event_channel = event_channel; + callbacks.event_privmsg = event_privmsg; + callbacks.event_notice = dump_event; + callbacks.event_invite = dump_event; + callbacks.event_umode = dump_event; + callbacks.event_ctcp_rep = dump_event; + callbacks.event_ctcp_action = dump_event; + callbacks.event_unknown = dump_event; + callbacks.event_numeric = event_numeric; + + callbacks.event_dcc_chat_req = irc_event_dcc_chat; + callbacks.event_dcc_send_req = irc_event_dcc_send; + + if(this->getQuitStatus() == true) { + return; + } + ircSession = irc_create_session (&callbacks); + + if(!ircSession) { + printf ("===> IRC Could not create session\n"); + return; + } + + ctx.channel = argv[2]; + ctx.nick = argv[1]; + + if(this->getQuitStatus() == true) { + return; + } + + irc_set_ctx(ircSession, &ctx); + + if(irc_connect(ircSession, argv[0].c_str(), 6667, 0, argv[1].c_str(), 0, 0)) { + printf ("===> IRC Could not connect: %s\n", irc_strerror (irc_errno(ircSession))); + return; + } + + if(this->getQuitStatus() == true) { + return; + } + + GetIRCConnectedNickList(argv[2]); + + if(this->getQuitStatus() == true) { + return; + } + + for(int iAttempts=1; + this->getQuitStatus() == false && iAttempts <= 5; + ++iAttempts) { + if(irc_run(ircSession)) { + printf ("===> IRC Could not run the session: %s\n", irc_strerror (irc_errno(ircSession))); + } + } + + printf ("===> IRC exiting IRC CLient!\n"); + } + catch(const exception &ex) { + SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] Error [%s]\n",__FILE__,__FUNCTION__,__LINE__,ex.what()); + SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] error [%s]\n",__FILE__,__FUNCTION__,__LINE__,ex.what()); + } + catch(...) { + SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] UNKNOWN Error\n",__FILE__,__FUNCTION__,__LINE__); + SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] unknown error\n",__FILE__,__FUNCTION__,__LINE__); + } + + SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] IRC thread is exiting\n",__FILE__,__FUNCTION__,__LINE__); + } + + delete this; +} + + +}}//end namespace