0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get rid of last duplicate-envoronment warning.

Browse source
This commit is contained in:
Eric S. Raymond 2008-03-23 02:22:04 +00:00
parent 937ed5386a
commit e75d2e0b81
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/SConstruct
View file

@ -98,6 +98,12 @@ libwesnothd_sources = [
env.Library("wesnothd", libwesnothd_sources,
CPPPATH = ['.', "/usr/include/SDL"])
libcampaignd_sources = [
"publish_campaign.cpp",
]
env.Library("campaignd", libcampaignd_sources,
CPPPATH = ['.', "/usr/include/SDL"])
wesnoth_sources = [
"about.cpp",
"actions.cpp",
@ -142,7 +148,6 @@ wesnoth_sources = [
"playmp_controller.cpp",
"playsingle_controller.cpp",
"playturn.cpp",
"publish_campaign.cpp",
"replay.cpp",
"replay_controller.cpp",
"sha1.cpp",
@ -166,7 +171,7 @@ wesnoth_sources = [
]
env.Program("wesnoth", wesnoth_sources,
CPPPATH = ['.', 'server', "/usr/include/SDL"],
LIBS = ['wesnoth_core', 'wesnoth'] + commonlibs,
LIBS = ['wesnoth_core', 'wesnoth', 'campaignd'] + commonlibs,
LIBPATH = [".", "/lib", "/usr/lib"])
wesnoth_editor_sources = [
@ -188,11 +193,10 @@ env.Program("wesnoth_editor", wesnoth_editor_sources,
campaignd_sources = [
"campaign_server/campaign_server.cpp",
"publish_campaign.cpp",
]
env.Program("campaignd", campaignd_sources,
CPPPATH = ['.', 'server', "/usr/include/SDL"],
LIBS = ['wesnoth_core', 'wesnothd', 'wesnoth'] + commonlibs,
LIBS = ['wesnoth_core', 'wesnothd', 'campaignd', 'wesnoth'] + commonlibs,
LIBPATH = [".", "/lib", "/usr/lib"])
wesnothd_sources = [