From 7e84df7f6cc36c40579b0030096a9dc3b10878b1 Mon Sep 17 00:00:00 2001 From: mattsc Date: Wed, 25 Jun 2014 05:49:59 -0700 Subject: [PATCH] Update Xcode project --- .../Xcode/Wesnoth.xcodeproj/project.pbxproj | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj b/projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj index 37b3f6bf099f..68f695662732 100644 --- a/projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj +++ b/projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj @@ -358,7 +358,6 @@ B5599B390EC62181008DD061 /* halo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A150EC62181008DD061 /* halo.cpp */; }; B5599B630EC62181008DD061 /* gettext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A710EC62181008DD061 /* gettext.cpp */; }; B5599B640EC62181008DD061 /* generic_event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A730EC62181008DD061 /* generic_event.cpp */; }; - B5599B660EC62181008DD061 /* gamestatus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A760EC62181008DD061 /* gamestatus.cpp */; }; B5599B670EC62181008DD061 /* game_preferences_display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A770EC62181008DD061 /* game_preferences_display.cpp */; }; B5599B680EC62181008DD061 /* game_preferences.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A790EC62181008DD061 /* game_preferences.cpp */; }; B5599B6A0EC62181008DD061 /* game_display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A7E0EC62181008DD061 /* game_display.cpp */; settings = {COMPILER_FLAGS = "-DHAVE_GROWL"; }; }; @@ -627,7 +626,6 @@ B597C5F70FACD6CA00CE81F5 /* pathutils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999D20EC62181008DD061 /* pathutils.cpp */; }; B597C5F80FACD6CA00CE81F5 /* preferences_display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999C20EC62181008DD061 /* preferences_display.cpp */; }; B597C5FC0FACD6CA00CE81F5 /* playmp_controller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999CC0EC62181008DD061 /* playmp_controller.cpp */; }; - B597C5FD0FACD6CA00CE81F5 /* gamestatus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A760EC62181008DD061 /* gamestatus.cpp */; }; B597C5FE0FACD6CA00CE81F5 /* config_cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599AA40EC62181008DD061 /* config_cache.cpp */; }; B597C5FF0FACD6CA00CE81F5 /* unit_types.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999710EC62181008DD061 /* unit_types.cpp */; }; B597C6030FACD6CA00CE81F5 /* unit_display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999790EC62181008DD061 /* unit_display.cpp */; }; @@ -825,6 +823,10 @@ EC28C59119423529003B0F5E /* save_index.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC28C59019423528003B0F5E /* save_index.cpp */; }; EC3381C718B520120020DD6F /* theme_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC3381C518B520120020DD6F /* theme_list.cpp */; }; EC386CF1195119AA006004ED /* unit_animation_component.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC386CEF195119A9006004ED /* unit_animation_component.cpp */; }; + EC387E6C195AFB1F00FC0342 /* game_data.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC387E68195AFB1F00FC0342 /* game_data.cpp */; }; + EC387E6D195AFB1F00FC0342 /* game_state.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC387E6A195AFB1F00FC0342 /* game_state.cpp */; }; + EC387E70195AFB5C00FC0342 /* unit_drawer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC387E6E195AFB5C00FC0342 /* unit_drawer.cpp */; }; + EC387E73195AFC8400FC0342 /* fake_unit_ptr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC387E71195AFC8400FC0342 /* fake_unit_ptr.cpp */; }; EC44E382181DDAF90037A62F /* menu_item.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC44E37E181DDAF90037A62F /* menu_item.cpp */; }; EC44E383181DDAF90037A62F /* wmi_container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC44E380181DDAF90037A62F /* wmi_container.cpp */; }; EC48D74D17F3148300DE80BF /* recruitment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC48D74B17F3148300DE80BF /* recruitment.cpp */; }; @@ -924,9 +926,7 @@ ECC8F41B185FE2E1004AC3BE /* format_time_summary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECC8F419185FE2E1004AC3BE /* format_time_summary.cpp */; }; ECD39893194B830300CF2125 /* saved_game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECD39891194B830300CF2125 /* saved_game.cpp */; }; ECD39895194B844A00CF2125 /* display_context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECD39894194B844A00CF2125 /* display_context.cpp */; }; - ECDEAF71194FE84000DB2F47 /* drawable_unit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECDEAF6B194FE84000DB2F47 /* drawable_unit.cpp */; }; ECDEAF72194FE84000DB2F47 /* fake_unit_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECDEAF6D194FE84000DB2F47 /* fake_unit_manager.cpp */; }; - ECDEAF73194FE84000DB2F47 /* fake_unit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECDEAF6F194FE84000DB2F47 /* fake_unit.cpp */; }; ECDEAF75194FE86C00DB2F47 /* animated.tpp in Resources */ = {isa = PBXBuildFile; fileRef = ECDEAF74194FE86C00DB2F47 /* animated.tpp */; }; ECDEAF77194FEA8500DB2F47 /* syncmp_handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECDEAF76194FEA8400DB2F47 /* syncmp_handler.cpp */; }; ECDEAF79194FEA9D00DB2F47 /* game_classification.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECDEAF78194FEA9D00DB2F47 /* game_classification.cpp */; }; @@ -1607,8 +1607,6 @@ B5599A710EC62181008DD061 /* gettext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = gettext.cpp; path = ../src/gettext.cpp; sourceTree = ""; }; B5599A720EC62181008DD061 /* generic_event.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = generic_event.hpp; path = ../src/generic_event.hpp; sourceTree = ""; }; B5599A730EC62181008DD061 /* generic_event.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = generic_event.cpp; path = ../src/generic_event.cpp; sourceTree = ""; }; - B5599A750EC62181008DD061 /* gamestatus.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = gamestatus.hpp; path = ../src/gamestatus.hpp; sourceTree = ""; }; - B5599A760EC62181008DD061 /* gamestatus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = gamestatus.cpp; path = ../src/gamestatus.cpp; sourceTree = ""; }; B5599A770EC62181008DD061 /* game_preferences_display.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = game_preferences_display.cpp; path = ../src/game_preferences_display.cpp; sourceTree = ""; }; B5599A780EC62181008DD061 /* game_preferences.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = game_preferences.hpp; path = ../src/game_preferences.hpp; sourceTree = ""; }; B5599A790EC62181008DD061 /* game_preferences.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = game_preferences.cpp; path = ../src/game_preferences.cpp; sourceTree = ""; }; @@ -2021,6 +2019,14 @@ EC3381C618B520120020DD6F /* theme_list.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = theme_list.hpp; path = ../gui/dialogs/theme_list.hpp; sourceTree = ""; }; EC386CEF195119A9006004ED /* unit_animation_component.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unit_animation_component.cpp; sourceTree = ""; }; EC386CF0195119AA006004ED /* unit_animation_component.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = unit_animation_component.hpp; sourceTree = ""; }; + EC387E68195AFB1F00FC0342 /* game_data.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = game_data.cpp; sourceTree = ""; }; + EC387E69195AFB1F00FC0342 /* game_data.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = game_data.hpp; sourceTree = ""; }; + EC387E6A195AFB1F00FC0342 /* game_state.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = game_state.cpp; sourceTree = ""; }; + EC387E6B195AFB1F00FC0342 /* game_state.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = game_state.hpp; sourceTree = ""; }; + EC387E6E195AFB5C00FC0342 /* unit_drawer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unit_drawer.cpp; sourceTree = ""; }; + EC387E6F195AFB5C00FC0342 /* unit_drawer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = unit_drawer.hpp; sourceTree = ""; }; + EC387E71195AFC8400FC0342 /* fake_unit_ptr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fake_unit_ptr.cpp; sourceTree = ""; }; + EC387E72195AFC8400FC0342 /* fake_unit_ptr.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fake_unit_ptr.hpp; sourceTree = ""; }; EC44E37E181DDAF90037A62F /* menu_item.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = menu_item.cpp; path = game_events/menu_item.cpp; sourceTree = ""; }; EC44E37F181DDAF90037A62F /* menu_item.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = menu_item.hpp; path = game_events/menu_item.hpp; sourceTree = ""; }; EC44E380181DDAF90037A62F /* wmi_container.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = wmi_container.cpp; path = game_events/wmi_container.cpp; sourceTree = ""; }; @@ -2158,12 +2164,8 @@ ECD39891194B830300CF2125 /* saved_game.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saved_game.cpp; sourceTree = ""; }; ECD39892194B830300CF2125 /* saved_game.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = saved_game.hpp; sourceTree = ""; }; ECD39894194B844A00CF2125 /* display_context.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = display_context.cpp; sourceTree = ""; }; - ECDEAF6B194FE84000DB2F47 /* drawable_unit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drawable_unit.cpp; sourceTree = ""; }; - ECDEAF6C194FE84000DB2F47 /* drawable_unit.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = drawable_unit.hpp; sourceTree = ""; }; ECDEAF6D194FE84000DB2F47 /* fake_unit_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fake_unit_manager.cpp; sourceTree = ""; }; ECDEAF6E194FE84000DB2F47 /* fake_unit_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fake_unit_manager.hpp; sourceTree = ""; }; - ECDEAF6F194FE84000DB2F47 /* fake_unit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fake_unit.cpp; sourceTree = ""; }; - ECDEAF70194FE84000DB2F47 /* fake_unit.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fake_unit.hpp; sourceTree = ""; }; ECDEAF74194FE86C00DB2F47 /* animated.tpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = animated.tpp; sourceTree = ""; }; ECDEAF76194FEA8400DB2F47 /* syncmp_handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = syncmp_handler.cpp; sourceTree = ""; }; ECDEAF78194FEA9D00DB2F47 /* game_classification.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = game_classification.cpp; sourceTree = ""; }; @@ -2450,6 +2452,14 @@ 29B97315FDCFA39411CA2CEA /* src */ = { isa = PBXGroup; children = ( + EC387E71195AFC8400FC0342 /* fake_unit_ptr.cpp */, + EC387E72195AFC8400FC0342 /* fake_unit_ptr.hpp */, + EC387E6E195AFB5C00FC0342 /* unit_drawer.cpp */, + EC387E6F195AFB5C00FC0342 /* unit_drawer.hpp */, + EC387E68195AFB1F00FC0342 /* game_data.cpp */, + EC387E69195AFB1F00FC0342 /* game_data.hpp */, + EC387E6A195AFB1F00FC0342 /* game_state.cpp */, + EC387E6B195AFB1F00FC0342 /* game_state.hpp */, EC79D70C19548D5000EC7C1F /* game_cache_options.cpp */, EC1CB20619524AD600B0FA78 /* recall_list_manager.cpp */, EC1CB20719524AD600B0FA78 /* recall_list_manager.hpp */, @@ -2458,12 +2468,8 @@ ECDEAF78194FEA9D00DB2F47 /* game_classification.cpp */, ECDEAF76194FEA8400DB2F47 /* syncmp_handler.cpp */, ECDEAF74194FE86C00DB2F47 /* animated.tpp */, - ECDEAF6B194FE84000DB2F47 /* drawable_unit.cpp */, - ECDEAF6C194FE84000DB2F47 /* drawable_unit.hpp */, ECDEAF6D194FE84000DB2F47 /* fake_unit_manager.cpp */, ECDEAF6E194FE84000DB2F47 /* fake_unit_manager.hpp */, - ECDEAF6F194FE84000DB2F47 /* fake_unit.cpp */, - ECDEAF70194FE84000DB2F47 /* fake_unit.hpp */, EC08023A194D0A80009E0050 /* unit_formula_manager.cpp */, EC08023B194D0A80009E0050 /* unit_formula_manager.hpp */, ECD39894194B844A00CF2125 /* display_context.cpp */, @@ -2770,8 +2776,6 @@ B5599A710EC62181008DD061 /* gettext.cpp */, B5599A720EC62181008DD061 /* generic_event.hpp */, B5599A730EC62181008DD061 /* generic_event.cpp */, - B5599A750EC62181008DD061 /* gamestatus.hpp */, - B5599A760EC62181008DD061 /* gamestatus.cpp */, B5599A770EC62181008DD061 /* game_preferences_display.cpp */, B5599A780EC62181008DD061 /* game_preferences.hpp */, B5599A790EC62181008DD061 /* game_preferences.cpp */, @@ -4245,6 +4249,7 @@ EC386CF1195119AA006004ED /* unit_animation_component.cpp in Sources */, B5599B200EC62181008DD061 /* multiplayer_create.cpp in Sources */, B5599B210EC62181008DD061 /* multiplayer_connect.cpp in Sources */, + EC387E6C195AFB1F00FC0342 /* game_data.cpp in Sources */, B5599B220EC62181008DD061 /* multiplayer.cpp in Sources */, B5599B230EC62181008DD061 /* mouse_handler_base.cpp in Sources */, B5599B240EC62181008DD061 /* mouse_events.cpp in Sources */, @@ -4267,7 +4272,6 @@ B5599B390EC62181008DD061 /* halo.cpp in Sources */, B5599B630EC62181008DD061 /* gettext.cpp in Sources */, B5599B640EC62181008DD061 /* generic_event.cpp in Sources */, - B5599B660EC62181008DD061 /* gamestatus.cpp in Sources */, B5599B670EC62181008DD061 /* game_preferences_display.cpp in Sources */, B5599B680EC62181008DD061 /* game_preferences.cpp in Sources */, B5599B6A0EC62181008DD061 /* game_display.cpp in Sources */, @@ -4400,6 +4404,7 @@ B54AC7000FEA9FA5006F6FBD /* multi_page.cpp in Sources */, B54AC7010FEA9FA5006F6FBD /* scrollbar_panel.cpp in Sources */, B54AC7540FEC3CF9006F6FBD /* button.cpp in Sources */, + EC387E70195AFB5C00FC0342 /* unit_drawer.cpp in Sources */, B54AC7550FEC3CF9006F6FBD /* image.cpp in Sources */, B54AC7560FEC3CF9006F6FBD /* label.cpp in Sources */, B54AC7570FEC3CF9006F6FBD /* minimap.cpp in Sources */, @@ -4412,7 +4417,6 @@ B508D1FB100155F300B12852 /* helper.cpp in Sources */, B508D1FC100155F300B12852 /* horizontal_scrollbar.cpp in Sources */, B508D1FD100155F300B12852 /* listbox.cpp in Sources */, - ECDEAF73194FE84000DB2F47 /* fake_unit.cpp in Sources */, B508D1FE100155F300B12852 /* multi_page.cpp in Sources */, EC1CB20819524AD600B0FA78 /* recall_list_manager.cpp in Sources */, B508D1FF100155F300B12852 /* scroll_label.cpp in Sources */, @@ -4494,6 +4498,7 @@ EC89A1491879D17D00A3B0B1 /* lvm.cpp in Sources */, EC89A1361879D17D00A3B0B1 /* linit.cpp in Sources */, EC89A13C1879D17D00A3B0B1 /* lobject.cpp in Sources */, + EC387E6D195AFB1F00FC0342 /* game_state.cpp in Sources */, B52EE8841213585300CFBDAB /* tod_manager.cpp in Sources */, B52EE88B1213589100CFBDAB /* data_manage.cpp in Sources */, B52EE88C1213589100CFBDAB /* unit_attack.cpp in Sources */, @@ -4562,6 +4567,7 @@ ECFB9FAA193BFB4B00146ED0 /* game_board.cpp in Sources */, 49DA0D2E13550E9B000AFEBD /* iterator.cpp in Sources */, 49DA0D2F13550E9B000AFEBD /* walker_grid.cpp in Sources */, + EC387E73195AFC8400FC0342 /* fake_unit_ptr.cpp in Sources */, 49DA0D3013550E9B000AFEBD /* walker_widget.cpp in Sources */, 49DA0D3613550F27000AFEBD /* ca_global_fallback.cpp in Sources */, F4E4E0B11367241E001C7528 /* suppose_dead.cpp in Sources */, @@ -4571,7 +4577,6 @@ F46C5DD413A5089100DD0816 /* lua_object.cpp in Sources */, F4EF0D7413AD52EA003C701D /* network_transmission.cpp in Sources */, F444914013C5483F003B6442 /* joystick.cpp in Sources */, - ECDEAF71194FE84000DB2F47 /* drawable_unit.cpp in Sources */, F444916613C5483F003B6442 /* network_asio.cpp in Sources */, F444917713C5562C003B6442 /* folder_create.cpp in Sources */, EC89A12D1879D17D00A3B0B1 /* lcode.cpp in Sources */, @@ -4854,7 +4859,6 @@ B597C5F70FACD6CA00CE81F5 /* pathutils.cpp in Sources */, B597C5F80FACD6CA00CE81F5 /* preferences_display.cpp in Sources */, B597C5FC0FACD6CA00CE81F5 /* playmp_controller.cpp in Sources */, - B597C5FD0FACD6CA00CE81F5 /* gamestatus.cpp in Sources */, B597C5FE0FACD6CA00CE81F5 /* config_cache.cpp in Sources */, B597C5FF0FACD6CA00CE81F5 /* unit_types.cpp in Sources */, B597C6030FACD6CA00CE81F5 /* unit_display.cpp in Sources */,