thr3ads.net - wxruby development - [Wxruby-development] [884] branches/wxruby2/wxwidgets_282/rake/rakemswin.rb: Compile flag fixes for Windows/Wx 2.8 (Artur Kuptel) [Mar 2007]

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

nobody at rubyforge.org

2007-Mar-17 18:40 UTC

[Wxruby-development] [884] branches/wxruby2/wxwidgets_282/rake/rakemswin.rb: Compile flag fixes for Windows/Wx 2.8 (Artur Kuptel)

<!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>[884] branches/wxruby2/wxwidgets_282/rake/rakemswin.rb: Compile
flag fixes for Windows/Wx 2.8 (Artur Kuptel)</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>884</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-03-17 14:40:25 -0400 (Sat, 17 Mar
2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>Compile flag fixes for Windows/Wx 2.8 (Artur Kuptel)</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 (883 => 884)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/rake/rakemswin.rb&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-03-17
18:39:40 UTC (rev 883)
+++
branches/wxruby2/wxwidgets_282/rake/rakemswin.rb&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-03-17
18:40:25 UTC (rev 884)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> 
</span><span class="cx"> # native Windows - requires a
static build of wxWindows
</span><span class="cx">
$WXDIR=ENV[''WXWIN'']
</span><del>-$WXVERSION = ''26''
</del><ins>+$WXVERSION = ''28''
</ins><span class="cx"> 
</span><span class="cx"> if $debug_build
</span><span class="cx">    
$DEBUGPOSTFIX=''d''
</span><span class="lines">@@ -32,29 +32,28 @@
</span><span class="cx"> $POSTFIX = $UNICODEPOSTFIX +
$DEBUGPOSTFIX
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+$WXSRC=File.join("#$WXDIR","src","msw")
+$WXINC=File.join("#$WXDIR","include")
+$WXLIBDIR=File.join("#$WXDIR","lib","vc_lib")
+$INCTEMP=File.join("#$WXDIR","lib","vc_lib","msw#{$POSTFIX}")
</ins><span class="cx"> 
</span><del>-$WXSRC="#$WXDIR/src/msw"
-$WXINC="#$WXDIR/include"
-$WXLIBDIR="#$WXDIR/lib/vc_lib"
-$INCTEMP="#$WXDIR/lib/vc_lib/msw#{$POSTFIX}"
</del><ins>+$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")
</ins><span class="cx"> 
</span><del>-$wx_libs = 
"#$WXLIBDIR/wxbase26#{$POSTFIX}.lib"
-$wx_libs += " #$WXLIBDIR/wxbase26#{$POSTFIX}_net.lib"
-$wx_libs += " #$WXLIBDIR/wxbase26#{$POSTFIX}_odbc.lib"
-$wx_libs += " #$WXLIBDIR/wxbase26#{$POSTFIX}_xml.lib"
-$wx_libs += " #$WXLIBDIR/wxmsw26#{$POSTFIX}_adv.lib"
-$wx_libs += " #$WXLIBDIR/wxmsw26#{$POSTFIX}_core.lib"
-$wx_libs += " #$WXLIBDIR/wxmsw26#{$POSTFIX}_dbgrid.lib"
-$wx_libs += " #$WXLIBDIR/wxmsw26#{$POSTFIX}_html.lib"
-$wx_libs += " #$WXLIBDIR/wxmsw26#{$POSTFIX}_media.lib"
-$wx_libs += " #$WXLIBDIR/wxmsw26#{$POSTFIX}_xrc.lib"
-$wx_libs += " #$WXLIBDIR/wxexpat#{$DEBUGPOSTFIX}.lib"
-$wx_libs += " #$WXLIBDIR/wxjpeg#{$DEBUGPOSTFIX}.lib"
-$wx_libs += " #$WXLIBDIR/wxpng#{$DEBUGPOSTFIX}.lib"
-$wx_libs += " #$WXLIBDIR/wxregex#{$DEBUGPOSTFIX}.lib"
-$wx_libs += " #$WXLIBDIR/wxtiff#{$DEBUGPOSTFIX}.lib"
-$wx_libs += " #$WXLIBDIR/wxzlib#{$DEBUGPOSTFIX}.lib"   
-
</del><span class="cx"> $wx_cppflags = [
</span><span class="cx">     "-I#$WXINC",
"-D__WXMSW__",
</span><span class="cx">     "-I#$INCTEMP", 
</span><span class="lines">@@ -71,7 +70,8 @@
</span><span class="cx"> if $debug_build
</span><span class="cx">    
$ruby_cppflags.gsub!(/-MD/," /MDd");
</span><span class="cx">    
$ruby_cppflags.gsub!(/-O[A-Za-z0-9-]*/, "/Od")
</span><del>-    $ruby_cppflags += " -D_DEBUG -D__WXDEBUG__
-DWXDEBUG=1 "
</del><ins>+    $ruby_cppflags += " -Zi -D_DEBUG -D__WXDEBUG__
-DWXDEBUG=1 "
+    $extra_ldflags += "/DEBUG"
</ins><span class="cx"> else
</span><span class="cx">     $ruby_cppflags += "
-DNDEBUG "
</span><span class="cx"> end
</span></span></pre>
</div>
</div>

</body>
</html>

Apparently Analagous Threads

Search for more possibly parallel threads

wxruby development - Mar 2007 - [884] branches/wxruby2/wxwidgets_282/rake/rakemswin.rb: Compile flag fixes for Windows/Wx 2.8 (Artur Kuptel)

[Wxruby-development] [884] branches/wxruby2/wxwidgets_282/rake/rakemswin.rb: Compile flag fixes for Windows/Wx 2.8 (Artur Kuptel)

Apparently Analagous Threads

Wisdom of the Ancients