mail[Wesnoth-commits] r25045 - in /trunk: SConstruct src/SConstruct


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

Header


Content

Posted by esr on March 24, 2008 - 04:45:
Author: esr
Date: Mon Mar 24 04:45:07 2008
New Revision: 25045

URL: http://svn.gna.org/viewcvs/wesnoth?rev=25045&view=rev
Log:
Implement fribidi check in scons.

Modified:
    trunk/SConstruct
    trunk/src/SConstruct

Modified: trunk/SConstruct
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=25045&r1=25044&r2=25045&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Mon Mar 24 04:45:07 2008
@@ -103,6 +103,9 @@
     if not conf.CheckLib('SDL_image'):
         print "Needed SDL image lib for game or editor and didn't find it; 
exiting!"
         Exit(1)
+    if env['fribidi'] and conf.CheckLib('fribidi'):
+        print "Can't find libfribidi, please install it or rebuild with 
fribidi=no."
+        Exit(1)
 
 if ("wesnoth" in targets or "wesnothd" in targets or "campaignd" in targets):
     if not conf.CheckLib('SDL_net'):

Modified: trunk/src/SConstruct
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/SConstruct?rev=25045&r1=25044&r2=25045&view=diff
==============================================================================
--- trunk/src/SConstruct (original)
+++ trunk/src/SConstruct Mon Mar 24 04:45:07 2008
@@ -9,6 +9,7 @@
 #
 # Implement configuration switches
 #
+extralibs=[]
 
 if env["debug"]:
     env["CXXFLAGS"] = Split("-O0 -DDEBUG -ggdb3 -W -Wall -ansi")
@@ -33,13 +34,9 @@
 if env['lowmem']:
     env["CXXFLAGS"].append("-DLOW_MEM")
 
-# FIXME: Need to figure out how 
-#if env['fribidi']:
-#    if conf.CheckLib('fribidi'):
-#        env["CXXFLAGS"].append("-DHAVE_FRIBIDI")
-#        env.Append(LIBS="fribidi")
-#    else:
-#        print "*** libfribidi is not available, turning off bidi support."
+if env['fribidi']:
+        env["CXXFLAGS"].append("-DHAVE_FRIBIDI")
+        extralibs.append("fribidi")
 
 if env['raw_sockets']:
     env["CXXFLAGS"].append("-DNETWORK_USE_RAW_SOCKETS")
@@ -237,7 +234,7 @@
 
 env.Program("wesnoth", ["game.cpp"] + wesnoth_sources,
             CPPPATH = ['.', 'server', "/usr/include/SDL"],
-            LIBS = ['wesnoth_core', 'wesnoth_sdl', 'wesnoth', 'campaignd'] + 
commonlibs,
+            LIBS = ['wesnoth_core', 'wesnoth_sdl', 'wesnoth', 'campaignd'] + 
commonlibs + extralibs,
             LIBPATH = [".", "/lib", "/usr/lib"])
 
 wesnoth_editor_sources = [
@@ -254,7 +251,7 @@
     ]
 env.Program("wesnoth_editor", wesnoth_editor_sources,
             CPPPATH = ['.', "/usr/include/SDL"],
-            LIBS = ['wesnoth_core', 'wesnoth_sdl', 'wesnoth'] + commonlibs,
+            LIBS = ['wesnoth_core', 'wesnoth_sdl', 'wesnoth'] + commonlibs + 
extralibs,
             LIBPATH = [".", "/lib", "/usr/lib"])
 
 campaignd_sources = [




Related Messages


Powered by MHonArc, Updated Mon Mar 24 05:00:57 2008