mail[Wesnoth-commits] r24997 - /trunk/src/SConstruct


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by esr on March 23, 2008 - 00:28:
Author: esr
Date: Sun Mar 23 00:27:54 2008
New Revision: 24997

URL: http://svn.gna.org/viewcvs/wesnoth?rev=24997&view=rev
Log:
Correct and simplify some paths.

Modified:
    trunk/src/SConstruct

Modified: trunk/src/SConstruct
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/SConstruct?rev=24997&r1=24996&r2=24997&view=diff
==============================================================================
--- trunk/src/SConstruct (original)
+++ trunk/src/SConstruct Sun Mar 23 00:27:54 2008
@@ -161,7 +161,7 @@
 env.Program("wesnoth", wesnoth_sources,
             CPPPATH = ['.', 'server', "/usr/include/SDL"],
             LIBS = ['wesnoth_core', 'wesnoth'] + commonlibs,
-            LIBPATH = [".", "src", "/lib", "/usr/lib"])
+            LIBPATH = [".", "/lib", "/usr/lib"])
 
 wesnoth_editor_sources = [
     "editor/editor.cpp",
@@ -176,9 +176,9 @@
     "gamestatus_editor.cpp",
     ]
 env.Program("wesnoth_editor", wesnoth_editor_sources,
-            CPPPATH = ['.', 'server', "/usr/include/SDL"],
+            CPPPATH = ['.', "/usr/include/SDL"],
             LIBS = ['wesnoth_core', 'wesnoth'] + commonlibs,
-            LIBPATH = [".", "src", "/lib", "/usr/lib"])
+            LIBPATH = [".", "/lib", "/usr/lib"])
 
 campaignd_sources = [
     "campaign_server/campaign_server.cpp",
@@ -188,7 +188,7 @@
 env.Program("campaignd", campaignd_sources,
             CPPPATH = ['.', 'server', "/usr/include/SDL"],
             LIBS = ['wesnoth_core', 'wesnoth'] + commonlibs,
-            LIBPATH = [".", "src", "/lib", "/usr/lib"])
+            LIBPATH = [".", "/lib", "/usr/lib"])
 
 wesnothd_sources = [
     "server/game.cpp",
@@ -203,7 +203,7 @@
 env.Program("wesnothd", wesnothd_sources,
             CPPPATH = ['.', 'server', "/usr/include/SDL"],
             LIBS =  ['wesnoth_core'] + commonlibs,
-            LIBPATH = [".", "src", "/lib", "/usr/lib"])
+            LIBPATH = [".", "/lib", "/usr/lib"])
 
 # FIXME: Include this in gameconfig.cpp when we switch over to scons.
 # Because of the content check, scons will do the right thing.
@@ -222,3 +222,6 @@
             'etags -l c++ $SOURCES')
 env.Clean(all, 'TAGS')
 
+# Local variables:
+# mode: python
+# end:




Related Messages


Powered by MHonArc, Updated Sun Mar 23 01:41:21 2008