Menu
▾
▴
[cadcdev-svn-commits] [265] tiki/sdl: Use 3rdparty vs local system libraries
|
From: <cad...@li...> - 2005-11-21 22:59:11
|
<!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>[265] tiki/sdl: Use 3rdparty vs local system libraries</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>265</dd> <dt>Author</dt> <dd>atani</dd> <dt>Date</dt> <dd>2005-11-21 14:51:14 -0800 (Mon, 21 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>Use 3rdparty vs local system libraries</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikisdlMakefile">tiki/sdl/Makefile</a></li> <li><a href=3D"#tikisdlMakefilerules">tiki/sdl/Makefile.rules</a></li> <li><a href=3D"#tikisdlsrcplathidcpp">tiki/sdl/src/plathid.cpp</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikisdlMakefile"></a> <div class=3D"modfile"><h4>Modified: tiki/sdl/Makefile (264 =3D> 265)</h4= > <pre class=3D"diff"> <span class=3D"info">--- tiki/sdl/Makefile 2005-11-21 22:07:01 UTC (rev 2= 64) +++ tiki/sdl/Makefile 2005-11-21 22:51:14 UTC (rev 265) </span><span class=3D"lines">@@ -11,16 +11,45 @@ </span><span class=3D"cx"> BASE_MATH_OBJ=3D$(patsubst %.cpp,%.o,$(wildcar= d ../src/math/*.cpp)) </span><span class=3D"cx"> BASE_THREAD_OBJ=3D$(patsubst %.cpp,%.o,$(wildc= ard ../src/thread/*.cpp)) </span><span class=3D"cx">=20 </span><ins>+JPEG_OBJ=3D$(patsubst %.c,%.o,$(wildcard ../3rdparty/libjpeg= /*.c)) +PNG_OBJ=3D$(patsubst %.c,%.o,$(wildcard ../3rdparty/libpng/*.c)) +ZLIB_OBJ=3D$(patsubst %.c,%.o,$(wildcard ../3rdparty/zlib/*.c)) +OGG_OBJ=3D$(patsubst %.c,%.o,$(wildcard ../3rdparty/libogg/src/*.c)) +VORBIS_OBJ=3D../3rdparty/libvorbis/lib/analysis.o \ + ../3rdparty/libvorbis/lib/bitrate.o \ + ../3rdparty/libvorbis/lib/block.o \ + ../3rdparty/libvorbis/lib/codebook.o \ + ../3rdparty/libvorbis/lib/envelope.o \ + ../3rdparty/libvorbis/lib/floor0.o \ + ../3rdparty/libvorbis/lib/floor1.o \ + ../3rdparty/libvorbis/lib/info.o \ + ../3rdparty/libvorbis/lib/lookup.o \ + ../3rdparty/libvorbis/lib/lpc.o \ + ../3rdparty/libvorbis/lib/lsp.o \ + ../3rdparty/libvorbis/lib/mapping0.o \ + ../3rdparty/libvorbis/lib/mdct.o \ + ../3rdparty/libvorbis/lib/psy.o \ + ../3rdparty/libvorbis/lib/registry.o \ + ../3rdparty/libvorbis/lib/res0.o \ + ../3rdparty/libvorbis/lib/sharedbook.o \ + ../3rdparty/libvorbis/lib/smallft.o \ + ../3rdparty/libvorbis/lib/synthesis.o \ + ../3rdparty/libvorbis/lib/vorbisfile.o \ + ../3rdparty/libvorbis/lib/window.o + </ins><span class=3D"cx"> BASE_OBJS =3D $(BASE_AUDIO_OBJ) $(BASE_BASE_OBJ= ) $(BASE_GL_OBJ) \ </span><span class=3D"cx"> $(BASE_HID_OBJ) $(BASE_IMAGE_OBJ) $(BASE_MATH= _OBJ) \ </span><span class=3D"cx"> $(BASE_THREAD_OBJ) </span><ins>+=09 +THIRD_PARTY_OBJS =3D $(JPEG_OBJ) $(OGG_OBJ) $(VORBIS_OBJ) $(PNG_OBJ) $(Z= LIB_OBJ) </ins><span class=3D"cx">=20 </span><span class=3D"cx"> CFLAGS=3D-I../include -I$(CURDIR)/include -g </span><ins>+CFLAGS+=3D-I../3rdparty/libogg/include -I../3rdparty/libvorb= is/include -I../3rdparty/libvorbis/lib </ins><span class=3D"cx">=20 </span><span class=3D"cx"> SUBDIRS=3Dsrc </span><span class=3D"cx">=20 </span><del>-all: subdirs $(BASE_OBJS) - $(AR) ru libtiki.a $(BASE_OBJS) </del><ins>+all: subdirs $(BASE_OBJS) $(THIRD_PARTY_OBJS) + $(AR) ru libtiki.a $(BASE_OBJS) $(THIRD_PARTY_OBJS) </ins><span class=3D"cx"> $(MAKE) tikitest_all </span><span class=3D"cx">=20 </span><span class=3D"cx"> clean: tikitest_clean clean_subdirs </span></pre></div> <a id=3D"tikisdlMakefilerules"></a> <div class=3D"modfile"><h4>Modified: tiki/sdl/Makefile.rules (264 =3D> 26= 5)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/sdl/Makefile.rules 2005-11-21 22:07:01 UTC = (rev 264) +++ tiki/sdl/Makefile.rules 2005-11-21 22:51:14 UTC (rev 265) </span><span class=3D"lines">@@ -20,4 +20,4 @@ </span><span class=3D"cx"> $(patsubst %, _clean_dir_%, $(SUBDIRS)): </span><span class=3D"cx"> @$(MAKE) -C $(patsubst _clean_dir_%, %, $@) c= lean </span><span class=3D"cx">=20 </span><del>-TIKI_BASE_LIBS=3D-ltiki -lopenal -lalut -ljpeg -logg -lvorbi= s -lvorbisfile -lpng -lz -lGL -lGLU -lpthread -lSDL </del><ins>+TIKI_BASE_LIBS=3D-ltiki -lopenal -lalut -lGL -lGLU -lpthread = -lSDL </ins></pre></div> <a id=3D"tikisdlsrcplathidcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/sdl/src/plathid.cpp (264 =3D> 2= 65)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/sdl/src/plathid.cpp 2005-11-21 22:07:01 UTC= (rev 264) +++ tiki/sdl/src/plathid.cpp 2005-11-21 22:51:14 UTC (rev 265) </span><span class=3D"lines">@@ -92,6 +92,14 @@ </span><span class=3D"cx"> SDL_WaitThread(keybd_thread, NULL); </span><span class=3D"cx"> SDL_WaitThread(wm_thread, NULL); </span><span class=3D"cx">=20 </span><ins>+ Event evtKB(Event::EvtDetach); + evtKB.dev =3D SDLkb; + sendEvent(evtKB); + + Event evtMouse(Event::EvtDetach); + evtMouse.dev =3D SDLMouse; + sendEvent(evtMouse); + </ins><span class=3D"cx"> SDL_Quit(); </span><span class=3D"cx"> } </span><span class=3D"cx">=20 </span></pre> </div> </div> </body> </html> |
