Skip to content

Commit

Permalink
Merge pull request #3451 from wesnoth/Fix_Wesnoth_for_Xcode_10
Browse files Browse the repository at this point in the history 
Fix building with Xcode 10
  • Loading branch information
@CelticMinstrel
CelticMinstrel committed Aug 12, 2018
2 parents 717a43c + eb4a09d commit 543d354
Show file tree
Hide file tree
Showing 79 changed files with 140 additions and 138 deletions.
12 changes: 6 additions & 6 deletions projectfiles/CodeBlocks-SCons/wesnoth.cbp
View file
Expand Up @@ -720,8 +720,8 @@
<Unit filename="../../src/hotkey/hotkey_manager.cpp" />
<Unit filename="../../src/hotkey/hotkey_manager.hpp" />
<Unit filename="../../src/hotkey/hotkey_preferences_display.cpp" />
<Unit filename="../../src/image.cpp" />
<Unit filename="../../src/image.hpp" />
<Unit filename="../../src/picture.cpp" />
<Unit filename="../../src/picture.hpp" />
<Unit filename="../../src/image_modifications.cpp" />
<Unit filename="../../src/image_modifications.hpp" />
<Unit filename="../../src/intro.cpp" />
Expand Down Expand Up @@ -919,8 +919,8 @@
<Unit filename="../../src/serialization/unicode.hpp" />
<Unit filename="../../src/serialization/validator.cpp" />
<Unit filename="../../src/serialization/validator.hpp" />
<Unit filename="../../src/settings.cpp" />
<Unit filename="../../src/settings.hpp" />
<Unit filename="../../src/map_settings.cpp" />
<Unit filename="../../src/map_settings.hpp" />
<Unit filename="../../src/sha1.cpp" />
<Unit filename="../../src/sha1.hpp" />
<Unit filename="../../src/shared_object.hpp" />
Expand Down Expand Up @@ -1017,8 +1017,8 @@
<Unit filename="../../src/variable.hpp" />
<Unit filename="../../src/variant.cpp" />
<Unit filename="../../src/variant.hpp" />
<Unit filename="../../src/version.cpp" />
<Unit filename="../../src/version.hpp" />
<Unit filename="../../src/game_version.cpp" />
<Unit filename="../../src/game_version.hpp" />
<Unit filename="../../src/video.cpp" />
<Unit filename="../../src/video.hpp" />
<Unit filename="../../src/wesconfig.h" />
Expand Down
4 changes: 2 additions & 2 deletions projectfiles/CodeBlocks-SCons/wesnothd.cbp
View file
Expand Up @@ -107,8 +107,8 @@
<Unit filename="../../src/tstring.hpp" />
<Unit filename="../../src/util.cpp" />
<Unit filename="../../src/util.hpp" />
<Unit filename="../../src/version.cpp" />
<Unit filename="../../src/version.hpp" />
<Unit filename="../../src/game_version.cpp" />
<Unit filename="../../src/game_version.hpp" />
<Unit filename="../../src/wesconfig.h" />
<Extensions>
<code_completion />
Expand Down
12 changes: 6 additions & 6 deletions projectfiles/CodeBlocks/wesnoth.cbp
View file
Expand Up @@ -827,8 +827,8 @@
<Unit filename="../../src/hotkey/hotkey_item.hpp" />
<Unit filename="../../src/hotkey/hotkey_manager.cpp" />
<Unit filename="../../src/hotkey/hotkey_manager.hpp" />
<Unit filename="../../src/image.cpp" />
<Unit filename="../../src/image.hpp" />
<Unit filename="../../src/picture.cpp" />
<Unit filename="../../src/picture.hpp" />
<Unit filename="../../src/image_modifications.cpp" />
<Unit filename="../../src/image_modifications.hpp" />
<Unit filename="../../src/joystick.cpp" />
Expand Down Expand Up @@ -1037,8 +1037,8 @@
<Unit filename="../../src/serialization/unicode.hpp" />
<Unit filename="../../src/serialization/validator.cpp" />
<Unit filename="../../src/serialization/validator.hpp" />
<Unit filename="../../src/settings.cpp" />
<Unit filename="../../src/settings.hpp" />
<Unit filename="../../src/map_settings.cpp" />
<Unit filename="../../src/map_settings.hpp" />
<Unit filename="../../src/show_dialog.cpp" />
<Unit filename="../../src/show_dialog.hpp" />
<Unit filename="../../src/side_filter.cpp" />
Expand Down Expand Up @@ -1161,8 +1161,8 @@
<Unit filename="../../src/variable_info.cpp" />
<Unit filename="../../src/variable_info.hpp" />
<Unit filename="../../src/variable_info_private.hpp" />
<Unit filename="../../src/version.cpp" />
<Unit filename="../../src/version.hpp" />
<Unit filename="../../src/game_version.cpp" />
<Unit filename="../../src/game_version.hpp" />
<Unit filename="../../src/video.cpp" />
<Unit filename="../../src/video.hpp" />
<Unit filename="../../src/wesconfig.h" />
Expand Down
4 changes: 2 additions & 2 deletions projectfiles/CodeBlocks/wesnothd.cbp
View file
Expand Up @@ -137,8 +137,8 @@
<Unit filename="../../src/tstring.cpp" />
<Unit filename="../../src/tstring.hpp" />
<Unit filename="../../src/util.hpp" />
<Unit filename="../../src/version.cpp" />
<Unit filename="../../src/version.hpp" />
<Unit filename="../../src/game_version.cpp" />
<Unit filename="../../src/game_version.hpp" />
<Unit filename="../../src/wesconfig.h" />
<Extensions>
<code_completion />
Expand Down
14 changes: 7 additions & 7 deletions projectfiles/VC12/wesnoth.vcxproj
View file
Expand Up @@ -2492,7 +2492,7 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Hotkeys\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Hotkeys\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\image.cpp" />
<ClCompile Include="..\..\src\picture.cpp" />
<ClCompile Include="..\..\src\image_modifications.cpp" />
<ClCompile Include="..\..\src\joystick.cpp" />
<ClCompile Include="..\..\src\key.cpp" />
Expand Down Expand Up @@ -2813,7 +2813,7 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Serialization\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Serialization\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\settings.cpp" />
<ClCompile Include="..\..\src\map_settings.cpp" />
<ClCompile Include="..\..\src\show_dialog.cpp" />
<ClCompile Include="..\..\src\side_filter.cpp" />
<ClCompile Include="..\..\src\sound.cpp" />
Expand Down Expand Up @@ -3181,7 +3181,7 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Tests\Utils\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Tests\Utils\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\tests\utils\game_config_manager.cpp">
<ClCompile Include="..\..\src\tests\utils\game_config_manager_tests.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Tests\Utils\</ObjectFileName>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">true</ExcludedFromBuild>
Expand Down Expand Up @@ -3886,7 +3886,7 @@
<ClInclude Include="..\..\src\hotkey\hotkey_handler_sp.hpp" />
<ClInclude Include="..\..\src\hotkey\hotkey_item.hpp" />
<ClInclude Include="..\..\src\hotkey\hotkey_manager.hpp" />
<ClInclude Include="..\..\src\image.hpp" />
<ClInclude Include="..\..\src\picture.hpp" />
<ClInclude Include="..\..\src\image_modifications.hpp" />
<ClInclude Include="..\..\src\joystick.hpp" />
<ClInclude Include="..\..\src\key.hpp" />
Expand Down Expand Up @@ -3971,7 +3971,7 @@
<ClInclude Include="..\..\src\sdl\utils.hpp" />
<ClInclude Include="..\..\src\sdl\window.hpp" />
<ClInclude Include="..\..\src\seed_rng.hpp" />
<ClInclude Include="..\..\src\settings.hpp" />
<ClInclude Include="..\..\src\map_settings.hpp" />
<ClInclude Include="..\..\src\show_dialog.hpp" />
<ClInclude Include="..\..\src\side_filter.hpp" />
<ClInclude Include="..\..\src\sound.hpp" />
Expand Down Expand Up @@ -4014,7 +4014,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\src\tests\utils\game_config_manager.hpp">
<CustomBuild Include="..\..\src\tests\utils\game_config_manager_tests.hpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
Expand Down Expand Up @@ -4064,7 +4064,7 @@
<ClInclude Include="..\..\src\variable_info.hpp" />
<ClInclude Include="..\..\src\variable_info_detail.hpp" />
<ClInclude Include="..\..\src\variable_info_private.hpp" />
<ClInclude Include="..\..\src\version.hpp" />
<ClInclude Include="..\..\src\game_version.hpp" />
<ClInclude Include="..\..\src\video.hpp" />
<ClInclude Include="..\..\src\wesconfig.h" />
<ClInclude Include="..\..\src\wesnothd_connection.hpp" />
Expand Down
14 changes: 7 additions & 7 deletions projectfiles/VC12/wesnoth.vcxproj.filters
View file
Expand Up @@ -1091,7 +1091,7 @@
<ClCompile Include="..\..\src\tests\utils\fake_event_source.cpp">
<Filter>Tests\Utils</Filter>
</ClCompile>
<ClCompile Include="..\..\src\tests\utils\game_config_manager.cpp">
<ClCompile Include="..\..\src\tests\utils\game_config_manager_tests.cpp">
<Filter>Tests\Utils</Filter>
</ClCompile>
<ClCompile Include="..\..\src\tests\utils\play_scenario.cpp">
Expand Down Expand Up @@ -1432,7 +1432,7 @@
<ClCompile Include="..\..\src\generic_event.cpp" />
<ClCompile Include="..\..\src\halo.cpp" />
<ClCompile Include="..\..\src\hash.cpp" />
<ClCompile Include="..\..\src\image.cpp" />
<ClCompile Include="..\..\src\picture.cpp" />
<ClCompile Include="..\..\src\image_modifications.cpp" />
<ClCompile Include="..\..\src\joystick.cpp" />
<ClCompile Include="..\..\src\key.cpp" />
Expand Down Expand Up @@ -1471,7 +1471,7 @@
<ClCompile Include="..\..\src\saved_game.cpp" />
<ClCompile Include="..\..\src\savegame.cpp" />
<ClCompile Include="..\..\src\seed_rng.cpp" />
<ClCompile Include="..\..\src\settings.cpp" />
<ClCompile Include="..\..\src\map_settings.cpp" />
<ClCompile Include="..\..\src\show_dialog.cpp" />
<ClCompile Include="..\..\src\side_filter.cpp" />
<ClCompile Include="..\..\src\sound.cpp" />
Expand Down Expand Up @@ -2859,7 +2859,7 @@
<ClInclude Include="..\..\src\global.hpp" />
<ClInclude Include="..\..\src\halo.hpp" />
<ClInclude Include="..\..\src\hash.hpp" />
<ClInclude Include="..\..\src\image.hpp" />
<ClInclude Include="..\..\src\picture.hpp" />
<ClInclude Include="..\..\src\image_modifications.hpp" />
<ClInclude Include="..\..\src\joystick.hpp" />
<ClInclude Include="..\..\src\key.hpp" />
Expand Down Expand Up @@ -2902,7 +2902,7 @@
<ClInclude Include="..\..\src\savegame.hpp" />
<ClInclude Include="..\..\src\savegame_config.hpp" />
<ClInclude Include="..\..\src\seed_rng.hpp" />
<ClInclude Include="..\..\src\settings.hpp" />
<ClInclude Include="..\..\src\map_settings.hpp" />
<ClInclude Include="..\..\src\show_dialog.hpp" />
<ClInclude Include="..\..\src\side_filter.hpp" />
<ClInclude Include="..\..\src\sound.hpp" />
Expand All @@ -2924,7 +2924,7 @@
<ClInclude Include="..\..\src\variable_info.hpp" />
<ClInclude Include="..\..\src\variable_info_detail.hpp" />
<ClInclude Include="..\..\src\variable_info_private.hpp" />
<ClInclude Include="..\..\src\version.hpp" />
<ClInclude Include="..\..\src\game_version.hpp" />
<ClInclude Include="..\..\src\video.hpp" />
<ClInclude Include="..\..\src\wesconfig.h" />
<ClInclude Include="..\..\src\wesnothd_connection.hpp" />
Expand Down Expand Up @@ -3034,7 +3034,7 @@
<CustomBuild Include="..\..\src\tests\utils\fake_event_source.hpp">
<Filter>Tests\Utils</Filter>
</CustomBuild>
<CustomBuild Include="..\..\src\tests\utils\game_config_manager.hpp">
<CustomBuild Include="..\..\src\tests\utils\game_config_manager_tests.hpp">
<Filter>Tests\Utils</Filter>
</CustomBuild>
<CustomBuild Include="..\..\src\tests\utils\play_scenario.hpp">
Expand Down
4 changes: 2 additions & 2 deletions projectfiles/VC12/wesnothlib.vcxproj
View file
Expand Up @@ -164,7 +164,7 @@
<ClCompile Include="..\..\src\serialization\unicode.cpp" />
<ClCompile Include="..\..\src\serialization\validator.cpp" />
<ClCompile Include="..\..\src\tstring.cpp" />
<ClCompile Include="..\..\src\version.cpp" />
<ClCompile Include="..\..\src\game_version.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\color.hpp" />
Expand Down Expand Up @@ -205,7 +205,7 @@
<ClInclude Include="..\..\src\spirit_po\version.hpp" />
<ClInclude Include="..\..\src\tstring.hpp" />
<ClInclude Include="..\..\src\utils\type_trait_aliases.hpp" />
<ClInclude Include="..\..\src\version.hpp" />
<ClInclude Include="..\..\src\game_version.hpp" />
<ClInclude Include="..\..\src\wesconfig.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
4 changes: 2 additions & 2 deletions projectfiles/VC12/wesnothlib.vcxproj.filters
View file
Expand Up @@ -61,7 +61,7 @@
<ClCompile Include="..\..\src\log_windows.cpp" />
<ClCompile Include="..\..\src\random.cpp" />
<ClCompile Include="..\..\src\tstring.cpp" />
<ClCompile Include="..\..\src\version.cpp" />
<ClCompile Include="..\..\src\game_version.cpp" />
<ClCompile Include="..\..\src\font\constants.cpp">
<Filter>Font</Filter>
</ClCompile>
Expand Down Expand Up @@ -114,7 +114,7 @@
<ClInclude Include="..\..\src\log_windows.hpp" />
<ClInclude Include="..\..\src\random.hpp" />
<ClInclude Include="..\..\src\tstring.hpp" />
<ClInclude Include="..\..\src\version.hpp" />
<ClInclude Include="..\..\src\game_version.hpp" />
<ClInclude Include="..\..\src\wesconfig.h" />
<ClInclude Include="..\..\src\font\constants.hpp">
<Filter>Font</Filter>
Expand Down

0 comments on commit 543d354

Please sign in to comment.