Menu
▾
▴
[cadcdev-svn-commits] [270] tiki/examples/TikiTest/src/TikiTest.cpp: Remove OSX lines, OSX uses main.m instead
|
From: <cad...@li...> - 2005-11-21 23:14:56
|
<!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>[270] tiki/examples/TikiTest/src/TikiTest.cpp: Remove OSX lines, O= SX uses main.m instead</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>270</dd> <dt>Author</dt> <dd>atani</dd> <dt>Date</dt> <dd>2005-11-21 15:07:01 -0800 (Mon, 21 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>Remove OSX lines, OSX uses main.m instead</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiexamplesTikiTestsrcTikiTestcpp">tiki/examples/TikiTes= t/src/TikiTest.cpp</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiexamplesTikiTestsrcTikiTestcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/examples/TikiTest/src/TikiTest.= cpp (269 =3D> 270)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/examples/TikiTest/src/TikiTest.cpp 2005-11-= 21 22:53:30 UTC (rev 269) +++ tiki/examples/TikiTest/src/TikiTest.cpp 2005-11-21 23:07:01 UTC (rev = 270) </span><span class=3D"lines">@@ -6,33 +6,19 @@ </span><span class=3D"cx"> * </span><span class=3D"cx"> */ </span><span class=3D"cx">=20 </span><del>-#include "pch.h" </del><ins>+#include <Tiki/Tiki.h> </ins><span class=3D"cx">=20 </span><del>-#if TIKI_PLAT =3D=3D TIKI_OSX -#include <Cocoa/Cocoa.h> -#endif - -#if TIKI_PLAT =3D=3D TIKI_SDL -extern "C" int tiki_main(int argc, char *argv[]); -#endif - -#if TIKI_PLAT =3D=3D TIKI_OSX </del><ins>+#if TIKI_PLAT =3D=3D TIKI_WIN32 </ins><span class=3D"cx"> static char szAppName[] =3D "TikiTest"= ;; </span><span class=3D"cx"> int APIENTRY WinMain(HINSTANCE hInst, HINSTANC= E hPrevInstance, LPSTR lpCmdLine, int nCmdShow) </span><span class=3D"cx"> #else </span><ins>+extern "C" int tiki_main(int argc, char *argv[]); </ins><span class=3D"cx"> int main(int argc, char *argv[]) </span><span class=3D"cx"> #endif </span><span class=3D"cx"> { </span><del>-#if TIKI_PLAT =3D=3D TIKI_OSX - return NSApplicationMain(argc, (const char **)argv); -#endif -#if TIKI_PLAT =3D=3D TIKI_SDL </del><ins>+#if TIKI_PLAT !=3D TIKI_WIN32 </ins><span class=3D"cx"> return tiki_main(argc, argv); </span><del>-#endif -#if TIKI_PLAT =3D=3D TIKI_DC - return tiki_main(argc, argv); -#endif -#if TIKI_PLAT =3D=3D TIKI_WIN32 </del><ins>+#else </ins><span class=3D"cx"> return Tiki::DoMain(szAppName, hInst, hPrevIns= tance, lpCmdLine, nCmdShow); </span><span class=3D"cx"> #endif </span><span class=3D"cx"> } </span></pre> </div> </div> </body> </html> |
