Changeset 137 for cafu/trunk/SConscript

Show
Ignore:
Timestamp:
08/27/10 12:38:59 (21 months ago)
Author:
Carsten
Message:

Fix linker parameters under Linux, where wx-config induced redundant -lpng and -ljpeg (the system libraries)
that conflicted with our custom (and slightly newer and thus version-incompatible) "cfs" editions.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • cafu/trunk/SConscript

    r136 r137  
    109109    # Geht es auch ohne die naechste Zeile? Woher weiss es, dass es freetype linken soll??? 
    110110    wxEnv.Append(LIBS=Split("wx_gtk2u_gl-2.9 wx_gtk2u_aui-2.9 wx_gtk2u_propgrid-2.9 wx_gtk2u_xrc-2.9 wx_gtk2u_qa-2.9 wx_gtk2u_html-2.9 wx_gtk2u_adv-2.9 wx_gtk2u_core-2.9 wx_baseu_xml-2.9 wx_baseu_net-2.9 wx_baseu-2.9")) 
    111     wxEnv.ParseConfig(Dir("#/ExtLibs/wxWidgets").abspath + "/build-gtk/wx-config --cxxflags --libs std,gl") 
     111    wxEnv.ParseConfig(Dir("#/ExtLibs/wxWidgets").abspath + "/build-gtk/wx-config --cxxflags --libs std,gl | sed s/\\ -lpng// | sed s/\\ -ljpeg//") 
    112112 
    113113