Author: soliton
Date: Thu Mar 27 00:40:51 2008
New Revision: 25174
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25174&view=rev
Log:
* remove unnecessary includes and libs from the wesnothd target
* add a wesnothd-install target
* add linker flag for profiling
Modified:
trunk/SConstruct
Modified: trunk/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=25174&r1=25173&r2=25174&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Thu Mar 27 00:40:51 2008
@@ -142,6 +142,7 @@
if env['profile']:
env["CXXFLAGS"].append("-pg")
+ env["LINKFLAGS"].append("-pg")
if env['strict']:
env["CXXFLAGS"].append("-Werror -Wno-unused -Wno-sign-compare")
@@ -198,6 +199,7 @@
boost_libs = Split("boost_iostreams-mt boost_regex")
SDL_libs = Split("SDL_net SDL_ttf SDL_mixer SDL_image SDL")
commonlibs = SDL_libs + boost_libs + ["pthread", "png",
"-lpython"+sys.version[:3]]
+wesnothdlibs = ["SDL_net", "boost_iostreams-mt", "pthread"]
commonpath = ['src', '/usr/include/SDL', '/usr/include/python%s' %
sys.version[:3]]
#color_range.cpp should be removed, but game_config depends on it.
@@ -286,7 +288,7 @@
"src/tools/dummy_video.cpp",
]
env.Library("wesnothd", libwesnothd_sources,
- CPPPATH = commonpath)
+ CPPPATH = ['src', '/usr/include/SDL'])
libcampaignd_sources = [
"src/publish_campaign.cpp",
@@ -417,8 +419,8 @@
"src/server/simple_wml.cpp",
]
wesnothd = env.Program("wesnothd", wesnothd_sources,
- CPPPATH = ['src', 'src/server', '/usr/include/SDL',
'/usr/include/python%s' % sys.version[:3]],
- LIBS = ['wesnoth_core', 'wesnothd'] + commonlibs,
+ CPPPATH = ['src', 'src/server', '/usr/include/SDL'],
+ LIBS = ['wesnoth_core', 'wesnothd'] + wesnothdlibs,
LIBPATH = [".", "/lib", "/usr/lib"])
cutter_sources = [
@@ -619,6 +621,7 @@
#
# Installation productions
#
+wesnothd_env = env.Clone()
bindir = os.path.normpath(os.path.join(env['prefix'], "bin"))
pythonlib = os.path.join(env['prefix'] + "/lib/python/site-packages/wesnoth")
@@ -637,6 +640,8 @@
env.Install(datadir, subdir)
env.Alias('install', [bindir, datadir, pythonlib])
+wesnothd_env.Default(env.Alias("wesnothd-install", env.InstallAs(bindir +
"/wesnothd", wesnothd)))
+
#
# Un-installation
#
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
