Author: esr
Date: Sun Mar 23 06:46:18 2008
New Revision: 25005
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25005&view=rev
Log:
Refactor libraries to eliminate scons warning messages.
Modified:
trunk/src/SConstruct
Modified: trunk/src/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/SConstruct?rev=25005&r1=25004&r2=25005&view=diff
==============================================================================
--- trunk/src/SConstruct (original)
+++ trunk/src/SConstruct Sun Mar 23 06:46:18 2008
@@ -108,6 +108,14 @@
"sdl_utils.cpp",
]
env.Library("wesnoth_sdl", libwesnoth_sdl_sources,
+ CPPPATH = ['.', "/usr/include/SDL"])
+
+libcutter_sources = [
+ "tools/exploder_utils.cpp",
+ "tools/exploder_cutter.cpp",
+ "tools/dummy_video.cpp",
+ ]
+env.Library("cutter", libcutter_sources,
CPPPATH = ['.', "/usr/include/SDL"])
wesnoth_sources = [
@@ -221,25 +229,19 @@
cutter_sources = [
"tools/cutter.cpp",
- "tools/exploder_utils.cpp",
- "tools/exploder_cutter.cpp",
- "tools/dummy_video.cpp",
]
env.Program("cutter", cutter_sources,
CPPPATH = ['.', "/usr/include/SDL"],
- LIBS = ['wesnoth_core', 'wesnoth_sdl', 'wesnothd'] + commonlibs,
+ LIBS = ['cutter', 'wesnoth_core', 'wesnoth_sdl', 'wesnothd'] +
commonlibs,
LIBPATH = [".", "/lib", "/usr/lib"])
exploder_sources = [
"tools/exploder.cpp",
- "tools/exploder_utils.cpp",
- "tools/exploder_cutter.cpp",
"tools/exploder_composer.cpp",
- "tools/dummy_video.cpp",
]
env.Program("exploder", exploder_sources,
CPPPATH = ['.', "/usr/include/SDL"],
- LIBS = ['wesnoth_core', 'wesnoth_sdl', 'wesnothd'] + commonlibs,
+ LIBS = ['cutter', 'wesnoth_core', 'wesnoth_sdl', 'wesnothd'] +
commonlibs,
LIBPATH = [".", "/lib", "/usr/lib"])
# FIXME: Include this in gameconfig.cpp when we switch over to scons.
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
