thr3ads.net - wxruby development - [Wxruby-development] [975] branches/wxruby2/wxwidgets_282/rake/rakemswin.rb: Correct spacing for link command; remove odbc and db

If this information is useful, please help other people find it:
Share via:

nobody at rubyforge.org

2007-Apr-28 23:07 UTC

[Wxruby-development] [975] branches/wxruby2/wxwidgets_282/rake/rakemswin.rb: Correct spacing for link command; remove odbc and db_table which aren''t

<!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>[975] branches/wxruby2/wxwidgets_282/rake/rakemswin.rb: Correct
spacing for link command; remove odbc and db_table which
aren''t</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>975</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-04-28 19:07:38 -0400 (Sat, 28 Apr
2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>Correct spacing for link command; remove odbc and db_table which
aren''t
needed; add aui which is</pre>

<h3>Modified Paths</h3>
<ul>
<li><a
href="#brancheswxruby2wxwidgets_282rakerakemswinrb">branches/wxruby2/wxwidgets_282/rake/rakemswin.rb</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="brancheswxruby2wxwidgets_282rakerakemswinrb"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/rake/rakemswin.rb (974 => 975)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/rake/rakemswin.rb&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-04-28
23:07:04 UTC (rev 974)
+++
branches/wxruby2/wxwidgets_282/rake/rakemswin.rb&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-04-28
23:07:38 UTC (rev 975)
</span><span class="lines">@@ -37,23 +37,27 @@
</span><span class="cx">
$WXLIBDIR=File.join("#$WXDIR","lib","vc_lib")
</span><span class="cx">
$INCTEMP=File.join("#$WXDIR","lib","vc_lib","msw#{$POSTFIX}")
</span><span class="cx"> 
</span><del>-$wx_libs = 
File.join("#$WXLIBDIR","wxbase28#{$POSTFIX}.lib")
-$wx_libs +=
File.join("#$WXLIBDIR","wxbase28#{$POSTFIX}_net.lib")
-$wx_libs +=
File.join("#$WXLIBDIR","wxbase28#{$POSTFIX}_odbc.lib")
-$wx_libs +=
File.join("#$WXLIBDIR","wxbase28#{$POSTFIX}_xml.lib")
-$wx_libs +=
File.join("#$WXLIBDIR","wxmsw28#{$POSTFIX}_adv.lib")
-$wx_libs +=
File.join("#$WXLIBDIR","wxmsw28#{$POSTFIX}_core.lib")
-$wx_libs +=
File.join("#$WXLIBDIR","wxmsw28#{$POSTFIX}_dbgrid.lib")
-$wx_libs +=
File.join("#$WXLIBDIR","wxmsw28#{$POSTFIX}_html.lib")
-$wx_libs +=
File.join("#$WXLIBDIR","wxmsw28#{$POSTFIX}_media.lib")
-$wx_libs +=
File.join("#$WXLIBDIR","wxmsw28#{$POSTFIX}_xrc.lib")
-$wx_libs +=
File.join("#$WXLIBDIR","wxexpat#{$DEBUGPOSTFIX}.lib")
-$wx_libs +=
File.join("#$WXLIBDIR","wxjpeg#{$DEBUGPOSTFIX}.lib")
-$wx_libs +=
File.join("#$WXLIBDIR","wxpng#{$DEBUGPOSTFIX}.lib")
-$wx_libs +=
File.join("#$WXLIBDIR","wxregex#{$POSTFIX}.lib")
-$wx_libs +=
File.join("#$WXLIBDIR","wxtiff#{$DEBUGPOSTFIX}.lib")
-$wx_libs +=
File.join("#$WXLIBDIR","wxzlib#{$DEBUGPOSTFIX}.lib")
</del><ins>+# wxWidgets libraries that should be linked into wxRuby
+# odbc and db_table not required by wxruby
+windows_libs = %W|wxbase#{$WXVERSION}#{$POSTFIX}
+                  wxbase#{$WXVERSION}#{$POSTFIX}_net 
+                  wxbase#{$WXVERSION}#{$POSTFIX}_xml
+                  wxmsw#{$WXVERSION}#{$POSTFIX}_adv
+                  wxmsw#{$WXVERSION}#{$POSTFIX}_core
+                  wxmsw#{$WXVERSION}#{$POSTFIX}_html
+                  wxmsw#{$WXVERSION}#{$POSTFIX}_media
+                  wxmsw#{$WXVERSION}#{$POSTFIX}_xrc
+                  wxmsw#{$WXVERSION}#{$POSTFIX}_aui
+                  wxexpat#{$DEBUGPOSTFIX}
+                  wxjpeg#{$DEBUGPOSTFIX}
+                  wxpng#{$DEBUGPOSTFIX}
+                  wxtiff#{$DEBUGPOSTFIX}
+                  wxzlib#{$DEBUGPOSTFIX}
+                  wxregex#{$POSTFIX}|
</ins><span class="cx"> 
</span><ins>+windows_libs.map! { | lib | File.join($WXLIBDIR,
"#{lib}.lib") }
+$wx_libs = windows_libs.join('' '')
+
</ins><span class="cx"> $wx_cppflags = [
</span><span class="cx">     "-I#$WXINC",
"-D__WXMSW__",
</span><span class="cx">     "-I#$INCTEMP", 
</span></span></pre>
</div>
</div>

</body>
</html>

Seemingly Similar Threads

Search for more possibly parallel threads

wxruby development - Apr 2007 - [975] branches/wxruby2/wxwidgets_282/rake/rakemswin.rb: Correct spacing for link command; remove odbc and db_table which aren''t

[Wxruby-development] [975] branches/wxruby2/wxwidgets_282/rake/rakemswin.rb: Correct spacing for link command; remove odbc and db_table which aren''t

Seemingly Similar Threads

Wisdom of the Ancients