Menu
▾
▴
[cadcdev-svn-commits] [266] tiki: Moving osx/TikiTest to new tree "examples"
|
From: <cad...@li...> - 2005-11-21 22:59: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>[266] tiki: Moving osx/TikiTest to new tree "examples"</= title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>266</dd> <dt>Author</dt> <dd>atani</dd> <dt>Date</dt> <dd>2005-11-21 14:51:39 -0800 (Mon, 21 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>Moving osx/TikiTest to new tree "examples"</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiexamplesTikiTestTikiTestxcodeprojprojectpbxproj">tiki= /examples/TikiTest/TikiTest.xcodeproj/project.pbxproj</a></li> </ul> <h3>Added Paths</h3> <ul> <li>tiki/examples/</li> <li>tiki/examples/TikiTest/</li> <li><a href=3D"#tikiexamplesTikiTestMakefile">tiki/examples/TikiTest/Make= file</a></li> <li><a href=3D"#tikiexamplesTikiTestsrcTikiTestcpp">tiki/examples/TikiTes= t/src/TikiTest.cpp</a></li> </ul> <h3>Removed Paths</h3> <ul> <li>tiki/examples/TikiTest/TikiTest.xcode/</li> <li>tiki/osx/TikiTest/</li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiexamplesTikiTestfromrev262tikiosxTikiTest"></a> <div class=3D"copfile"><h4>Copied: tiki/examples/TikiTest (from rev 262, = tiki/osx/TikiTest) ( =3D> )</h4> <pre class=3D"diff"> <span class=3D"info">Added: tiki/examples/TikiTest/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D </span><del>--- tiki/osx/TikiTest/Makefile 2005-11-21 04:55:17 UTC (rev 2= 62) </del><ins>+++ tiki/examples/TikiTest/Makefile 2005-11-21 22:51:39 UTC (r= ev 266) </ins><span class=3D"lines">@@ -0,0 +1,11 @@ </span><ins>+ +CFLAGS=3D-I../$(TIKI_PLAT)/include -I../include +OBJS =3D $(patsubst %.cpp,%.o,$(wildcard src/*.cpp)) + +all: $(OBJS) + $(CXX) -L../$(TIKI_PLAT) $(OBJS) $(TIKI_BASE_LIBS) -o tikitest + +clean: + -rm -f $(OBJS) tikitest + +include ../$(TIKI_PLAT)/Makefile.rules </ins></pre></div> <a id=3D"tikiexamplesTikiTestMakefile"></a> <div class=3D"propset"><h4>Property changes: tiki/examples/TikiTest/Makef= ile</h4> <pre class=3D"diff"> <span class=3D"cx">Name: svn:executable </span><span class=3D"cx"> + * </span></pre></div> <a id=3D"tikiexamplesTikiTestTikiTestxcodeprojprojectpbxproj"></a> <div class=3D"modfile"><h4>Modified: tiki/examples/TikiTest/TikiTest.xcod= eproj/project.pbxproj (262 =3D> 266)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/osx/TikiTest/TikiTest.xcodeproj/project.pbx= proj 2005-11-21 04:55:17 UTC (rev 262) +++ tiki/examples/TikiTest/TikiTest.xcodeproj/project.pbxproj 2005-11-21 = 22:51:39 UTC (rev 266) </span><span class=3D"lines">@@ -70,7 +70,7 @@ </span><span class=3D"cx"> C47EB69F08366BE4009FA9BA /* testobj.cpp */ =3D= {isa =3D PBXFileReference; fileEncoding =3D 30; lastKnownFileType =3D so= urcecode.cpp.cpp; name =3D testobj.cpp; path =3D src/testobj.cpp; sourceT= ree =3D SOURCE_ROOT; }; </span><span class=3D"cx"> C47EB6A008366BE4009FA9BA /* testobj.h */ =3D= {isa =3D PBXFileReference; fileEncoding =3D 30; lastKnownFileType =3D so= urcecode.c.h; name =3D testobj.h; path =3D src/testobj.h; sourceTree =3D = SOURCE_ROOT; }; </span><span class=3D"cx"> C4B588850794D44D004D22F2 /* test.cpp */ =3D = {isa =3D PBXFileReference; fileEncoding =3D 4; lastKnownFileType =3D sour= cecode.cpp.cpp; name =3D test.cpp; path =3D src/test.cpp; sourceTree =3D = "<group>"; }; </span><del>- C4F50D800799DE840001D0D0 /* Tiki.framework */ =3D {isa =3D= PBXFileReference; lastKnownFileType =3D wrapper.framework; name =3D Tiki= .framework; path =3D ../build/Development/Tiki.framework; sourceTree =3D = SOURCE_ROOT; }; </del><ins>+ C4F50D800799DE840001D0D0 /* Tiki.framework */ =3D {isa =3D = PBXFileReference; lastKnownFileType =3D wrapper.framework; name =3D Tiki.= framework; path =3D ../../osx/build/Development/Tiki.framework; sourceTre= e =3D SOURCE_ROOT; }; </ins><span class=3D"cx"> C4F50ECB0799E1350001D0D0 /* Controller.h */ =3D= {isa =3D PBXFileReference; fileEncoding =3D 30; lastKnownFileType =3D so= urcecode.c.h; name =3D Controller.h; path =3D src/Controller.h; sourceTre= e =3D SOURCE_ROOT; }; </span><span class=3D"cx"> C4F50ECC0799E1350001D0D0 /* Controller.m */ = =3D {isa =3D PBXFileReference; fileEncoding =3D 30; lastKnownFileType =3D= sourcecode.c.objc; name =3D Controller.m; path =3D src/Controller.m; sou= rceTree =3D SOURCE_ROOT; }; </span><span class=3D"cx"> C4F50EEE0799E5B40001D0D0 /* OpenGL.framework= */ =3D {isa =3D PBXFileReference; lastKnownFileType =3D wrapper.framewor= k; name =3D OpenGL.framework; path =3D /System/Library/Frameworks/OpenGL.= framework; sourceTree =3D "<absolute>"; }; </span><span class=3D"lines">@@ -185,7 +185,7 @@ </span><span class=3D"cx"> buildRules =3D ( </span><span class=3D"cx"> ); </span><span class=3D"cx"> buildSettings =3D { </span><del>- FRAMEWORK_SEARCH_PATHS =3D /Users/bard/prj/game/tiki/osx= /build; </del><ins>+ FRAMEWORK_SEARCH_PATHS =3D ../../osx/build; </ins><span class=3D"cx"> GCC_GENERATE_DEBUGGING_SYMBOLS =3D NO; </span><span class=3D"cx"> GCC_PRECOMPILE_PREFIX_HEADER =3D YES; </span><span class=3D"cx"> GCC_PREFIX_HEADER =3D TikiTest_Prefix.pch; </span><span class=3D"lines">@@ -289,7 +289,7 @@ </span><span class=3D"cx"> isa =3D XCBuildConfiguration; </span><span class=3D"cx"> buildSettings =3D { </span><span class=3D"cx"> COPY_PHASE_STRIP =3D NO; </span><del>- FRAMEWORK_SEARCH_PATHS =3D ../build/Development/; </del><ins>+ FRAMEWORK_SEARCH_PATHS =3D ../../osx/build/Development/; </ins><span class=3D"cx"> GCC_DYNAMIC_NO_PIC =3D NO; </span><span class=3D"cx"> GCC_ENABLE_FIX_AND_CONTINUE =3D YES; </span><span class=3D"cx"> GCC_GENERATE_DEBUGGING_SYMBOLS =3D YES; </span><span class=3D"lines">@@ -309,7 +309,7 @@ </span><span class=3D"cx"> isa =3D XCBuildConfiguration; </span><span class=3D"cx"> buildSettings =3D { </span><span class=3D"cx"> COPY_PHASE_STRIP =3D YES; </span><del>- FRAMEWORK_SEARCH_PATHS =3D ../build/Development/; </del><ins>+ FRAMEWORK_SEARCH_PATHS =3D ../../osx/build/Deployment/; </ins><span class=3D"cx"> GCC_ENABLE_FIX_AND_CONTINUE =3D NO; </span><span class=3D"cx"> GCC_GENERATE_DEBUGGING_SYMBOLS =3D NO; </span><span class=3D"cx"> GCC_PRECOMPILE_PREFIX_HEADER =3D YES; </span><span class=3D"lines">@@ -325,7 +325,7 @@ </span><span class=3D"cx"> 64FBB92A092EA33F00427AD0 /* Default */ =3D { </span><span class=3D"cx"> isa =3D XCBuildConfiguration; </span><span class=3D"cx"> buildSettings =3D { </span><del>- FRAMEWORK_SEARCH_PATHS =3D ../build/Development/; </del><ins>+ FRAMEWORK_SEARCH_PATHS =3D ../../osx/build/Development/; </ins><span class=3D"cx"> GCC_GENERATE_DEBUGGING_SYMBOLS =3D NO; </span><span class=3D"cx"> GCC_PRECOMPILE_PREFIX_HEADER =3D YES; </span><span class=3D"cx"> GCC_PREFIX_HEADER =3D TikiTest_Prefix.pch; </span><span class=3D"lines">@@ -341,7 +341,7 @@ </span><span class=3D"cx"> buildSettings =3D { </span><span class=3D"cx"> HEADER_SEARCH_PATHS =3D ( </span><span class=3D"cx"> ../../include, </span><del>- ../include, </del><ins>+ ../../osx/include, </ins><span class=3D"cx"> /sw/include, </span><span class=3D"cx"> ../../3rdparty/boost, </span><span class=3D"cx"> ); </span><span class=3D"lines">@@ -355,7 +355,7 @@ </span><span class=3D"cx"> buildSettings =3D { </span><span class=3D"cx"> HEADER_SEARCH_PATHS =3D ( </span><span class=3D"cx"> ../../include, </span><del>- ../include, </del><ins>+ ../../osx/include, </ins><span class=3D"cx"> /sw/include, </span><span class=3D"cx"> ../../3rdparty/boost, </span><span class=3D"cx"> ); </span><span class=3D"lines">@@ -369,7 +369,7 @@ </span><span class=3D"cx"> buildSettings =3D { </span><span class=3D"cx"> HEADER_SEARCH_PATHS =3D ( </span><span class=3D"cx"> ../../include, </span><del>- ../include, </del><ins>+ ../../osx/include, </ins><span class=3D"cx"> /sw/include, </span><span class=3D"cx"> ../../3rdparty/boost, </span><span class=3D"cx"> ); </span></pre></div> <a id=3D"tikiexamplesTikiTestsrcTikiTestcpp"></a> <div class=3D"addfile"><h4>Added: tiki/examples/TikiTest/src/TikiTest.cpp= (262 =3D> 266)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/osx/TikiTest/src/TikiTest.cpp 2005-11-21 04= :55:17 UTC (rev 262) +++ tiki/examples/TikiTest/src/TikiTest.cpp 2005-11-21 22:51:39 UTC (rev = 266) </span><span class=3D"lines">@@ -0,0 +1,35 @@ </span><ins>+/* + * TikiTest.cpp + * TikiTest + * + * Copyright 2005 Cryptic Allusion, LLC. All rights reserved. + * + */ + +#include "pch.h" + +#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 +static char szAppName[] =3D "TikiTest"; +int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, LPSTR lpC= mdLine, int nCmdShow) +#else +int main(int argc, char *argv[]) +#endif +{ +#if TIKI_PLAT =3D=3D TIKI_OSX + return NSApplicationMain(argc, (const char **)argv); +#endif +#if TIKI_PLAT =3D=3D TIKI_SDL + return tiki_main(argc, argv); +#endif +#if TIKI_PLAT =3D=3D TIKI_WIN32 + return Tiki::DoMain(szAppName, hInst, hPrevInstance, lpCmdLine, nCmdSho= w); +#endif +} </ins><span class=3D"cx">Property changes on: tiki/examples/TikiTest/src/= TikiTest.cpp </span><span class=3D"cx">_______________________________________________= ____________________ </span><span class=3D"cx">Name: svn:executable </span><span class=3D"cx"> + * </span></pre> </div> </div> </body> </html> |
