Menu
▾
▴
[cadcdev-svn-commits] [281] tiki/src/image: Win32 build fixes
|
From: <cad...@li...> - 2005-11-27 01:02:42
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns=3D"http://www.w3.org/1999/xhtml"> <head><style type=3D"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 { 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; fo= nt-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padd= ing: 6px; } #msg ul, pre { overflow: auto; } #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:aut= o;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patc= h .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>[281] tiki/src/image: Win32 build fixes</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>281</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2005-11-26 16:54:24 -0800 (Sat, 26 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>Win32 build fixes</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiincludeTikisoundh">tiki/include/Tiki/sound.h</a></li> <li><a href=3D"#tikiincludeTikistreamh">tiki/include/Tiki/stream.h</a></l= i> <li><a href=3D"#tikisrcimageloadjpgcpp">tiki/src/image/loadjpg.cpp</a></l= i> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiincludeTikisoundh"></a> <div class=3D"modfile"><h4>Modified: tiki/include/Tiki/sound.h (280 =3D> = 281)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/include/Tiki/sound.h 2005-11-22 16:53:45 UT= C (rev 280) +++ tiki/include/Tiki/sound.h 2005-11-27 00:54:24 UTC (rev 281) </span><span class=3D"lines">@@ -18,7 +18,10 @@ </span><span class=3D"cx"> #if TIKI_PLAT =3D=3D TIKI_SDL </span><span class=3D"cx"> # include <AL/al.h> </span><span class=3D"cx"> #endif </span><ins>+#if TIKI_PLAT =3D=3D TIKI_WIN32 +# include <al.h> </ins><span class=3D"cx"> #endif </span><ins>+#endif </ins><span class=3D"cx">=20 </span><span class=3D"cx"> namespace Tiki { </span><span class=3D"cx"> namespace Audio { </span></pre></div> <a id=3D"tikiincludeTikistreamh"></a> <div class=3D"modfile"><h4>Modified: tiki/include/Tiki/stream.h (280 =3D>= 281)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/include/Tiki/stream.h 2005-11-22 16:53:45 U= TC (rev 280) +++ tiki/include/Tiki/stream.h 2005-11-27 00:54:24 UTC (rev 281) </span><span class=3D"lines">@@ -15,6 +15,9 @@ </span><span class=3D"cx"> #if TIKI_PLAT =3D=3D TIKI_SDL </span><span class=3D"cx"> # include <AL/al.h> </span><span class=3D"cx"> #endif // TIKI_PLAT=3D=3DTIKI_SDL </span><ins>+#if TIKI_PLAT =3D=3D TIKI_WIN32 +# include <al.h> +#endif // TIKI_PLAT=3D=3DTIKI_WIN32 </ins><span class=3D"cx">=20 </span><span class=3D"cx"> #include "Tiki/refcnt.h" </span><span class=3D"cx"> #include "Tiki/list.h" </span></pre></div> <a id=3D"tikisrcimageloadjpgcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/src/image/loadjpg.cpp (280 =3D>= 281)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/src/image/loadjpg.cpp 2005-11-22 16:53:45 U= TC (rev 280) +++ tiki/src/image/loadjpg.cpp 2005-11-27 00:54:24 UTC (rev 281) </span><span class=3D"lines">@@ -10,16 +10,21 @@ </span><span class=3D"cx"> */ </span><span class=3D"cx">=20 </span><span class=3D"cx"> #include "pch.h" </span><ins>+#include "Tiki/tiki.h" </ins><span class=3D"cx"> #include "Tiki/image.h" </span><span class=3D"cx"> #include "Tiki/imgjpg.h" </span><span class=3D"cx"> #include <assert.h> </span><ins>+#if TIKI_PLAT !=3D TIKI_WIN32 </ins><span class=3D"cx"> __BEGIN_DECLS </span><ins>+#endif </ins><span class=3D"cx"> #if TIKI_PLAT !=3D TIKI_DC </span><span class=3D"cx"> #include <jpeglib.h> </span><span class=3D"cx"> #else </span><span class=3D"cx"> #include <jpeg/jpeglib.h> </span><span class=3D"cx"> #endif </span><ins>+#if TIKI_PLAT !=3D TIKI_WIN32 </ins><span class=3D"cx"> __END_DECLS </span><ins>+#endif </ins><span class=3D"cx">=20 </span><span class=3D"cx"> /* Load a JPEG into a KOS PIImage */ </span><span class=3D"cx"> bool Tiki::jpgToImage(const string & filen= ame, int scale, RefPtr<Image> & img) { </span></pre> </div> </div> </body> </html> |
