Skip to content

Commit

Permalink
rename "main" compilation unit "wesnoth.cpp" to match executable
Browse files Browse the repository at this point in the history
  • Loading branch information
cbeck88 committed Jun 29, 2014
1 parent d577938 commit da41bf9
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion projectfiles/CodeBlocks/wesnoth.cbp
Expand Up @@ -330,7 +330,6 @@
<Unit filename="..\..\src\formula_string_utils.hpp" />
<Unit filename="..\..\src\formula_tokenizer.cpp" />
<Unit filename="..\..\src\formula_tokenizer.hpp" />
<Unit filename="..\..\src\game.cpp" />
<Unit filename="..\..\src\game_board.cpp" />
<Unit filename="..\..\src\game_board.hpp" />
<Unit filename="..\..\src\game_classification.cpp" />
Expand Down Expand Up @@ -1070,6 +1069,7 @@
<Unit filename="..\..\src\video.cpp" />
<Unit filename="..\..\src\video.hpp" />
<Unit filename="..\..\src\wesconfig.h" />
<Unit filename="..\..\src\wesnoth.cpp" />
<Unit filename="..\..\src\whiteboard\action.cpp" />
<Unit filename="..\..\src\whiteboard\action.hpp" />
<Unit filename="..\..\src\whiteboard\attack.cpp" />
Expand Down
34 changes: 17 additions & 17 deletions projectfiles/VC9/wesnoth.vcproj
Expand Up @@ -20256,18 +20256,6 @@
RelativePath="..\..\src\formula_tokenizer.hpp"
>
</File>
<File
RelativePath="..\..\src\game.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
DisableSpecificWarnings="4706"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\game_board.cpp"
>
Expand Down Expand Up @@ -20712,6 +20700,14 @@
RelativePath="..\..\src\notifications\notifications.hpp"
>
</File>
<File
RelativePath="..\..\src\notifications\windows_tray_notification.cpp"
>
</File>
<File
RelativePath="..\..\src\notifications\windows_tray_notification.hpp"
>
</File>
<File
RelativePath="..\..\src\overlay.hpp"
>
Expand Down Expand Up @@ -21281,12 +21277,16 @@
>
</File>
<File
RelativePath="..\..\src\notifications\windows_tray_notification.cpp"
>
</File>
<File
RelativePath="..\..\src\notifications\windows_tray_notification.hpp"
RelativePath="..\..\src\wesnoth.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
DisableSpecificWarnings="4706"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\wmi_pager.cpp"
Expand Down
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
Expand Up @@ -1020,7 +1020,7 @@ endif(ENABLE_GAME AND ENABLE_TESTS)
if(ENABLE_GAME)
if(ENABLE_TESTS)
set(wesnoth_SRC
game.cpp
wesnoth.cpp
)
set(wesnoth_LIB
wesnoth-game
Expand All @@ -1037,7 +1037,7 @@ if(ENABLE_GAME)
)
else(ENABLE_TESTS)
set(wesnoth_SRC
game.cpp
wesnoth.cpp
${wesnoth-gui_types_SRC}
${wesnoth-gui_event_SRC}
${wesnoth-gui_iterator_SRC}
Expand Down
2 changes: 1 addition & 1 deletion src/SConscript
Expand Up @@ -589,7 +589,7 @@ def WesnothProgram(env, target, source, can_build, **kw):
for env in [test_env, client_env, env]:
env.AddMethod(WesnothProgram)

wesnoth_objects = ["game.cpp", libwesnoth_extras, libwesnoth_core, libwesnoth,
wesnoth_objects = ["wesnoth.cpp", libwesnoth_extras, libwesnoth_core, libwesnoth,
libwesnoth_sdl, libwesnoth_extras, env["wesnoth_res"]]
if env["host"] in ["x86_64-nacl", "i686-nacl"]:
wesnoth_objects += [SConscript("nacl/SConscript")]
Expand Down
File renamed without changes.

0 comments on commit da41bf9

Please sign in to comment.