Author: esr
Date: Sun Mar 23 03:22:04 2008
New Revision: 25001
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25001&view=rev
Log:
Get rid of last duplicate-envoronment warning.
Modified:
trunk/src/SConstruct
Modified: trunk/src/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/SConstruct?rev=25001&r1=25000&r2=25001&view=diff
==============================================================================
--- trunk/src/SConstruct (original)
+++ trunk/src/SConstruct Sun Mar 23 03:22:04 2008
@@ -98,6 +98,12 @@
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 @@
"playmp_controller.cpp",
"playsingle_controller.cpp",
"playturn.cpp",
- "publish_campaign.cpp",
"replay.cpp",
"replay_controller.cpp",
"sha1.cpp",
@@ -166,7 +171,7 @@
]
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 @@
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 = [
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
