From a453dc05be73d151540745034a62e4f502392f68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Hruby=CC=81=20=28hrubymar10=29?= Date: Tue, 5 Nov 2019 17:22:37 +0100 Subject: [PATCH] Fix Xcode project --- .../project.pbxproj | 522 +++++++++--------- 1 file changed, 256 insertions(+), 266 deletions(-) diff --git a/projectfiles/Xcode/The Battle for Wesnoth.xcodeproj/project.pbxproj b/projectfiles/Xcode/The Battle for Wesnoth.xcodeproj/project.pbxproj index 35f9bccbb65..d948d738b1e 100644 --- a/projectfiles/Xcode/The Battle for Wesnoth.xcodeproj/project.pbxproj +++ b/projectfiles/Xcode/The Battle for Wesnoth.xcodeproj/project.pbxproj @@ -286,8 +286,6 @@ 46F92E062174F6A400602C1C /* preferences_dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46F92CB52174F6A300602C1C /* preferences_dialog.cpp */; }; 46F92E072174F6A400602C1C /* campaign_difficulty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46F92CB72174F6A300602C1C /* campaign_difficulty.cpp */; }; 46F92E082174F6A400602C1C /* campaign_difficulty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46F92CB72174F6A300602C1C /* campaign_difficulty.cpp */; }; - 46F92E092174F6A400602C1C /* advanced_graphics_options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46F92CB92174F6A300602C1C /* advanced_graphics_options.cpp */; }; - 46F92E0A2174F6A400602C1C /* advanced_graphics_options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46F92CB92174F6A300602C1C /* advanced_graphics_options.cpp */; }; 46F92E0B2174F6A400602C1C /* formula_debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46F92CBB2174F6A300602C1C /* formula_debugger.cpp */; }; 46F92E0C2174F6A400602C1C /* formula_debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46F92CBB2174F6A300602C1C /* formula_debugger.cpp */; }; 46F92E0D2174F6A400602C1C /* mp_method_selection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46F92CBF2174F6A300602C1C /* mp_method_selection.cpp */; }; @@ -1514,7 +1512,6 @@ 46BED4D0205060EA00842FA5 /* crypt_blowfish.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypt_blowfish.h; sourceTree = ""; }; 46BED4D1205060EA00842FA5 /* crypt_blowfish.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crypt_blowfish.c; sourceTree = ""; }; 46BED4D92050710800842FA5 /* scenario-story.cfg */ = {isa = PBXFileReference; lastKnownFileType = text; path = "scenario-story.cfg"; sourceTree = ""; }; - 46D26D0920664716009B3418 /* hex_rect.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = hex_rect.hpp; sourceTree = ""; }; 46DF5BCB1F46173700BE6D24 /* irdya_datetime.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = irdya_datetime.hpp; sourceTree = ""; }; 46DF5BCC1F46173700BE6D24 /* irdya_datetime.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = irdya_datetime.cpp; sourceTree = ""; }; 46EEFB742087434200E1E75A /* chat_log.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chat_log.cpp; sourceTree = ""; }; @@ -1600,7 +1597,6 @@ 46F92C5A2174F6A300602C1C /* loading_screen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = loading_screen.cpp; sourceTree = ""; }; 46F92C5B2174F6A300602C1C /* preferences_dialog.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = preferences_dialog.hpp; sourceTree = ""; }; 46F92C5C2174F6A300602C1C /* campaign_difficulty.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = campaign_difficulty.hpp; sourceTree = ""; }; - 46F92C5D2174F6A300602C1C /* advanced_graphics_options.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = advanced_graphics_options.hpp; sourceTree = ""; }; 46F92C5E2174F6A300602C1C /* screenshot_notification.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = screenshot_notification.cpp; sourceTree = ""; }; 46F92C5F2174F6A300602C1C /* unit_recall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unit_recall.cpp; sourceTree = ""; }; 46F92C602174F6A300602C1C /* gamestate_inspector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gamestate_inspector.cpp; sourceTree = ""; }; @@ -1691,7 +1687,6 @@ 46F92CB62174F6A300602C1C /* loading_screen.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = loading_screen.hpp; sourceTree = ""; }; 46F92CB72174F6A300602C1C /* campaign_difficulty.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = campaign_difficulty.cpp; sourceTree = ""; }; 46F92CB82174F6A300602C1C /* unit_recall.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = unit_recall.hpp; sourceTree = ""; }; - 46F92CB92174F6A300602C1C /* advanced_graphics_options.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = advanced_graphics_options.cpp; sourceTree = ""; }; 46F92CBA2174F6A300602C1C /* screenshot_notification.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = screenshot_notification.hpp; sourceTree = ""; }; 46F92CBB2174F6A300602C1C /* formula_debugger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = formula_debugger.cpp; sourceTree = ""; }; 46F92CBD2174F6A300602C1C /* mp_change_control.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mp_change_control.hpp; sourceTree = ""; }; @@ -2969,9 +2964,9 @@ 620A386115E9364E00A4F513 /* actions */, B52EE9A81213640400CFBDAB /* addon */, B597EBCA0FC082AB00CE81F5 /* ai */, + B5599AB50EC62181008DD061 /* animated.cpp */, B5599AB70EC62181008DD061 /* animated.hpp */, ECDEAF74194FE86C00DB2F47 /* animated.tpp */, - B5599AB50EC62181008DD061 /* animated.cpp */, B52EE8A1121359A600CFBDAB /* arrow.cpp */, B52EE8A2121359A600CFBDAB /* arrow.hpp */, B5599AD00EC62181008DD061 /* attack_prediction.cpp */, @@ -2988,18 +2983,18 @@ B5951A811013BB0800C10B66 /* chat_events.hpp */, 46EEFB742087434200E1E75A /* chat_log.cpp */, 46EEFB752087434200E1E75A /* chat_log.hpp */, - 915C68E81DF1DCB000594B07 /* color.cpp */, - 915C68E91DF1DCB000594B07 /* color.hpp */, B5599AAA0EC62181008DD061 /* color_range.cpp */, B5599AA90EC62181008DD061 /* color_range.hpp */, + 915C68E81DF1DCB000594B07 /* color.cpp */, + 915C68E91DF1DCB000594B07 /* color.hpp */, F46C5DCB13A5074C00DD0816 /* commandline_options.cpp */, F46C5DCA13A5074C00DD0816 /* commandline_options.hpp */, - B5599AA80EC62181008DD061 /* config.cpp */, - B5599AA70EC62181008DD061 /* config.hpp */, EC0341DF1ECF46FE000F2E2B /* config_attribute_value.cpp */, EC0341E01ECF46FE000F2E2B /* config_attribute_value.hpp */, B5599AA40EC62181008DD061 /* config_cache.cpp */, B5599AA30EC62181008DD061 /* config_cache.hpp */, + B5599AA80EC62181008DD061 /* config.cpp */, + B5599AA70EC62181008DD061 /* config.hpp */, 918C8A191D05F9AA009744A0 /* configr_assign.hpp */, B5599AA00EC62181008DD061 /* controller_base.cpp */, B5599A9F0EC62181008DD061 /* controller_base.hpp */, @@ -3011,12 +3006,12 @@ 463896702034180900075E54 /* deprecation.cpp */, 4638966F2034180800075E54 /* deprecation.hpp */, 91B621A41B76A6E900B00E0F /* desktop */, - B5599A990EC62181008DD061 /* display.cpp */, - B5599A980EC62181008DD061 /* display.hpp */, EC21944D1960649000420969 /* display_chat_manager.cpp */, EC21944E1960649000420969 /* display_chat_manager.hpp */, ECD39894194B844A00CF2125 /* display_context.cpp */, 91B621821B766FD200B00E0F /* display_context.hpp */, + B5599A990EC62181008DD061 /* display.cpp */, + B5599A980EC62181008DD061 /* display.hpp */, B5599FF60EC8FE2E008DD061 /* editor */, B5599A970EC62181008DD061 /* events.cpp */, B5599A960EC62181008DD061 /* events.hpp */, @@ -3025,10 +3020,10 @@ ECDEAF6E194FE84000DB2F47 /* fake_unit_manager.hpp */, EC387E71195AFC8400FC0342 /* fake_unit_ptr.cpp */, EC387E72195AFC8400FC0342 /* fake_unit_ptr.hpp */, - 91B621A91B76A94D00B00E0F /* filesystem.hpp */, - ECF9D43C19F3FF9400E6C9D9 /* filesystem.cpp */, EC5C70BB19EEB54900432CF4 /* filesystem_common.cpp */, 91FBBAD71CB6BC3F00470BFE /* filesystem_sdl.cpp */, + ECF9D43C19F3FF9400E6C9D9 /* filesystem.cpp */, + 91B621A91B76A94D00B00E0F /* filesystem.hpp */, 91B621831B76701200B00E0F /* filter_context.hpp */, EC45DEE01AD1CEF600BD760C /* floating_label.cpp */, 91B621841B76701900B00E0F /* floating_label.hpp */, @@ -3043,10 +3038,10 @@ 91B621851B76706E00B00E0F /* game_board.hpp */, ECDEAF78194FEA9D00DB2F47 /* game_classification.cpp */, 91B621861B76707600B00E0F /* game_classification.hpp */, - B5599A800EC62181008DD061 /* game_config.cpp */, - B5599A7F0EC62181008DD061 /* game_config.hpp */, 62CC8E4A1771E7E000C16B75 /* game_config_manager.cpp */, 62CC8E4B1771E7E100C16B75 /* game_config_manager.hpp */, + B5599A800EC62181008DD061 /* game_config.cpp */, + B5599A7F0EC62181008DD061 /* game_config.hpp */, EC387E68195AFB1F00FC0342 /* game_data.cpp */, EC387E69195AFB1F00FC0342 /* game_data.hpp */, B5599A7E0EC62181008DD061 /* game_display.cpp */, @@ -3065,8 +3060,8 @@ 62CC8E7917B9064B00C16B75 /* generators */, B5599A730EC62181008DD061 /* generic_event.cpp */, B5599A720EC62181008DD061 /* generic_event.hpp */, - 91A214E41CAD618700927AEA /* gettext.hpp */, EC4DF45419FEA7A8000EC086 /* gettext.cpp */, + 91A214E41CAD618700927AEA /* gettext.hpp */, B5599A6F0EC62181008DD061 /* global.hpp */, B5A9BCA10ECA805A002BE442 /* gui */, B5599A150EC62181008DD061 /* halo.cpp */, @@ -3127,10 +3122,10 @@ B55999CB0EC62181008DD061 /* playmp_controller.hpp */, B55999CA0EC62181008DD061 /* playsingle_controller.cpp */, B55999C90EC62181008DD061 /* playsingle_controller.hpp */, - B55999C80EC62181008DD061 /* playturn.cpp */, - B55999C70EC62181008DD061 /* playturn.hpp */, EC51DB7618F8BFA4004621D9 /* playturn_network_adapter.cpp */, EC51DB7718F8BFA4004621D9 /* playturn_network_adapter.hpp */, + B55999C80EC62181008DD061 /* playturn.cpp */, + B55999C70EC62181008DD061 /* playturn.hpp */, EC54017A1EBE0C2B00AE66EE /* preferences */, ECC84C1B1B973C5900A5F451 /* quit_confirmation.cpp */, ECC84C1C1B973C5900A5F451 /* quit_confirmation.hpp */, @@ -3142,14 +3137,14 @@ EC0680281EA920A300EEE03B /* random.hpp */, EC1CB20619524AD600B0FA78 /* recall_list_manager.cpp */, EC1CB20719524AD600B0FA78 /* recall_list_manager.hpp */, - B55999BB0EC62181008DD061 /* replay.cpp */, - B55999BA0EC62181008DD061 /* replay.hpp */, B55999B90EC62181008DD061 /* replay_controller.cpp */, B55999B80EC62181008DD061 /* replay_controller.hpp */, EC84245D18F30D9100FC1EEF /* replay_helper.cpp */, EC84245E18F30D9100FC1EEF /* replay_helper.hpp */, EC45DEDE1AD1CED100BD760C /* replay_recorder_base.cpp */, 91B621AB1B76AD0500B00E0F /* replay_recorder_base.hpp */, + B55999BB0EC62181008DD061 /* replay.cpp */, + B55999BA0EC62181008DD061 /* replay.hpp */, B55999B70EC62181008DD061 /* reports.cpp */, B55999B60EC62181008DD061 /* reports.hpp */, B5951A841013BB0800C10B66 /* resources.cpp */, @@ -3171,10 +3166,10 @@ 46F92EF02174FE5500602C1C /* show_dialog.hpp */, B5CE46F712A0417D00D665EE /* side_filter.cpp */, B5CE46F812A0417D00D665EE /* side_filter.hpp */, - B559999F0EC62181008DD061 /* sound.cpp */, - B559999E0EC62181008DD061 /* sound.hpp */, B52EE8C4121359A600CFBDAB /* sound_music_track.cpp */, B52EE8C5121359A600CFBDAB /* sound_music_track.hpp */, + B559999F0EC62181008DD061 /* sound.cpp */, + B559999E0EC62181008DD061 /* sound.hpp */, B559999D0EC62181008DD061 /* soundsource.cpp */, B559999C0EC62181008DD061 /* soundsource.hpp */, 91BE78361DD8F5DE00528C21 /* spirit_po */, @@ -3208,18 +3203,18 @@ B55999800EC62181008DD061 /* tstring.hpp */, 91EF6C0A1C9F1D9000E2A733 /* units */, 91EF6BF01C9E217C00E2A733 /* utils */, - B559996B0EC62181008DD061 /* variable.cpp */, - B559996A0EC62181008DD061 /* variable.hpp */, + 91B6219D1B76737200B00E0F /* variable_info_detail.hpp */, EC2864311967990500168DFF /* variable_info.cpp */, EC2864321967990500168DFF /* variable_info.hpp */, - 91B6219D1B76737200B00E0F /* variable_info_detail.hpp */, + B559996B0EC62181008DD061 /* variable.cpp */, + B559996A0EC62181008DD061 /* variable.hpp */, B55999650EC62181008DD061 /* video.cpp */, B55999640EC62181008DD061 /* video.hpp */, B55999620EC62181008DD061 /* wesconfig.h */, EC219453196064C500420969 /* wesnoth.cpp */, + 918C8A1B1D05F9AA009744A0 /* wesnothd_connection_error.hpp */, 918C8A1C1D05F9AA009744A0 /* wesnothd_connection.cpp */, 918C8A1D1D05F9AA009744A0 /* wesnothd_connection.hpp */, - 918C8A1B1D05F9AA009744A0 /* wesnothd_connection_error.hpp */, B52EE8FD12135AC300CFBDAB /* whiteboard */, B55999440EC62181008DD061 /* widgets */, B55999430EC62181008DD061 /* wml_exception.cpp */, @@ -3302,12 +3297,12 @@ 46685C7F219D518A0009CFFE /* schema */ = { isa = PBXGroup; children = ( - 46685C80219D518A0009CFFE /* key.hpp */, - 46685C81219D518A0009CFFE /* type.hpp */, - 46685C82219D518A0009CFFE /* tag.hpp */, - 46685C83219D518A0009CFFE /* tag.cpp */, 46685C84219D518A0009CFFE /* key.cpp */, + 46685C80219D518A0009CFFE /* key.hpp */, + 46685C83219D518A0009CFFE /* tag.cpp */, + 46685C82219D518A0009CFFE /* tag.hpp */, 46685C85219D518A0009CFFE /* type.cpp */, + 46685C81219D518A0009CFFE /* type.hpp */, ); path = schema; sourceTree = ""; @@ -3315,8 +3310,8 @@ 46BED4CE205060EA00842FA5 /* crypt_blowfish */ = { isa = PBXGroup; children = ( - 46BED4D0205060EA00842FA5 /* crypt_blowfish.h */, 46BED4D1205060EA00842FA5 /* crypt_blowfish.c */, + 46BED4D0205060EA00842FA5 /* crypt_blowfish.h */, ); path = crypt_blowfish; sourceTree = ""; @@ -3341,32 +3336,32 @@ 46F92C202174F6A300602C1C /* core */ = { isa = PBXGroup; children = ( - 46F92C212174F6A300602C1C /* linked_group_definition.cpp */, - 46F92C222174F6A300602C1C /* log.cpp */, - 46F92C232174F6A300602C1C /* register_widget.hpp */, - 46F92C242174F6A300602C1C /* canvas.cpp */, - 46F92C252174F6A300602C1C /* static_registry.cpp */, - 46F92C262174F6A300602C1C /* window_builder.cpp */, - 46F92C272174F6A300602C1C /* widget_definition.hpp */, - 46F92C282174F6A300602C1C /* timer.cpp */, - 46F92C292174F6A300602C1C /* placer */, - 46F92C2E2174F6A300602C1C /* window_builder */, 46F92C332174F6A300602C1C /* canvas_private.hpp */, - 46F92C342174F6A300602C1C /* placer.cpp */, - 46F92C352174F6A300602C1C /* gui_definition.hpp */, - 46F92C362174F6A300602C1C /* static_registry.hpp */, - 46F92C372174F6A300602C1C /* window_builder.hpp */, - 46F92C382174F6A300602C1C /* widget_definition.cpp */, - 46F92C392174F6A300602C1C /* notifier.hpp */, - 46F92C3A2174F6A300602C1C /* notifiee.hpp */, - 46F92C3B2174F6A300602C1C /* timer.hpp */, - 46F92C3C2174F6A300602C1C /* placer.hpp */, - 46F92C3D2174F6A300602C1C /* gui_definition.cpp */, - 46F92C3E2174F6A300602C1C /* layout_exception.hpp */, - 46F92C3F2174F6A300602C1C /* linked_group_definition.hpp */, - 46F92C402174F6A300602C1C /* log.hpp */, - 46F92C412174F6A300602C1C /* event */, + 46F92C242174F6A300602C1C /* canvas.cpp */, 46F92C4A2174F6A300602C1C /* canvas.hpp */, + 46F92C412174F6A300602C1C /* event */, + 46F92C3D2174F6A300602C1C /* gui_definition.cpp */, + 46F92C352174F6A300602C1C /* gui_definition.hpp */, + 46F92C3E2174F6A300602C1C /* layout_exception.hpp */, + 46F92C212174F6A300602C1C /* linked_group_definition.cpp */, + 46F92C3F2174F6A300602C1C /* linked_group_definition.hpp */, + 46F92C222174F6A300602C1C /* log.cpp */, + 46F92C402174F6A300602C1C /* log.hpp */, + 46F92C3A2174F6A300602C1C /* notifiee.hpp */, + 46F92C392174F6A300602C1C /* notifier.hpp */, + 46F92C292174F6A300602C1C /* placer */, + 46F92C342174F6A300602C1C /* placer.cpp */, + 46F92C3C2174F6A300602C1C /* placer.hpp */, + 46F92C232174F6A300602C1C /* register_widget.hpp */, + 46F92C252174F6A300602C1C /* static_registry.cpp */, + 46F92C362174F6A300602C1C /* static_registry.hpp */, + 46F92C282174F6A300602C1C /* timer.cpp */, + 46F92C3B2174F6A300602C1C /* timer.hpp */, + 46F92C382174F6A300602C1C /* widget_definition.cpp */, + 46F92C272174F6A300602C1C /* widget_definition.hpp */, + 46F92C2E2174F6A300602C1C /* window_builder */, + 46F92C262174F6A300602C1C /* window_builder.cpp */, + 46F92C372174F6A300602C1C /* window_builder.hpp */, ); path = core; sourceTree = ""; @@ -3374,10 +3369,10 @@ 46F92C292174F6A300602C1C /* placer */ = { isa = PBXGroup; children = ( - 46F92C2A2174F6A300602C1C /* vertical_list.hpp */, + 46F92C2D2174F6A300602C1C /* horizontal_list.cpp */, 46F92C2B2174F6A300602C1C /* horizontal_list.hpp */, 46F92C2C2174F6A300602C1C /* vertical_list.cpp */, - 46F92C2D2174F6A300602C1C /* horizontal_list.cpp */, + 46F92C2A2174F6A300602C1C /* vertical_list.hpp */, ); path = placer; sourceTree = ""; @@ -3385,10 +3380,10 @@ 46F92C2E2174F6A300602C1C /* window_builder */ = { isa = PBXGroup; children = ( - 46F92C2F2174F6A300602C1C /* instance.hpp */, 46F92C302174F6A300602C1C /* helper.cpp */, 46F92C312174F6A300602C1C /* helper.hpp */, 46F92C322174F6A300602C1C /* instance.cpp */, + 46F92C2F2174F6A300602C1C /* instance.hpp */, ); path = window_builder; sourceTree = ""; @@ -3396,13 +3391,13 @@ 46F92C412174F6A300602C1C /* event */ = { isa = PBXGroup; children = ( - 46F92C422174F6A300602C1C /* handler.hpp */, - 46F92C432174F6A300602C1C /* distributor.cpp */, - 46F92C442174F6A300602C1C /* dispatcher.hpp */, - 46F92C452174F6A300602C1C /* distributor.hpp */, - 46F92C462174F6A300602C1C /* dispatcher.cpp */, 46F92C472174F6A300602C1C /* dispatcher_private.hpp */, + 46F92C462174F6A300602C1C /* dispatcher.cpp */, + 46F92C442174F6A300602C1C /* dispatcher.hpp */, + 46F92C432174F6A300602C1C /* distributor.cpp */, + 46F92C452174F6A300602C1C /* distributor.hpp */, 46F92C482174F6A300602C1C /* handler.cpp */, + 46F92C422174F6A300602C1C /* handler.hpp */, 46F92C492174F6A300602C1C /* message.hpp */, ); path = event; @@ -3411,121 +3406,119 @@ 46F92C4B2174F6A300602C1C /* dialogs */ = { isa = PBXGroup; children = ( - 46F92C4C2174F6A300602C1C /* transient_message.cpp */, - 46F92C4D2174F6A300602C1C /* depcheck_confirm_change.cpp */, - 46F92C4E2174F6A300602C1C /* surrender_quit.cpp */, - 46F92C4F2174F6A300602C1C /* unit_attack.hpp */, - 46F92C502174F6A300602C1C /* theme_list.cpp */, - 46F92C512174F6A300602C1C /* unit_list.hpp */, - 46F92C522174F6A300602C1C /* network_transmission.cpp */, - 46F92C532174F6A300602C1C /* debug_clock.hpp */, - 46F92C542174F6A300602C1C /* unit_create.cpp */, - 46F92C552174F6A300602C1C /* lua_interpreter.cpp */, - 46F92C562174F6A300602C1C /* game_save.hpp */, - 46F92C572174F6A300602C1C /* statistics_dialog.hpp */, - 46F92C582174F6A300602C1C /* sp_options_configure.hpp */, - 46F92C592174F6A300602C1C /* wml_error.hpp */, - 46F92C5A2174F6A300602C1C /* loading_screen.cpp */, - 46F92C5B2174F6A300602C1C /* preferences_dialog.hpp */, + 46F92C9A2174F6A300602C1C /* addon */, + 46F92C852174F6A300602C1C /* attack_predictions.cpp */, + 46F92C6C2174F6A300602C1C /* attack_predictions.hpp */, + 46F92CB72174F6A300602C1C /* campaign_difficulty.cpp */, 46F92C5C2174F6A300602C1C /* campaign_difficulty.hpp */, - 46F92C5D2174F6A300602C1C /* advanced_graphics_options.hpp */, - 46F92C5E2174F6A300602C1C /* screenshot_notification.cpp */, - 46F92C5F2174F6A300602C1C /* unit_recall.cpp */, - 46F92C602174F6A300602C1C /* gamestate_inspector.cpp */, 46F92C612174F6A300602C1C /* campaign_selection.cpp */, - 46F92C622174F6A300602C1C /* formula_debugger.hpp */, - 46F92C632174F6A300602C1C /* unit_advance.hpp */, - 46F92C642174F6A300602C1C /* wml_message.cpp */, - 46F92C652174F6A300602C1C /* game_load.cpp */, - 46F92C662174F6A300602C1C /* message.cpp */, + 46F92CDE2174F6A300602C1C /* campaign_selection.hpp */, + 46F92CF92174F6A300602C1C /* chat_log.cpp */, 46F92C672174F6A300602C1C /* chat_log.hpp */, 46F92C682174F6A300602C1C /* core_selection.cpp */, - 46F92C692174F6A300602C1C /* help_browser.cpp */, - 46F92C6A2174F6A300602C1C /* title_screen.hpp */, - 46F92C6B2174F6A300602C1C /* file_dialog.cpp */, - 46F92C6C2174F6A300602C1C /* attack_predictions.hpp */, - 46F92C6D2174F6A300602C1C /* tooltip.hpp */, - 46F92C6E2174F6A300602C1C /* folder_create.cpp */, - 46F92C6F2174F6A300602C1C /* language_selection.cpp */, - 46F92C702174F6A300602C1C /* game_version_dialog.cpp */, - 46F92C712174F6A300602C1C /* depcheck_select_new.cpp */, - 46F92C722174F6A300602C1C /* modeless_dialog.cpp */, - 46F92C732174F6A300602C1C /* end_credits.cpp */, - 46F92C742174F6A300602C1C /* edit_label.hpp */, - 46F92C752174F6A300602C1C /* modal_dialog.cpp */, - 46F92C762174F6A300602C1C /* select_orb_colors.hpp */, - 46F92C772174F6A300602C1C /* game_cache_options.hpp */, - 46F92C782174F6A300602C1C /* hotkey_bind.hpp */, - 46F92C792174F6A300602C1C /* terrain_layers.hpp */, - 46F92C7A2174F6A300602C1C /* drop_down_menu.cpp */, - 46F92C7B2174F6A300602C1C /* game_delete.hpp */, - 46F92C7C2174F6A300602C1C /* log_settings.cpp */, - 46F92C7D2174F6A300602C1C /* label_settings.cpp */, - 46F92C7E2174F6A300602C1C /* simple_item_selector.hpp */, - 46F92C7F2174F6A300602C1C /* outro.hpp */, - 46F92C802174F6A300602C1C /* story_viewer.cpp */, - 46F92C812174F6A300602C1C /* game_stats.hpp */, - 46F92C822174F6A300602C1C /* unit_recruit.cpp */, - 46F92C832174F6A300602C1C /* edit_text.cpp */, - 46F92C842174F6A300602C1C /* file_dialog.hpp */, - 46F92C852174F6A300602C1C /* attack_predictions.cpp */, - 46F92C862174F6A300602C1C /* tooltip.cpp */, - 46F92C872174F6A300602C1C /* title_screen.cpp */, - 46F92C882174F6A300602C1C /* game_version_dialog.hpp */, - 46F92C892174F6A300602C1C /* language_selection.hpp */, - 46F92C8A2174F6A300602C1C /* folder_create.hpp */, - 46F92C8B2174F6A300602C1C /* depcheck_select_new.hpp */, - 46F92C8C2174F6A300602C1C /* modeless_dialog.hpp */, - 46F92C8D2174F6A300602C1C /* end_credits.hpp */, - 46F92C8E2174F6A300602C1C /* edit_label.cpp */, - 46F92C8F2174F6A300602C1C /* select_orb_colors.cpp */, - 46F92C902174F6A300602C1C /* modal_dialog.hpp */, - 46F92C912174F6A300602C1C /* hotkey_bind.cpp */, - 46F92C922174F6A300602C1C /* game_cache_options.cpp */, - 46F92C932174F6A300602C1C /* drop_down_menu.hpp */, - 46F92C942174F6A300602C1C /* terrain_layers.cpp */, - 46F92C952174F6A300602C1C /* game_delete.cpp */, - 46F92C962174F6A300602C1C /* log_settings.hpp */, - 46F92C972174F6A300602C1C /* simple_item_selector.cpp */, - 46F92C982174F6A300602C1C /* label_settings.hpp */, - 46F92C992174F6A300602C1C /* outro.cpp */, - 46F92C9A2174F6A300602C1C /* addon */, - 46F92CA32174F6A300602C1C /* game_stats.cpp */, - 46F92CA42174F6A300602C1C /* story_viewer.hpp */, - 46F92CA52174F6A300602C1C /* edit_text.hpp */, - 46F92CA62174F6A300602C1C /* unit_recruit.hpp */, - 46F92CA72174F6A300602C1C /* surrender_quit.hpp */, - 46F92CA82174F6A300602C1C /* unit_attack.cpp */, - 46F92CA92174F6A300602C1C /* depcheck_confirm_change.hpp */, - 46F92CAA2174F6A300602C1C /* transient_message.hpp */, - 46F92CAB2174F6A300602C1C /* theme_list.hpp */, - 46F92CAC2174F6A300602C1C /* unit_list.cpp */, - 46F92CAD2174F6A300602C1C /* network_transmission.hpp */, - 46F92CAE2174F6A300602C1C /* debug_clock.cpp */, - 46F92CAF2174F6A300602C1C /* unit_create.hpp */, - 46F92CB02174F6A300602C1C /* lua_interpreter.hpp */, - 46F92CB12174F6A300602C1C /* wml_error.cpp */, - 46F92CB22174F6A300602C1C /* statistics_dialog.cpp */, - 46F92CB32174F6A300602C1C /* game_save.cpp */, - 46F92CB42174F6A300602C1C /* sp_options_configure.cpp */, - 46F92CB52174F6A300602C1C /* preferences_dialog.cpp */, - 46F92CB62174F6A300602C1C /* loading_screen.hpp */, - 46F92CB72174F6A300602C1C /* campaign_difficulty.cpp */, - 46F92CB82174F6A300602C1C /* unit_recall.hpp */, - 46F92CB92174F6A300602C1C /* advanced_graphics_options.cpp */, - 46F92CBA2174F6A300602C1C /* screenshot_notification.hpp */, - 46F92CBB2174F6A300602C1C /* formula_debugger.cpp */, - 46F92CBC2174F6A300602C1C /* multiplayer */, - 46F92CDE2174F6A300602C1C /* campaign_selection.hpp */, - 46F92CDF2174F6A300602C1C /* gamestate_inspector.hpp */, - 46F92CE02174F6A300602C1C /* unit_advance.cpp */, - 46F92CE12174F6A300602C1C /* editor */, - 46F92CF42174F6A300602C1C /* message.hpp */, - 46F92CF52174F6A300602C1C /* game_load.hpp */, - 46F92CF62174F6A300602C1C /* wml_message.hpp */, 46F92CF72174F6A300602C1C /* core_selection.hpp */, + 46F92CAE2174F6A300602C1C /* debug_clock.cpp */, + 46F92C532174F6A300602C1C /* debug_clock.hpp */, + 46F92C4D2174F6A300602C1C /* depcheck_confirm_change.cpp */, + 46F92CA92174F6A300602C1C /* depcheck_confirm_change.hpp */, + 46F92C712174F6A300602C1C /* depcheck_select_new.cpp */, + 46F92C8B2174F6A300602C1C /* depcheck_select_new.hpp */, + 46F92C7A2174F6A300602C1C /* drop_down_menu.cpp */, + 46F92C932174F6A300602C1C /* drop_down_menu.hpp */, + 46F92C8E2174F6A300602C1C /* edit_label.cpp */, + 46F92C742174F6A300602C1C /* edit_label.hpp */, + 46F92C832174F6A300602C1C /* edit_text.cpp */, + 46F92CA52174F6A300602C1C /* edit_text.hpp */, + 46F92CE12174F6A300602C1C /* editor */, + 46F92C732174F6A300602C1C /* end_credits.cpp */, + 46F92C8D2174F6A300602C1C /* end_credits.hpp */, + 46F92C6B2174F6A300602C1C /* file_dialog.cpp */, + 46F92C842174F6A300602C1C /* file_dialog.hpp */, + 46F92C6E2174F6A300602C1C /* folder_create.cpp */, + 46F92C8A2174F6A300602C1C /* folder_create.hpp */, + 46F92CBB2174F6A300602C1C /* formula_debugger.cpp */, + 46F92C622174F6A300602C1C /* formula_debugger.hpp */, + 46F92C922174F6A300602C1C /* game_cache_options.cpp */, + 46F92C772174F6A300602C1C /* game_cache_options.hpp */, + 46F92C952174F6A300602C1C /* game_delete.cpp */, + 46F92C7B2174F6A300602C1C /* game_delete.hpp */, + 46F92C652174F6A300602C1C /* game_load.cpp */, + 46F92CF52174F6A300602C1C /* game_load.hpp */, + 46F92CB32174F6A300602C1C /* game_save.cpp */, + 46F92C562174F6A300602C1C /* game_save.hpp */, + 46F92CA32174F6A300602C1C /* game_stats.cpp */, + 46F92C812174F6A300602C1C /* game_stats.hpp */, + 46F92C702174F6A300602C1C /* game_version_dialog.cpp */, + 46F92C882174F6A300602C1C /* game_version_dialog.hpp */, + 46F92C602174F6A300602C1C /* gamestate_inspector.cpp */, + 46F92CDF2174F6A300602C1C /* gamestate_inspector.hpp */, + 46F92C692174F6A300602C1C /* help_browser.cpp */, 46F92CF82174F6A300602C1C /* help_browser.hpp */, - 46F92CF92174F6A300602C1C /* chat_log.cpp */, + 46F92C912174F6A300602C1C /* hotkey_bind.cpp */, + 46F92C782174F6A300602C1C /* hotkey_bind.hpp */, + 46F92C7D2174F6A300602C1C /* label_settings.cpp */, + 46F92C982174F6A300602C1C /* label_settings.hpp */, + 46F92C6F2174F6A300602C1C /* language_selection.cpp */, + 46F92C892174F6A300602C1C /* language_selection.hpp */, + 46F92C5A2174F6A300602C1C /* loading_screen.cpp */, + 46F92CB62174F6A300602C1C /* loading_screen.hpp */, + 46F92C7C2174F6A300602C1C /* log_settings.cpp */, + 46F92C962174F6A300602C1C /* log_settings.hpp */, + 46F92C552174F6A300602C1C /* lua_interpreter.cpp */, + 46F92CB02174F6A300602C1C /* lua_interpreter.hpp */, + 46F92C662174F6A300602C1C /* message.cpp */, + 46F92CF42174F6A300602C1C /* message.hpp */, + 46F92C752174F6A300602C1C /* modal_dialog.cpp */, + 46F92C902174F6A300602C1C /* modal_dialog.hpp */, + 46F92C722174F6A300602C1C /* modeless_dialog.cpp */, + 46F92C8C2174F6A300602C1C /* modeless_dialog.hpp */, + 46F92CBC2174F6A300602C1C /* multiplayer */, + 46F92C522174F6A300602C1C /* network_transmission.cpp */, + 46F92CAD2174F6A300602C1C /* network_transmission.hpp */, + 46F92C992174F6A300602C1C /* outro.cpp */, + 46F92C7F2174F6A300602C1C /* outro.hpp */, + 46F92CB52174F6A300602C1C /* preferences_dialog.cpp */, + 46F92C5B2174F6A300602C1C /* preferences_dialog.hpp */, + 46F92C5E2174F6A300602C1C /* screenshot_notification.cpp */, + 46F92CBA2174F6A300602C1C /* screenshot_notification.hpp */, + 46F92C8F2174F6A300602C1C /* select_orb_colors.cpp */, + 46F92C762174F6A300602C1C /* select_orb_colors.hpp */, + 46F92C972174F6A300602C1C /* simple_item_selector.cpp */, + 46F92C7E2174F6A300602C1C /* simple_item_selector.hpp */, + 46F92CB42174F6A300602C1C /* sp_options_configure.cpp */, + 46F92C582174F6A300602C1C /* sp_options_configure.hpp */, + 46F92CB22174F6A300602C1C /* statistics_dialog.cpp */, + 46F92C572174F6A300602C1C /* statistics_dialog.hpp */, + 46F92C802174F6A300602C1C /* story_viewer.cpp */, + 46F92CA42174F6A300602C1C /* story_viewer.hpp */, + 46F92C4E2174F6A300602C1C /* surrender_quit.cpp */, + 46F92CA72174F6A300602C1C /* surrender_quit.hpp */, + 46F92C942174F6A300602C1C /* terrain_layers.cpp */, + 46F92C792174F6A300602C1C /* terrain_layers.hpp */, + 46F92C502174F6A300602C1C /* theme_list.cpp */, + 46F92CAB2174F6A300602C1C /* theme_list.hpp */, + 46F92C872174F6A300602C1C /* title_screen.cpp */, + 46F92C6A2174F6A300602C1C /* title_screen.hpp */, + 46F92C862174F6A300602C1C /* tooltip.cpp */, + 46F92C6D2174F6A300602C1C /* tooltip.hpp */, + 46F92C4C2174F6A300602C1C /* transient_message.cpp */, + 46F92CAA2174F6A300602C1C /* transient_message.hpp */, + 46F92CE02174F6A300602C1C /* unit_advance.cpp */, + 46F92C632174F6A300602C1C /* unit_advance.hpp */, + 46F92CA82174F6A300602C1C /* unit_attack.cpp */, + 46F92C4F2174F6A300602C1C /* unit_attack.hpp */, + 46F92C542174F6A300602C1C /* unit_create.cpp */, + 46F92CAF2174F6A300602C1C /* unit_create.hpp */, + 46F92CAC2174F6A300602C1C /* unit_list.cpp */, + 46F92C512174F6A300602C1C /* unit_list.hpp */, + 46F92C5F2174F6A300602C1C /* unit_recall.cpp */, + 46F92CB82174F6A300602C1C /* unit_recall.hpp */, + 46F92C822174F6A300602C1C /* unit_recruit.cpp */, + 46F92CA62174F6A300602C1C /* unit_recruit.hpp */, + 46F92CB12174F6A300602C1C /* wml_error.cpp */, + 46F92C592174F6A300602C1C /* wml_error.hpp */, + 46F92C642174F6A300602C1C /* wml_message.cpp */, + 46F92CF62174F6A300602C1C /* wml_message.hpp */, ); path = dialogs; sourceTree = ""; @@ -3533,14 +3526,14 @@ 46F92C9A2174F6A300602C1C /* addon */ = { isa = PBXGroup; children = ( - 46F92C9B2174F6A300602C1C /* uninstall_list.cpp */, - 46F92C9C2174F6A300602C1C /* install_dependencies.cpp */, - 46F92C9D2174F6A300602C1C /* connect.hpp */, - 46F92C9E2174F6A300602C1C /* manager.cpp */, 46F92C9F2174F6A300602C1C /* connect.cpp */, - 46F92CA02174F6A300602C1C /* manager.hpp */, - 46F92CA12174F6A300602C1C /* uninstall_list.hpp */, + 46F92C9D2174F6A300602C1C /* connect.hpp */, + 46F92C9C2174F6A300602C1C /* install_dependencies.cpp */, 46F92CA22174F6A300602C1C /* install_dependencies.hpp */, + 46F92C9E2174F6A300602C1C /* manager.cpp */, + 46F92CA02174F6A300602C1C /* manager.hpp */, + 46F92C9B2174F6A300602C1C /* uninstall_list.cpp */, + 46F92CA12174F6A300602C1C /* uninstall_list.hpp */, ); path = addon; sourceTree = ""; @@ -3548,39 +3541,39 @@ 46F92CBC2174F6A300602C1C /* multiplayer */ = { isa = PBXGroup; children = ( - 46F92CBD2174F6A300602C1C /* mp_change_control.hpp */, - 46F92CBE2174F6A300602C1C /* lobby.hpp */, - 46F92CBF2174F6A300602C1C /* mp_method_selection.cpp */, - 46F92CC02174F6A300602C1C /* faction_select.hpp */, - 46F92CC12174F6A300602C1C /* player_info.cpp */, - 46F92CC22174F6A300602C1C /* mp_create_game.hpp */, - 46F92CC32174F6A300602C1C /* mp_join_game.hpp */, - 46F92CC42174F6A300602C1C /* mp_staging.cpp */, - 46F92CC52174F6A300602C1C /* synced_choice_wait.hpp */, - 46F92CC62174F6A300602C1C /* player_list_helper.cpp */, - 46F92CC72174F6A300602C1C /* mp_connect.hpp */, - 46F92CC82174F6A300602C1C /* mp_options_helper.cpp */, - 46F92CC92174F6A300602C1C /* mp_join_game_password_prompt.hpp */, - 46F92CCA2174F6A300602C1C /* mp_alerts_options.cpp */, - 46F92CCB2174F6A300602C1C /* plugin_executor.hpp */, - 46F92CCC2174F6A300602C1C /* mp_host_game_prompt.hpp */, - 46F92CCD2174F6A300602C1C /* mp_login.hpp */, - 46F92CCE2174F6A300602C1C /* player_list_helper.hpp */, - 46F92CCF2174F6A300602C1C /* mp_connect.cpp */, - 46F92CD02174F6A300602C1C /* mp_options_helper.hpp */, - 46F92CD12174F6A300602C1C /* mp_join_game_password_prompt.cpp */, - 46F92CD22174F6A300602C1C /* mp_alerts_options.hpp */, - 46F92CD32174F6A300602C1C /* mp_login.cpp */, - 46F92CD42174F6A300602C1C /* mp_host_game_prompt.cpp */, - 46F92CD52174F6A300602C1C /* mp_change_control.cpp */, - 46F92CD62174F6A300602C1C /* lobby.cpp */, - 46F92CD72174F6A300602C1C /* mp_method_selection.hpp */, 46F92CD82174F6A300602C1C /* faction_select.cpp */, - 46F92CD92174F6A300602C1C /* player_info.hpp */, + 46F92CC02174F6A300602C1C /* faction_select.hpp */, + 46F92CD62174F6A300602C1C /* lobby.cpp */, + 46F92CBE2174F6A300602C1C /* lobby.hpp */, + 46F92CCA2174F6A300602C1C /* mp_alerts_options.cpp */, + 46F92CD22174F6A300602C1C /* mp_alerts_options.hpp */, + 46F92CD52174F6A300602C1C /* mp_change_control.cpp */, + 46F92CBD2174F6A300602C1C /* mp_change_control.hpp */, + 46F92CCF2174F6A300602C1C /* mp_connect.cpp */, + 46F92CC72174F6A300602C1C /* mp_connect.hpp */, 46F92CDA2174F6A300602C1C /* mp_create_game.cpp */, - 46F92CDB2174F6A300602C1C /* mp_staging.hpp */, + 46F92CC22174F6A300602C1C /* mp_create_game.hpp */, + 46F92CD42174F6A300602C1C /* mp_host_game_prompt.cpp */, + 46F92CCC2174F6A300602C1C /* mp_host_game_prompt.hpp */, + 46F92CD12174F6A300602C1C /* mp_join_game_password_prompt.cpp */, + 46F92CC92174F6A300602C1C /* mp_join_game_password_prompt.hpp */, 46F92CDC2174F6A300602C1C /* mp_join_game.cpp */, + 46F92CC32174F6A300602C1C /* mp_join_game.hpp */, + 46F92CD32174F6A300602C1C /* mp_login.cpp */, + 46F92CCD2174F6A300602C1C /* mp_login.hpp */, + 46F92CBF2174F6A300602C1C /* mp_method_selection.cpp */, + 46F92CD72174F6A300602C1C /* mp_method_selection.hpp */, + 46F92CC82174F6A300602C1C /* mp_options_helper.cpp */, + 46F92CD02174F6A300602C1C /* mp_options_helper.hpp */, + 46F92CC42174F6A300602C1C /* mp_staging.cpp */, + 46F92CDB2174F6A300602C1C /* mp_staging.hpp */, + 46F92CC12174F6A300602C1C /* player_info.cpp */, + 46F92CD92174F6A300602C1C /* player_info.hpp */, + 46F92CC62174F6A300602C1C /* player_list_helper.cpp */, + 46F92CCE2174F6A300602C1C /* player_list_helper.hpp */, + 46F92CCB2174F6A300602C1C /* plugin_executor.hpp */, 46F92CDD2174F6A300602C1C /* synced_choice_wait.cpp */, + 46F92CC52174F6A300602C1C /* synced_choice_wait.hpp */, ); path = multiplayer; sourceTree = ""; @@ -3588,24 +3581,24 @@ 46F92CE12174F6A300602C1C /* editor */ = { isa = PBXGroup; children = ( - 46F92CE22174F6A300602C1C /* edit_scenario.cpp */, - 46F92CE32174F6A300602C1C /* edit_side.hpp */, - 46F92CE42174F6A300602C1C /* new_map.hpp */, - 46F92CE52174F6A300602C1C /* generate_map.hpp */, 46F92CE62174F6A300602C1C /* custom_tod.cpp */, - 46F92CE72174F6A300602C1C /* edit_label.hpp */, - 46F92CE82174F6A300602C1C /* resize_map.hpp */, - 46F92CE92174F6A300602C1C /* generator_settings.hpp */, - 46F92CEA2174F6A300602C1C /* set_starting_position.hpp */, 46F92CEB2174F6A300602C1C /* custom_tod.hpp */, - 46F92CEC2174F6A300602C1C /* resize_map.cpp */, - 46F92CED2174F6A300602C1C /* generator_settings.cpp */, 46F92CEE2174F6A300602C1C /* edit_label.cpp */, - 46F92CEF2174F6A300602C1C /* set_starting_position.cpp */, + 46F92CE72174F6A300602C1C /* edit_label.hpp */, + 46F92CE22174F6A300602C1C /* edit_scenario.cpp */, 46F92CF02174F6A300602C1C /* edit_scenario.hpp */, 46F92CF12174F6A300602C1C /* edit_side.cpp */, - 46F92CF22174F6A300602C1C /* new_map.cpp */, + 46F92CE32174F6A300602C1C /* edit_side.hpp */, 46F92CF32174F6A300602C1C /* generate_map.cpp */, + 46F92CE52174F6A300602C1C /* generate_map.hpp */, + 46F92CED2174F6A300602C1C /* generator_settings.cpp */, + 46F92CE92174F6A300602C1C /* generator_settings.hpp */, + 46F92CF22174F6A300602C1C /* new_map.cpp */, + 46F92CE42174F6A300602C1C /* new_map.hpp */, + 46F92CEC2174F6A300602C1C /* resize_map.cpp */, + 46F92CE82174F6A300602C1C /* resize_map.hpp */, + 46F92CEF2174F6A300602C1C /* set_starting_position.cpp */, + 46F92CEA2174F6A300602C1C /* set_starting_position.hpp */, ); path = editor; sourceTree = ""; @@ -3613,14 +3606,14 @@ 46F92CFA2174F6A300602C1C /* auxiliary */ = { isa = PBXGroup; children = ( - 46F92CFC2174F6A300602C1C /* tips.cpp */, - 46F92CFD2174F6A300602C1C /* field.hpp */, - 46F92CFF2174F6A300602C1C /* typed_formula.hpp */, - 46F92D002174F6A300602C1C /* iterator */, - 46F92D0D2174F6A300602C1C /* find_widget.hpp */, - 46F92D0E2174F6A300602C1C /* tips.hpp */, - 46F92D0F2174F6A300602C1C /* filter.hpp */, 46F92D102174F6A300602C1C /* field-fwd.hpp */, + 46F92CFD2174F6A300602C1C /* field.hpp */, + 46F92D0F2174F6A300602C1C /* filter.hpp */, + 46F92D0D2174F6A300602C1C /* find_widget.hpp */, + 46F92D002174F6A300602C1C /* iterator */, + 46F92CFC2174F6A300602C1C /* tips.cpp */, + 46F92D0E2174F6A300602C1C /* tips.hpp */, + 46F92CFF2174F6A300602C1C /* typed_formula.hpp */, ); path = auxiliary; sourceTree = ""; @@ -3628,18 +3621,18 @@ 46F92D002174F6A300602C1C /* iterator */ = { isa = PBXGroup; children = ( - 46F92D012174F6A300602C1C /* walker_tree_node.cpp */, - 46F92D022174F6A300602C1C /* walker_widget.hpp */, - 46F92D032174F6A300602C1C /* policy_visit.hpp */, + 46F92D0B2174F6A300602C1C /* exception.hpp */, 46F92D042174F6A300602C1C /* iterator.cpp */, - 46F92D052174F6A300602C1C /* walker_grid.cpp */, - 46F92D062174F6A300602C1C /* walker.hpp */, + 46F92D0A2174F6A300602C1C /* iterator.hpp */, 46F92D072174F6A300602C1C /* policy_order.hpp */, + 46F92D032174F6A300602C1C /* policy_visit.hpp */, + 46F92D052174F6A300602C1C /* walker_grid.cpp */, + 46F92D0C2174F6A300602C1C /* walker_grid.hpp */, + 46F92D012174F6A300602C1C /* walker_tree_node.cpp */, 46F92D082174F6A300602C1C /* walker_tree_node.hpp */, 46F92D092174F6A300602C1C /* walker_widget.cpp */, - 46F92D0A2174F6A300602C1C /* iterator.hpp */, - 46F92D0B2174F6A300602C1C /* exception.hpp */, - 46F92D0C2174F6A300602C1C /* walker_grid.hpp */, + 46F92D022174F6A300602C1C /* walker_widget.hpp */, + 46F92D062174F6A300602C1C /* walker.hpp */, ); path = iterator; sourceTree = ""; @@ -3757,10 +3750,10 @@ 46F92F022174FEBF00602C1C /* pango */ = { isa = PBXGroup; children = ( - 46F92F032174FEBF00602C1C /* stream_ops.hpp */, - 46F92F042174FEBF00602C1C /* hyperlink.hpp */, - 46F92F052174FEBF00602C1C /* font.hpp */, 46F92F062174FEBF00602C1C /* escape.hpp */, + 46F92F052174FEBF00602C1C /* font.hpp */, + 46F92F042174FEBF00602C1C /* hyperlink.hpp */, + 46F92F032174FEBF00602C1C /* stream_ops.hpp */, ); name = pango; path = font/pango; @@ -3781,8 +3774,6 @@ 620A386915E9364E00A4F513 /* move.hpp */, ECAB844E1B0C1933001A3EB7 /* shroud_clearing_action.cpp */, 91B621AF1B76B1BC00B00E0F /* shroud_clearing_action.hpp */, - 620A386A15E9364E00A4F513 /* undo.cpp */, - 620A386B15E9364E00A4F513 /* undo.hpp */, ECAB844F1B0C1933001A3EB7 /* undo_action.cpp */, 91B621B01B76B1C200B00E0F /* undo_action.hpp */, ECAB84501B0C1933001A3EB7 /* undo_dismiss_action.cpp */, @@ -3795,6 +3786,8 @@ 91B621B41B76B1D600B00E0F /* undo_recruit_action.hpp */, ECAB84541B0C1934001A3EB7 /* undo_update_shroud_action.cpp */, 91B621B51B76B1D900B00E0F /* undo_update_shroud_action.hpp */, + 620A386A15E9364E00A4F513 /* undo.cpp */, + 620A386B15E9364E00A4F513 /* undo.hpp */, 91ECD5D01BA11A5200B25CF1 /* unit_creator.cpp */, 91ECD5D11BA11A5200B25CF1 /* unit_creator.hpp */, 620A386C15E9364E00A4F513 /* vision.cpp */, @@ -3806,8 +3799,6 @@ 6295C3A6150FC95C0077D8C5 /* action */ = { isa = PBXGroup; children = ( - 6295C3A7150FC95C0077D8C5 /* action.cpp */, - 6295C3A8150FC95C0077D8C5 /* action.hpp */, 6295C3A9150FC95C0077D8C5 /* action_base.hpp */, 62114CC01750B97F00CA42C7 /* action_item.cpp */, 62114CC11750B97F00CA42C7 /* action_item.hpp */, @@ -3819,6 +3810,8 @@ 6295C3AD150FC95C0077D8C5 /* action_unit.hpp */, 62973FDC15C2EA7800D18140 /* action_village.cpp */, 62973FDD15C2EA7800D18140 /* action_village.hpp */, + 6295C3A7150FC95C0077D8C5 /* action.cpp */, + 6295C3A8150FC95C0077D8C5 /* action.hpp */, 6295C3AE150FC95C0077D8C5 /* mouse */, ); path = action; @@ -3827,8 +3820,6 @@ 6295C3AE150FC95C0077D8C5 /* mouse */ = { isa = PBXGroup; children = ( - 6295C3AF150FC95C0077D8C5 /* mouse_action.cpp */, - 6295C3B0150FC95C0077D8C5 /* mouse_action.hpp */, 62114CC41750B99800CA42C7 /* mouse_action_item.cpp */, 62114CC51750B99800CA42C7 /* mouse_action_item.hpp */, 6295C3B1150FC95C0077D8C5 /* mouse_action_map_label.cpp */, @@ -3839,6 +3830,8 @@ 6295C3B4150FC95C0077D8C5 /* mouse_action_unit.hpp */, 62973FE015C2EAF300D18140 /* mouse_action_village.cpp */, 62973FE115C2EAF300D18140 /* mouse_action_village.hpp */, + 6295C3AF150FC95C0077D8C5 /* mouse_action.cpp */, + 6295C3B0150FC95C0077D8C5 /* mouse_action.hpp */, ); path = mouse; sourceTree = ""; @@ -3892,10 +3885,10 @@ 62CC8E6F17B9063D00C16B75 /* entity_location.hpp */, 62CC8E7017B9063D00C16B75 /* handlers.cpp */, 62CC8E7117B9063D00C16B75 /* handlers.hpp */, - ECDF181F1A3FE0DE00D157A6 /* manager.cpp */, - 91B621BD1B76B35D00B00E0F /* manager.hpp */, ECDF181E1A3FE0DE00D157A6 /* manager_impl.cpp */, 91B621BC1B76B35A00B00E0F /* manager_impl.hpp */, + ECDF181F1A3FE0DE00D157A6 /* manager.cpp */, + 91B621BD1B76B35D00B00E0F /* manager.hpp */, EC44E37E181DDAF90037A62F /* menu_item.cpp */, EC44E37F181DDAF90037A62F /* menu_item.hpp */, 62CC8E7217B9063D00C16B75 /* pump.cpp */, @@ -4017,12 +4010,12 @@ ECFA82DB184E59F3006782FB /* command_executor.hpp */, ECFA82DC184E59F3006782FB /* hotkey_command.cpp */, ECFA82DD184E59F3006782FB /* hotkey_command.hpp */, - ECA563861A47BA36006278A5 /* hotkey_handler.cpp */, - 91B6218F1B76717400B00E0F /* hotkey_handler.hpp */, ECA563831A47BA36006278A5 /* hotkey_handler_mp.cpp */, 91B621921B76718700B00E0F /* hotkey_handler_mp.hpp */, ECA563851A47BA36006278A5 /* hotkey_handler_sp.cpp */, 91B621901B76717B00B00E0F /* hotkey_handler_sp.hpp */, + ECA563861A47BA36006278A5 /* hotkey_handler.cpp */, + 91B6218F1B76717400B00E0F /* hotkey_handler.hpp */, ECFA82DE184E59F3006782FB /* hotkey_item.cpp */, ECFA82DF184E59F3006782FB /* hotkey_item.hpp */, ECFA82E0184E59F3006782FB /* hotkey_manager.cpp */, @@ -4103,8 +4096,8 @@ isa = PBXGroup; children = ( 91B621AD1B76B06E00B00E0F /* config.hpp */, - 91B621AE1B76B06E00B00E0F /* xbrz.hpp */, EC2F601F1A0490FC0018C9D6 /* xbrz.cpp */, + 91B621AE1B76B06E00B00E0F /* xbrz.hpp */, ); path = xBRZ; sourceTree = ""; @@ -4112,14 +4105,14 @@ 91BE78361DD8F5DE00528C21 /* spirit_po */ = { isa = PBXGroup; children = ( - 91BE78371DD8F5DE00528C21 /* catalog.hpp */, 91BE78381DD8F5DE00528C21 /* catalog_metadata.hpp */, + 91BE78371DD8F5DE00528C21 /* catalog.hpp */, 91BE78391DD8F5DE00528C21 /* default_plural_forms_compiler.hpp */, 91BE783A1DD8F5DE00528C21 /* default_plural_forms_expressions.hpp */, 91BE783B1DD8F5DE00528C21 /* exceptions.hpp */, 91BE783C1DD8F5DE00528C21 /* po_grammar.hpp */, - 91BE783D1DD8F5DE00528C21 /* po_message.hpp */, 91BE783E1DD8F5DE00528C21 /* po_message_adapted.hpp */, + 91BE783D1DD8F5DE00528C21 /* po_message.hpp */, 91BE783F1DD8F5DE00528C21 /* version.hpp */, ); path = spirit_po; @@ -4154,17 +4147,17 @@ 91EF6C081C9EF6B300E2A733 /* formula */ = { isa = PBXGroup; children = ( - B5599A880EC62181008DD061 /* callable.hpp */, B5599A870EC62181008DD061 /* callable_fwd.hpp */, B5599AB00EC62181008DD061 /* callable_objects.cpp */, B5599AAF0EC62181008DD061 /* callable_objects.hpp */, - B52EE8A8121359A600CFBDAB /* debugger.cpp */, - B52EE8A9121359A600CFBDAB /* debugger.hpp */, + B5599A880EC62181008DD061 /* callable.hpp */, B52EE8A6121359A600CFBDAB /* debugger_fwd.cpp */, B52EE8A7121359A600CFBDAB /* debugger_fwd.hpp */, + B52EE8A8121359A600CFBDAB /* debugger.cpp */, + B52EE8A9121359A600CFBDAB /* debugger.hpp */, + B5599A840EC62181008DD061 /* formula_fwd.hpp */, B5599A8C0EC62181008DD061 /* formula.cpp */, B5599A8B0EC62181008DD061 /* formula.hpp */, - B5599A840EC62181008DD061 /* formula_fwd.hpp */, 468C1B951F09245E002DF652 /* function_gamestate.cpp */, 468C1B961F09245E002DF652 /* function_gamestate.hpp */, B5599A860EC62181008DD061 /* function.cpp */, @@ -4173,10 +4166,10 @@ B52EE8AB121359A600CFBDAB /* string_utils.hpp */, B5599A830EC62181008DD061 /* tokenizer.cpp */, B5599A820EC62181008DD061 /* tokenizer.hpp */, - B55999690EC62181008DD061 /* variant.cpp */, - B55999680EC62181008DD061 /* variant.hpp */, EC179B871E91475300B4178C /* variant_value.cpp */, EC179B881E91475300B4178C /* variant_value.hpp */, + B55999690EC62181008DD061 /* variant.cpp */, + B55999680EC62181008DD061 /* variant.hpp */, ); path = formula; sourceTree = ""; @@ -4203,10 +4196,10 @@ children = ( B559997D0EC62181008DD061 /* abilities.cpp */, B559997C0EC62181008DD061 /* abilities.hpp */, - B559997B0EC62181008DD061 /* animation.cpp */, - B559997A0EC62181008DD061 /* animation.hpp */, EC386CEF195119A9006004ED /* animation_component.cpp */, EC386CF0195119AA006004ED /* animation_component.hpp */, + B559997B0EC62181008DD061 /* animation.cpp */, + B559997A0EC62181008DD061 /* animation.hpp */, ECC2FFFB1A51A91100023AF4 /* attack_type.cpp */, 91B6219B1B76733900B00E0F /* attack_type.hpp */, EC387E6E195AFB5C00FC0342 /* drawer.cpp */, @@ -4242,7 +4235,6 @@ isa = PBXGroup; children = ( B55999FC0EC62181008DD061 /* exception.hpp */, - 46D26D0920664716009B3418 /* hex_rect.hpp */, B55999FB0EC62181008DD061 /* label.cpp */, B55999FA0EC62181008DD061 /* label.hpp */, B55999F90EC62181008DD061 /* location.cpp */, @@ -4306,10 +4298,10 @@ F419A2C014F5BCFE002F9ADC /* client.hpp */, F419A2C114F5BCFE002F9ADC /* info.cpp */, F419A2C214F5BCFE002F9ADC /* info.hpp */, - ECA556251E7B5DA5006E907D /* manager.cpp */, - ECA556261E7B5DA5006E907D /* manager.hpp */, F419A31014F8868A002F9ADC /* manager_ui.cpp */, F419A31114F8868A002F9ADC /* manager_ui.hpp */, + ECA556251E7B5DA5006E907D /* manager.cpp */, + ECA556261E7B5DA5006E907D /* manager.hpp */, 620EC87214FEEE6D006BBD1F /* state.cpp */, 620EC87314FEEE6D006BBD1F /* state.hpp */, B52EE9AB1213640400CFBDAB /* validation.cpp */, @@ -4349,10 +4341,10 @@ B59F96E51034791200A57C1A /* aspect_attacks.cpp */, B59F96E61034791200A57C1A /* aspect_attacks.hpp */, B54AC6B30FEA9EB5006F6FBD /* attack.cpp */, - B54AC6C10FEA9EB5006F6FBD /* ca.cpp */, - B54AC6C20FEA9EB5006F6FBD /* ca.hpp */, B552D92A108694BB002D8F86 /* ca_move_to_targets.cpp */, B552D92B108694BB002D8F86 /* ca_move_to_targets.hpp */, + B54AC6C10FEA9EB5006F6FBD /* ca.cpp */, + B54AC6C20FEA9EB5006F6FBD /* ca.hpp */, B54AC6B40FEA9EB5006F6FBD /* contexts.cpp */, B54AC6B50FEA9EB5006F6FBD /* contexts.hpp */, B54AC6AA0FEA9EB5006F6FBD /* engine_cpp.cpp */, @@ -5137,7 +5129,6 @@ 46F92E112174F6A400602C1C /* mp_staging.cpp in Sources */, B52EE8CD121359A600CFBDAB /* debugger_fwd.cpp in Sources */, B52EE8CE121359A600CFBDAB /* debugger.cpp in Sources */, - 46F92E092174F6A400602C1C /* advanced_graphics_options.cpp in Sources */, B5599B6E0EC62181008DD061 /* function.cpp in Sources */, 46F92E2D2174F6A400602C1C /* unit_advance.cpp in Sources */, B52EE8CF121359A600CFBDAB /* string_utils.cpp in Sources */, @@ -5949,7 +5940,6 @@ 91A2150A1CAD675900927AEA /* sound.cpp in Sources */, 91A2150B1CAD675900927AEA /* sound_music_track.cpp in Sources */, 91A2150C1CAD675900927AEA /* soundsource.cpp in Sources */, - 46F92E0A2174F6A400602C1C /* advanced_graphics_options.cpp in Sources */, 46685C8C219D518B0009CFFE /* binary_or_text.cpp in Sources */, 91A2150D1CAD676300927AEA /* builder.cpp in Sources */, 91A2150E1CAD676300927AEA /* terrain.cpp in Sources */,