Skip to content

Commit

Permalink
wesnoth_objects -> libwesnoth_objects
Browse files Browse the repository at this point in the history
  • Loading branch information
Pentarctagon authored and GregoryLundberg committed Nov 30, 2017
1 parent 96a45aa commit 5df89d0
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/SConscript
Expand Up @@ -147,11 +147,11 @@ for env in [test_env, client_env, env]:
env.AddMethod(WesnothProgram)

#---wesnoth---
wesnoth_objects = libwesnoth_extras + libwesnoth_core + libwesnoth + libwesnoth_sdl + libwesnoth_extras
libwesnoth_objects = libwesnoth_extras + libwesnoth_core + libwesnoth + libwesnoth_sdl + libwesnoth_extras
if env["PLATFORM"] == 'darwin':
client_env.WesnothProgram("wesnoth", ["wesnoth.cpp"] + wesnoth_objects + ["macosx/SDLMain.mm"], have_client_prereqs)
client_env.WesnothProgram("wesnoth", ["wesnoth.cpp"] + libwesnoth_objects + ["macosx/SDLMain.mm"], have_client_prereqs)
else:
client_env.WesnothProgram("wesnoth", ["wesnoth.cpp"] + wesnoth_objects, have_client_prereqs)
client_env.WesnothProgram("wesnoth", ["wesnoth.cpp"] + libwesnoth_objects, have_client_prereqs)

#---wesnothd---
wesnothd_sources = GetSources("wesnothd")
Expand All @@ -163,7 +163,7 @@ env.WesnothProgram("campaignd", campaignd_sources + libwesnoth_core, have_server

#---boost_unit_tests---
test_sources = GetSources("boost_unit_tests")
boost_unit_tests = test_env.WesnothProgram("boost_unit_tests", test_sources + wesnoth_objects, have_test_prereqs)
boost_unit_tests = test_env.WesnothProgram("boost_unit_tests", test_sources + libwesnoth_objects, have_test_prereqs)
#---end of getting sources---

sources = []
Expand Down

0 comments on commit 5df89d0

Please sign in to comment.