nobody at rubyforge.org
2007-Mar-26 19:09 UTC
[Wxruby-development] [919] trunk/wxruby2/rake/rakelinux.rb: Use wxWidgets built-in support libs; add wxScintilla option
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:'':'';} #msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; } #msg ul, pre { overflow: auto; } #header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[919] trunk/wxruby2/rake/rakelinux.rb: Use wxWidgets built-in support libs; add wxScintilla option</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>919</dd> <dt>Author</dt> <dd>brokentoy</dd> <dt>Date</dt> <dd>2007-03-26 15:09:34 -0400 (Mon, 26 Mar 2007)</dd> </dl> <h3>Log Message</h3> <pre>Use wxWidgets built-in support libs; add wxScintilla option</pre> <h3>Modified Paths</h3> <ul> <li><a href="#trunkwxruby2rakerakelinuxrb">trunk/wxruby2/rake/rakelinux.rb</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="trunkwxruby2rakerakelinuxrb"></a> <div class="modfile"><h4>Modified: trunk/wxruby2/rake/rakelinux.rb (918 => 919)</h4> <pre class="diff"><span> <span class="info">--- trunk/wxruby2/rake/rakelinux.rb        2007-03-23 17:00:12 UTC (rev 918) +++ trunk/wxruby2/rake/rakelinux.rb        2007-03-26 19:09:34 UTC (rev 919) </span><span class="lines">@@ -22,8 +22,7 @@ </span><span class="cx"> if($link_wx_statically) </span><span class="cx">         $extra_libs = "-Wl,-Bdynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 " + </span><span class="cx">         "-lgdk_pixbuf-2.0 -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 " + </span><del>-        "-lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 " + -        "-ljpeg -lpng -ltiff" </del><ins>+        "-lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 " </ins><span class="cx">         libs = $wx_libs.split('' '') </span><span class="cx">         libs.collect! do | lib | </span><span class="cx">                 if(lib =~ /lwx_/) </span><span class="lines">@@ -32,4 +31,9 @@ </span><span class="cx">                 lib </span><span class="cx">         end </span><span class="cx">         $wx_libs = libs.join('' '') </span><ins>+ WXSCINTILLA = ENV[''WXSCINTILLA''] + if WXSCINTILLA + $wx_libs += " #{WXSCINTILLA}/lib/libwxscintilla.a " + $wx_cppflags += " -I#{WXSCINTILLA}/include -DWXSCINTILLA" + end </ins><span class="cx"> end </span></span></pre> </div> </div> </body> </html>