From 5ccef9778cb2108301835f01dc7c9e180760fc93 Mon Sep 17 00:00:00 2001 From: kristianduske Date: Mon, 28 Mar 2011 10:04:08 +0000 Subject: [PATCH] Launcher window is now centered and will launch Quake when Return key is pressed. Enabled PPC builds. All OS X builds are without music support for now. git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@432 af15c1b1-3010-417e-b628-4374ebc0bcbd --- .../English.lproj/Launcher.nib/designable.nib | 33 +- .../Launcher.nib/keyedobjects.nib | Bin 30331 -> 30322 bytes MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser | 840 ++++++++++++------ .../kristian.perspectivev3 | 165 ++-- MacOSX/QuakeSpasm.xcodeproj/project.pbxproj | 147 ++- 5 files changed, 779 insertions(+), 406 deletions(-) diff --git a/MacOSX/English.lproj/Launcher.nib/designable.nib b/MacOSX/English.lproj/Launcher.nib/designable.nib index 94188388..1cc87c8e 100644 --- a/MacOSX/English.lproj/Launcher.nib/designable.nib +++ b/MacOSX/English.lproj/Launcher.nib/designable.nib @@ -2,31 +2,26 @@ 1040 - 10F569 - 788 - 1038.29 - 461.00 + 10J567 + 823 + 1038.35 + 462.00 com.apple.InterfaceBuilder.CocoaPlugin - 788 + 823 YES - + YES com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + YES @@ -800,7 +795,7 @@ -2038284033 129 - + DQ 200 25 @@ -1038,7 +1033,7 @@ -2038284033 129 - + Gw 200 25 @@ -1636,7 +1631,9 @@ YES 0 - + + YES + @@ -2876,9 +2873,9 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{560, 464}, {511, 251}} + {{888, 364}, {511, 251}} com.apple.InterfaceBuilder.CocoaPlugin - {{560, 464}, {511, 251}} + {{888, 364}, {511, 251}} {{412, 523}, {516, 280}} com.apple.InterfaceBuilder.CocoaPlugin diff --git a/MacOSX/English.lproj/Launcher.nib/keyedobjects.nib b/MacOSX/English.lproj/Launcher.nib/keyedobjects.nib index f57a5f0c8318518fce3595e391fefd15248e7872..6383d9b9c28b68c4906a3029137c90faacccbdd9 100644 GIT binary patch delta 19722 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%0DaRt^Tym}@2bZRSHXSeSz^X1~K; z1Eh=qFr2-P@gDnq_6O_@tozKZ@K-2DVV4A%NMJQ2XoS;AFb9K_Wci>eLd`^M`CPc`Io`#5K4Rk|OKphEokZ5g6$-Dp9EWw z8=#V<($LskPumpQOJRS4whmZ1>?!Paww8q?qCpfnXh#CfeUYWFVQ+Wkf=6sr;IO+2 z9A}!bgJ(`Nt3SPvs2DY>F9KS}KHvmGE`w&a>|-vMapkLLE;GB@fm7PnFuJj&v;75F z>=W#-oLFM^Y4#Zec8);Z3L5kxqj1KFdEFj3mjbCFcC!J6^4g9rFv{zZ9v7amN6m&+L~yuuIL=x-qG06*?}epUGrP^12n&7 zU0~Vov;IUD=TJzSW9G_!^n9Dbe$0Ntw6OJb=)joA#jM28XQtHfbI~(>}&z{5{iyUhddkuRX zvywTEIg_2wY(ysNFj-_sC>yPyt>{=UH#3Pn2&I}I;0-!PZbac09)Ty|RrmuP?oY!DFDBtN4#muK4mOZNmmtSPb?V1X z5+46+o`8COYe{QEv#6Z<7)2e<+pymXW)6IWrhiCEqI`?@jvSCovsBP z(trP%^qm8tXHM{62CxwUG&y3417XYmgn+h`{vD1u+c>DP?H2qV#PvZEY;~D2N_790 z{AX0S7BTzdv{CQ8#|10tjk=q9 zm==J{+~3aSpwkg75%U46-cYfU&QfzIpB!G+4W7ZV=K zRj{^p*&{az5sob7h-(E@1^(L}U-`cf?xb7IO=Tr5?1s%kuqXi@cfq3i=-;r%D(O8N znrs_akH|)K^}CMxa=?qpHgOA3?d!_w+)@<3=8@oQ2R>c({Tu!(vjx>qEsh0>xE7>Z z#$whq_AmydOUzPKg2Ju;VcOh*UA-;s@Z5%O({}c^)K{8N(+ez`+sGY`D)TN1>1kms z3C=kwyxW_?vz7S`O|7&526D&H(Jc(#v7*@4BkXf0a3^Ai9sA)G!)n_a>P^k<9rV5) z2`-_1IJE7_wR2$&5m;PN)!xviYZy}7+0@aV=RDxi)X=tyOLC`Bn=|Bg=f%fSjen_M!JJ=#?J9h!9W(DzuvEWl(4H z0ZWHq_tHxtA|KM%papf92y6whXcZgw8rncawF8ZS?*lTX-9q2W*3)z|cc9uqid@Oj zdK{+vm}!n42)P$>+=UQFpWD!nKM88+<^@@=1RChJ10_mdx=%ojQ6oA@vF%4H!uR01Ol8T-HOjP1|2#_X_vH^nH;wlaZ#r)VZzgXR?`7U>-W=Xs*4w;Sc=LI$Qa>59 zaQqmRn4g6+_|&NUU~fhs?;7u0-gVv$-c8;u-fiA@)Uy0gYDa!(APK%F!95b(C&2>} zpo;TH5z=(RHMU4jMHj?SzZV7vqr-fTD;%erq!lA; z+d4#j8=FV8%P4J;kk_v(j8o$aLdAj3LpUP(03BMR`{0YLe|K+2WmjmaoW6l!D4h2M zrrTnAD|2vdo2-QhruLKvP${M1{@y(|YiYR+d&n1ogP2Cm)E!hQ1Q- zo(QgFSzIZK96)c7iyY_uY6!oIj@pjKI+5c&scSc%vKNXyZQAy6&2=Jl6scuQJ2kW< z9WP6z7F39-9}2vvvqIMN}g`))4gOc)w`W9J5Qe2|Nd5ocr+S6AU9^B&! zv?dZJs%vUTpp!SUip01?s<fdvjhNgzP4w1I0Nk(}WMN**Hudt^~oaffiO+KZa?ZZSaJgF0^$6|?H#^N-EqQ>UN zk&WXUsOlnNiq)~6RA1lNfq;67fu4q=x10+~ovn_etC3OLD}<^Z_(`Z)?Ll^4Ck@q; zk-Vmc+BOk=2^CfnK=rAVQj<#s)L-R_plWmkOjOnCBHl%fqwp#yPVuLX zMtP!=x=<#iF82+jE|1 zASkPUfQlxH8G-50n0PUWWshPWMzA4>O=i_Ic(y_E^SZ<~VFW zdkSV_HnK#(F2njWuV6*kKx`~Fny~{LhA(3&(Re!ytHkGk;aCkW#_};UL(0s->d_&$ z24)zl0xN(5+k?Hvc#pLi)3Ym_qj9ViRcd3{Z)4?XQoRL9e-wKOR*0tHE3rDPlkqp} z0yY$tl9$;ZU}ac4>oO`vXWCKuxPiG9+lL0>$5@^0IjkzI1?!77(p4#Q5txUKWC2zV zn&|(@p22z-Gch2$9Szdo!3MEMVrUf3ZpPZM!E6iGfmzx0m=P;w&jdfS%NRc}lQ4)1 z)O<9V_d@mUBo=`U!0hbz@yV6yih-c>OTqm42{Ln=p9vig=pMPPtHGu@6m&k>5jJTO}atB z=_+w12>|?yp17;vPxKgkv*Y0bh>rfFak?F3(DQdSJwl%Z&!c)S6+Kvh4rsm)ucISd zXk;#>C*%rvhb|^hp^7#L)qVTvK|X;>N4k)7cTD2z=$aE{?H%w-diZ zwieJc5A*{RucD_dP`A2~-h!y#hqe=bfNqZZ8Og5{O{1nc=C5(^7wCazBk(nJ6?)_X z?MqxihY8E!caDKs4Gck#WITqu9Q7_5>?bSc}1fWBJW9U3J@d|N}_=1Qb&JoiEID@!KToK?bqC@}=5CsD8E3u!r zPXrLJ3cw=*-PKCWB#sHdJi<;K65t%-h5+mlfR%)a_(^~R;)DSFCIBZ1vjF@o0E>vb z0?>d;4J|dO-vL3N&sv`G12OS z2D$XtU&Li%0r4YIE&#s}>BLb1Xc2(gF~pYw@I(Lx2tbqU8a7wRobiA zR@7+jW}jkzi#8Je;jlT893>}{qeH{w{+ywlah#VpD>xr=c5-%e_M&HyzTh0;9OIne zoaCJ0oabEPT;*Kj+~C~i+~wTk{J{AYJ(tAda=3i@sU)s~o59WDn$SZ?4cu048+r_B zB6k*dK6fE^Id=umi%0OhsT0+)_AH*3r{fuU1-v3&DX)TO=Jn^gd%U~S zJ;^=AUFDwYp6;%3&vMUm*Sj0tP44yXE$(C87rB4tzTf@0`;Q*L!_&jxBf>-M5#=HE zkb5XR;ysieX&xCKIuCwRi62t6`uB5&k>%JJm+}M^Q1iA^jzV&%JUu1cRkm7uJ`=F^Fz;%Jhym$ z;d#RItmikL-+JEgyzlv==bv6IFApz)m$#R%m(WY@mF$({W%Mfb>hD$W)$G;jMSAV_ zI^uQS>$cZpK8r8lhwz2`FusT%$(Qh>`BJ`|ui(e?mHZ@r3P01%&*tayb^HeYP<|tS z1izWz%5UR$@F(%@{FnK2`1APl`LFR`=Wpe2CeB_)xG>@Uh?%!Dhi$!FIt;!RLZ=fL7g4|;#$eZ>2i_e~#`kDCwQM_~8y@$vHs@Cot>@k#Zm_8I6i$Y-!mz0Xje zMxPNrBYj@-`O4?I&jX()z5?H9-xObiZ@zDtui3Z1uhqBOx5l^Dx6ZfTx50O)?{MD{ zz9W6#@?G!yx$hz0uY521-thgw_YXgwpTN(@FVHX8FVrv0PvjTrC-IB&llv+B(){#( zcB7xkuh6gDug0(0uhp;3ufuPm-#ouXe(U@`^xNUL%Wt>eUcWPbcl{pu{pFAQd;0tP z2l|KmNBE2Vqx_5gOZ}_-E&l!et^U>iHU9PfL;Q#NxA;%>f8T$D|0e%W{kQmU_22Hl z(|@o3e*c61$Nj(c|K9(%04#tTAP5Ky5C%ls1JVPG0p@_ZfZ+k{0c60ufK36P1Z)oY zEMQx}&VbJY_5|z;xD@Cc7#Y|nP#u^Ps1Gy-ngR<0ivmjm%K|F`s{$>7g9BRvM+LSA zb_PxkoDoO`E(lx{_;%phz|RBs2VM%i8F(*<8RQ-$4T=j&2uch}4(b!64$28C3#tgJ z3bGFjstsxmY7LqkG$Uwk(88eYK|6wW1?>*n8+0J(P|)F^qd_-={elC6LxZD&<-v;J z_+VvlQgBMJDmXPbJy;u@7d$q2e(>_(HNhK$4+kF&J|27``0L;0B z4jCIVK4fCZtdJEUCqqt$TnM=yax>(1$eobyL+*$C5b{&V<4{g$U}$h?XlPVuOsFz6 zJ5(219NI6mHnc8ucxY2-b7*VmtWYX+Y3RG5YeUzEeh~U$=trTOLO%^X5_&B3MCjL{ zr$Wz!UJbQh3%wQkUFcmQTgVaegziF5AtCe@`U(}oB4N4EBJ3};3af=R!dhXSaFXyX z;acHl;cnqx;Zfmn;a9?w!qdXD!VAKy!fV32!Y9Jt!kA$pVUn=)u)MJTVRd0mVVz-9 z!)Asp4Er$bqp(e3pN4G-+Zwh#Y-iY!up42w!oIVI-3_}J_8{!Xu%E)&;oNZdaL;gl zxF9?@JTyE!JR&?RJUd()o)@kU&krvM?;BnhJ}rD!_`LA>;je|i9=aS_{H$=!taLvDgq)OQK%?dlpsnI=|t6{iK3T8i$%*s8$=sLAB#Q_Z5ACB zT^3yx*{_MNi*AY@N1$nP1UJGh!XqLiLJ<)kp^Qk1NQp2+SR(pISR<+iJz;*W^GBL0aKMMg!&M9Ly# zBjX~IB2yw&k;ce^$i9&!k>!y?BgaKfiCh}FB66cWa%be{k$WQdMc$0O8+kACLFA8- zKSll$`84u(F+gQYopG)JYm7LnU)03nhys%OuMsD?m%OTa-tXSCmhbUsOPpBq};8E-F1r6O|Q}6IB~EBx+dH@TjJ!=BW0l&Zsd_ zGoxOPdNXQm)cU9oqCSlJD(Xzsxu^?Km+VnjqOM2XjJh55eboJ^-=f*k+-SFGkLbAQ zr0A4rRdi}}dUSTQHaai5G`b?XD!N~Eb98I;_~;qYv!Z85&y8Le{eJX@=#9}IM{kMV z8ofRGc=YY)$I(AW{~G;UOmIwiOhk-0CMqT-MiCPqqm0qU=wb{prkK7lmY9~9i7}I7 z>@a3Z%&M68V%EjHAG0B5W6Y;9TVl4x9Emv|b0X$s%$b;bF%M!MOED=fWl1?wsWeWS zAWf7eOZ!OEr5b6Lv{Gu8)=HbDt}9G}(07Y}s7deAzPD z+p?9icVwGndt_hAzLK4iot6D6`&0Ih9LO1RmfTJ5A?M4(ijifxV^726TJAa-f& zve@OZD`Hp2u8mzEyCHUa?5^0|vHN0A#-5J75&JOqQS8sLPZdFmFhztytcX&?C=`l# zMWP~Ak)tS5lqkv-Rf^Ge#RSD<1yoE?yrg(pF-P%=Vu50j;w{B`#RrOwicN~siVKR% zimQriiW`bMitiN<;@sjq;=Zy8Q(wN8b2_;ExsfE_4pO>tK!$huZ=$ve5{OS0!@fYH+#$SuS z5q~HC`}l|Pf5rckfG4mLq7z~h;uDk!NeL+lX$ct#SqZj;NeM3}%t?49;kATK37;iw zOW2XHD`9uSfrLW|M-omXTu!)aPq>%xL&8r=Z)JcoSQ)AeQ${GGl~QG_GF6$O%v9!} zXWL4Y4azoUhjNT^yz&j@+sakSca-lc*D5zCH!3$NFDm~`iv7 zM@jBUfl0wh!X#0WKB*w7D5)f=EU7Z7f08w6VA6=B=A_o7_N3`aE0Q)OZA{vfv^nWg z(zT=;Nw<=|OZq-}BF?mGt$mG`K&g3!4C(Pl!lZkDRWZRr+k|7S<3d5T`7A~_N5$1xtww{5 zsM4siR5_|Vl|f}v^;H$C%2bsqi)w(XS~W;DSk<5!sv53pQnjesR2?e&7}Yq{MAc*! zshXymu9~Tut(vQPMfIwRQY}<1QN5{Ju3D*Dt$J6rR`tGWgKDE{lWMbSt7^Mymuk0a zpX#9M3)K4b?5x9o6@$2dW=cKdGLmeo_6V`a|`%8dKwH zmYS<}Q+uer)B?4S+TX4YQirI8YLPlpEm23SrE0l4POVfYsZ-Qyb(%UuovF@I=c)B- zquQkIt1eNOsVme~>VE10>T2~Mb)9;Mx>4P%9-|(oo~E9mepx+NJzq_!KU42i?^f?s z?^hpEA5(v+{#t!06-#BMa#P(>JyQ9pzN!AHL8&pR_P(jbsTHZ_)PAW0Qma!3r`D$q zO@*mbQfH;Umil_?lGHa-m#6MdJ&^iE>XFoAsV7oTr=Cr{ka{!qQR*M5f2A?gIB9Na zo@uJIoV2{O{Ir6!qO_8)3&DVNc%i( zZ`y&hFVc>t9k-`_m3AuaY})y>-_rg_`z!6Abdb(SXQuPgJ<`L|^V7}g{nD$`Ytn1e z>(U$2holcpZ%S`YeA$D{ zk^W}}$Y5kBG7>UUGSnGq85tRw8QB@S3`2$~qdcQFqb;K|!#*Zse8!}V=@~OKW@WsQ zu|MNr#?g%987DHn&N!8EI^#^n#f-}umWHG8(0FMGjkm^EU4uc}4TOW}#+@<_*m<&2r6Z%^J;G%?8a*%|XoW*)|*+&vsPxk zll5NK`mEDgXR|J4UCp|dbv^55)~&4DS@*IYWcz0aW(%`L*^$|j?C9*6Y-x5}c0zW) zY-{$Q?7HkB*~7AjXE$Y!%5Kjdo&8ewhU|~BH)n6n-jTg4dw2HU>_gdyvyWxp$bOXl zNA_Pi>>OT>M-D&7+n$q=la-T~W5_Y(6y_A=l;l+Am~;B)49j^n=k=T=IdA4H&smYP zD(9V?bvf_ne3-L2=RnSvIbY?R$vK~MNz2r7v>sZ%)?4eV_16Y!h1zg!q&87IKwGUH ztZmQ^(+<}*X`8j}+D`3Q?Ii6S?E>v0?VH-=+LhX)+Ap=IwDvRF^V*Br%i62j8`@ji zJK7($f9G;?dAZ)XzPSOp!MUNi`dnjf-`wKd(%kag%G|14bFMYFI=3lzLGI$*Wx309 zSLUwHU6cD>?gzOa=6;;JCHG+NiQKPqPv@S^y`Fn7_wPKAhv&KHMd!uk<>yu94a}>{ zYszcU4blzP)$4}Zb;ETdb*;KKU8ioWZh~&I4(g`prs<~ZX6k0^=IZ9_DBS|xV%<{R zGTn0BO5HoUcXexZ>vbRKHtIgseWKf<+os#8+pXKH+pjyMJFGjV`%?Fn?v(C~?wsy| z?y~Nx?pxhW-EG|+-S@itx*v6qbWe1@>VDV#sryF{^h~{-t>^09^d5S?UZD5Y`|AVs z!TL~rxIRKJ)<@~3`dEFuUa3#k_tB^7GxVAIY`s>Wr`PNA^@aK(eTlwYU#U0i`{}Lv zf%-xE!TNgr5dARyaD9`$S>LK}(|78}>L=(Y>q-5~`nd*Zm|~b_m|=L?FxN2O@S0(P z-LTm3hT$#43d3r{8pB${dcy|8M#CnVJU0An_|@>c;V;8KM%>6Wa*S?952Ke+VDvHi8-t9Y z#xP@qQDTfS%8UwQyfM+3Z0uu9HQLjS8e_ImYt$JH#(ZO;vDjE@EH_pfEyn&vo3X}N zYpgR4F%B~hH#QlYjjhIZ<7nep<9OpFquodvry8dlXBlT3=NexzzGhrtTx48ge8c#b z@onQO;~L{ycjoWT-n?fGZ&&*xvt zzncGT{>}XF^1si2kpD3MasDs)zvcg#|Bnebu}oZ(yUEKWF!`DSOu;6hNn{e6qD?ZB z!jxc2GW9W~nlemTCap!wAfrKV-3w@s@|YfNjYE3HDm)24H#i>524Yo;5f+orpw z`=%dFk0}1A0DGT;+JcS(STL{Por2>9j|#mCrG@&!;=*BtQw!%79xJ@v7xYc-Thw<> z-+6u4^*z@2+aj#Uy+~Z7FDfq@UNom@UeQNI2a6sSGm1II{9<{rvAD3fzIaG+XYthH zSBl>$-c@|9_;CrhB&W-s+CO(`8z+FUxmbZzP8 z(l1MImHt@<$`obUW&O*BmD$VYmMt$^QMS44NZHx4U&;f@mF3Ch*78y1Z`VFyVRBH%JRyF%I3;Zl^vC%EA5q2 zDqpIcQ8~Yos(M&ue^m8z)vr~*RsB)*SJgje+{`j_&2DB-Gv6#Q`aq zoMnP#lErQzEz>MBEVC@LEpsieSYER%uq?K`VR_54!m`@3#`2-%Lb{Rb$PzYOOk}!D_M=T8peD)-r3Q)okr= zwOXsKgRFzC_12+OcxQ-xwsoHMRqN~4h1SK^H>}I7%dIP{tE_9RYpw5FH&{Qieq!Bh z-D=%#-D%xz-D^EyJ!Cy%J!U;&J!w5-J#W2ay=wi|dc%6#ddGUt`oQ|5^(X6N>(ADw z)<3L&+b|n$W7^m@p3TGNWg~3fHeXwSE!Y-n3%5nuB(@lv+-_6Y;%$kx6r0+XZp*Y~ z+q5>F&0x#771;XPifyH~3R{(}pUr9;Xsfl=+lJa2ZB4co+bCPRZK7?m4ceyIrrBoL zX4z)j=Gk7gQMQG)CAK$h%WW%d@7Uh6t+#z(+i2Tl+id&Hw#~M~_PK43ZJ+Ic?U3!T r?U?P1E##c-yzN`tP1`No54N9dk8FQbyH)e6BdVjTQz+}`aG?4>u-fnp delta 19748 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 All-In-One Notifications - + + + XCObserverAutoDisconnectKey + + XCObserverDefintionKey + + XCObserverFactoryKey + XCPerspectivesSpecificationIdentifier + XCObserverGUIDKey + XCObserverProjectIdentifier + XCObserverNotificationKey + PBXStatusBuildStateMessageNotification + XCObserverTargetKey + XCMainBuildResultsModuleGUID + XCObserverTriggerKey + awakenModuleWithObserver: + XCObserverValidationKey + + + OpenEditors PerspectiveWidths - 1440 - 1440 + 2560 + 2560 Perspectives @@ -216,6 +235,7 @@ debugger-enable-breakpoints buildOrClean go + build-and-go com.apple.ide.PBXToolbarStopButton get-info NSToolbarFlexibleSpaceItem @@ -256,7 +276,7 @@ PBXSmartGroupTreeModuleColumnWidthsKey - 215 + 318 PBXSmartGroupTreeModuleColumnsKey_v4 @@ -270,7 +290,10 @@ 29B97314FDCFA39411CA2CEA 48243B060D33ED0A00C29F8F 483A77D80D2EE8C500CB2E4C + 483A77D90D2EE8D400CB2E4C 483A77DC0D2EE8ED00CB2E4C + 483A77E10D2EE91000CB2E4C + 483A77DB0D2EE8E600CB2E4C 29B97317FDCFA39411CA2CEA 4890A5EA1205D6ED00452753 29B97323FDCFA39411CA2CEA @@ -285,13 +308,11 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 3 - 1 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {215, 697}} + {{0, 0}, {318, 1237}} PBXTopSmartGroupGIDs @@ -301,32 +322,30 @@ GeometryConfiguration Frame - {{0, 0}, {232, 715}} + {{0, 0}, {335, 1255}} GroupTreeTableConfiguration MainColumn - 215 + 318 RubberWindowFrame - 0 122 1440 756 0 0 1440 878 + 0 122 2560 1296 0 0 2560 1418 Module PBXSmartGroupTreeModule Proportion - 232pt + 335pt Dock - BecomeActive - ContentConfiguration PBXProjectModuleGUID 4890A4C11205A7AE00452753 PBXProjectModuleLabel - SDLMain.m + snd_wave.c PBXSplitModuleInNavigatorKey Split0 @@ -334,11 +353,11 @@ PBXProjectModuleGUID 4890A4C21205A7AE00452753 PBXProjectModuleLabel - SDLMain.m + snd_wave.c _historyCapacity 0 bookmark - 48E31D7412474E88003972E7 + 48692BC71340908800A0F098 history 4890A5541205C1FF00452753 @@ -350,29 +369,14 @@ 4861FA9212144B5300BBDEF1 48028D3E12156C670018F743 480BB3A212174CA900939117 - 480BB3A312174CA900939117 48F89F411243A3BA00EB68FB 48F89F611243AD1E00EB68FB - 48ADA34D12448DC4008DB120 - 48ADA38012448FF7008DB120 - 48ADA38A124490B6008DB120 - 48ADA38F12449225008DB120 - 48ADA39012449225008DB120 - 48ADA3A812449534008DB120 - 48ADA3A912449534008DB120 - 48ADA3C612449625008DB120 - 48ADA3CC12449638008DB120 - 48ADA3D512449A40008DB120 - 48ADA3DA12449A40008DB120 - 48ADA3EB12449C30008DB120 4845112E1246256F0017BBC3 484511D8124628040017BBC3 484511D9124628040017BBC3 48BB6B20124731BE001239EF 48BB6B21124731BE001239EF - 48BB6B22124731BE001239EF 48BB6B4D12473484001239EF - 48E31D6612474E88003972E7 48E31D6712474E88003972E7 48E31D6812474E88003972E7 48E31D6912474E88003972E7 @@ -382,10 +386,35 @@ 48E31D6D12474E88003972E7 48E31D6E12474E88003972E7 48E31D6F12474E88003972E7 - 48E31D7012474E88003972E7 48E31D7112474E88003972E7 48E31D7212474E88003972E7 - 48E31D7312474E88003972E7 + 4818B0A612D5B9CD006DD66E + 4818B0A712D5B9CD006DD66E + 4818B0BB12D5BA41006DD66E + 4818B0BC12D5BA41006DD66E + 4818B0BE12D5BA41006DD66E + 4818B0C112D5BA41006DD66E + 4818B0C212D5BA41006DD66E + 4818B0CF12D5BCB4006DD66E + 48E953FF12D5CEF800BDC2B8 + 4801945A12E44A310004210F + 4801945B12E44A310004210F + 4801945C12E44A310004210F + 4866F6FD12EB7F02009B345C + 4866F6FE12EB7F02009B345C + 4866F6FF12EB7F02009B345C + 48DB946212F03F2000FB5483 + 48DB947612F03F9500FB5483 + 48DB947712F03F9500FB5483 + 48B5A12C131EDC840043FBD9 + 48B5A12D131EDC840043FBD9 + 48B5A14A131EDF5E0043FBD9 + 48B5A14B131EDF5E0043FBD9 + 48AE78AD133485A400821DBA + 486929FD133F92EE00A0F098 + 48692AC9133FDEBF00A0F098 + 48692B6913408B3E00A0F098 + 48692BBB13408E8200A0F098 SplitCount @@ -399,18 +428,18 @@ GeometryConfiguration Frame - {{0, 0}, {1203, 470}} + {{0, 0}, {2220, 899}} RubberWindowFrame - 0 122 1440 756 0 0 1440 878 + 0 122 2560 1296 0 0 2560 1418 Module PBXNavigatorGroup Proportion - 470pt + 899pt Proportion - 240pt + 351pt Tabs @@ -424,7 +453,7 @@ GeometryConfiguration Frame - {{10, 27}, {1203, 213}} + {{10, 27}, {2220, 324}} Module XCDetailModule @@ -440,7 +469,7 @@ GeometryConfiguration Frame - {{10, 27}, {1469, 165}} + {{10, 27}, {2323, 736}} Module PBXProjectFindModule @@ -473,14 +502,14 @@ XCBuildResultsTrigger_Collapse 1021 XCBuildResultsTrigger_Open - 1011 + 1010 GeometryConfiguration Frame - {{10, 27}, {1203, 213}} + {{10, 27}, {2220, 324}} RubberWindowFrame - 0 122 1440 756 0 0 1440 878 + 0 122 2560 1296 0 0 2560 1418 Module PBXBuildResultsModule @@ -489,7 +518,7 @@ Proportion - 1203pt + 2220pt Name @@ -508,11 +537,11 @@ TableOfContents - 48E31D4D12474671003972E7 + 48692BB613408E7300A0F098 1CA23ED40692098700951B8B - 48E31D4E12474671003972E7 + 48692BB713408E7300A0F098 4890A4C11205A7AE00452753 - 48E31D4F12474671003972E7 + 48692BB813408E7300A0F098 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -564,12 +593,12 @@ GeometryConfiguration Frame - {{0, 0}, {1440, 116}} + {{0, 0}, {2560, 187}} Module PBXDebugCLIModule Proportion - 116pt + 187pt ContentConfiguration @@ -588,8 +617,8 @@ yes sizes - {{0, 0}, {718, 180}} - {{718, 0}, {722, 180}} + {{0, 0}, {1275, 329}} + {{1275, 0}, {1285, 329}} VerticalSplitView @@ -604,8 +633,8 @@ yes sizes - {{0, 0}, {1440, 180}} - {{0, 180}, {1440, 414}} + {{0, 0}, {2560, 329}} + {{0, 329}, {2560, 734}} @@ -625,26 +654,26 @@ DebugSTDIOWindowFrame {{200, 200}, {500, 300}} Frame - {{0, 121}, {1440, 594}} + {{0, 192}, {2560, 1063}} PBXDebugSessionStackFrameViewKey DebugVariablesTableConfiguration Name - 120 + 148 Value - 85 + 112 Summary - 492 + 1000 Frame - {{718, 0}, {722, 180}} + {{1275, 0}, {1285, 329}} Module PBXDebugSessionModule Proportion - 594pt + 1063pt Name @@ -662,14 +691,14 @@ TableOfContents - 48E31D7512474E88003972E7 + 48692ADD133FDF1400A0F098 1CCC7628064C1048000F2A68 1CCC7629064C1048000F2A68 - 48E31D7612474E88003972E7 - 48E31D7712474E88003972E7 - 48E31D7812474E88003972E7 - 48E31D7912474E88003972E7 - 48E31D7A12474E88003972E7 + 48692ADE133FDF1400A0F098 + 48692ADF133FDF1400A0F098 + 48692AE0133FDF1400A0F098 + 48692AE1133FDF1400A0F098 + 4890A4C11205A7AE00452753 ToolbarConfigUserDefaultsMinorVersion 2 @@ -686,7 +715,7 @@ StatusbarIsVisible TimeStamp - 0.0 + 322998408.400415 ToolbarConfigUserDefaultsMinorVersion 2 ToolbarDisplayMode @@ -703,12 +732,10 @@ 5 WindowOrderList - 48E31D7B12474E88003972E7 - 48E31D7C12474E88003972E7 - /Users/kristian/Dropbox/Dokumente/Code/XCode/QuakeSpasm/MacOSX/QuakeSpasm.xcodeproj + /Users/kristian/Documents/Code/XCode/QuakeSpasm/MacOSX/QuakeSpasm.xcodeproj WindowString - 0 122 1440 756 0 0 1440 878 + 0 122 2560 1296 0 0 2560 1418 WindowToolsV3 diff --git a/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj b/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj index 50cd53e6..2fb4dcbe 100644 --- a/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj +++ b/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 44; objects = { /* Begin PBXAggregateTarget section */ @@ -29,6 +29,11 @@ 002F3C6109D0951E00EBEB88 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F3C6009D0951E00EBEB88 /* GLUT.framework */; }; 48134A1812102F400015BF15 /* net_bsd.c in Sources */ = {isa = PBXBuildFile; fileRef = 48134A1412102F400015BF15 /* net_bsd.c */; }; 48134A1912102F400015BF15 /* net_udp.c in Sources */ = {isa = PBXBuildFile; fileRef = 48134A1612102F400015BF15 /* net_udp.c */; }; + 4818B0A312D5B9AE006DD66E /* bgmusic.c in Sources */ = {isa = PBXBuildFile; fileRef = 4818B0A112D5B9AE006DD66E /* bgmusic.c */; }; + 4818B0AE12D5B9ED006DD66E /* snd_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 4818B0AC12D5B9ED006DD66E /* snd_codec.c */; }; + 4818B0B612D5BA1A006DD66E /* snd_mp3.c in Sources */ = {isa = PBXBuildFile; fileRef = 4818B0B012D5BA1A006DD66E /* snd_mp3.c */; }; + 4818B0B712D5BA1A006DD66E /* snd_vorbis.c in Sources */ = {isa = PBXBuildFile; fileRef = 4818B0B212D5BA1A006DD66E /* snd_vorbis.c */; }; + 4818B0B812D5BA1A006DD66E /* snd_wave.c in Sources */ = {isa = PBXBuildFile; fileRef = 4818B0B412D5BA1A006DD66E /* snd_wave.c */; }; 48243B140D33F01A00C29F8F /* main_sdl.c in Sources */ = {isa = PBXBuildFile; fileRef = 48243B130D33F01A00C29F8F /* main_sdl.c */; }; 48348943120595B1004184BC /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48348942120595B1004184BC /* Sparkle.framework */; }; 4834894F120595E9004184BC /* Sparkle.framework in Copy Frameworks into .app bundle */ = {isa = PBXBuildFile; fileRef = 48348942120595B1004184BC /* Sparkle.framework */; }; @@ -145,6 +150,17 @@ 48134A1512102F400015BF15 /* net_defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = net_defs.h; path = ../Quake/net_defs.h; sourceTree = SOURCE_ROOT; }; 48134A1612102F400015BF15 /* net_udp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = net_udp.c; path = ../Quake/net_udp.c; sourceTree = SOURCE_ROOT; }; 48134A1712102F400015BF15 /* net_udp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = net_udp.h; path = ../Quake/net_udp.h; sourceTree = SOURCE_ROOT; }; + 4818B0A112D5B9AE006DD66E /* bgmusic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bgmusic.c; path = ../Quake/bgmusic.c; sourceTree = SOURCE_ROOT; }; + 4818B0A212D5B9AE006DD66E /* bgmusic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bgmusic.h; path = ../Quake/bgmusic.h; sourceTree = SOURCE_ROOT; }; + 4818B0AC12D5B9ED006DD66E /* snd_codec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_codec.c; path = ../Quake/snd_codec.c; sourceTree = SOURCE_ROOT; }; + 4818B0AD12D5B9ED006DD66E /* snd_codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = snd_codec.h; path = ../Quake/snd_codec.h; sourceTree = SOURCE_ROOT; }; + 4818B0AF12D5BA1A006DD66E /* snd_codeci.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = snd_codeci.h; path = ../Quake/snd_codeci.h; sourceTree = SOURCE_ROOT; }; + 4818B0B012D5BA1A006DD66E /* snd_mp3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_mp3.c; path = ../Quake/snd_mp3.c; sourceTree = SOURCE_ROOT; }; + 4818B0B112D5BA1A006DD66E /* snd_mp3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = snd_mp3.h; path = ../Quake/snd_mp3.h; sourceTree = SOURCE_ROOT; }; + 4818B0B212D5BA1A006DD66E /* snd_vorbis.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_vorbis.c; path = ../Quake/snd_vorbis.c; sourceTree = SOURCE_ROOT; }; + 4818B0B312D5BA1A006DD66E /* snd_vorbis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = snd_vorbis.h; path = ../Quake/snd_vorbis.h; sourceTree = SOURCE_ROOT; }; + 4818B0B412D5BA1A006DD66E /* snd_wave.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_wave.c; path = ../Quake/snd_wave.c; sourceTree = SOURCE_ROOT; }; + 4818B0B512D5BA1A006DD66E /* snd_wave.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = snd_wave.h; path = ../Quake/snd_wave.h; sourceTree = SOURCE_ROOT; }; 48243B130D33F01A00C29F8F /* main_sdl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main_sdl.c; path = ../Quake/main_sdl.c; sourceTree = SOURCE_ROOT; }; 48305B530D8AF8EC00A29C24 /* conback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = conback.h; path = ../Quake/conback.h; sourceTree = SOURCE_ROOT; }; 48348942120595B1004184BC /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = ""; }; @@ -462,11 +478,16 @@ isa = PBXGroup; children = ( 483A77E10D2EE91000CB2E4C /* Headers */, + 4818B0A112D5B9AE006DD66E /* bgmusic.c */, 483A78500D2EEAC300CB2E4C /* cd_sdl.c */, + 4818B0AC12D5B9ED006DD66E /* snd_codec.c */, 486577C80D31A22A00E7920A /* snd_dma.c */, 486577C90D31A22A00E7920A /* snd_mem.c */, 486577CA0D31A22A00E7920A /* snd_mix.c */, + 4818B0B012D5BA1A006DD66E /* snd_mp3.c */, 483A78540D2EEAC300CB2E4C /* snd_sdl.c */, + 4818B0B212D5BA1A006DD66E /* snd_vorbis.c */, + 4818B0B412D5BA1A006DD66E /* snd_wave.c */, ); name = Sound; sourceTree = ""; @@ -546,8 +567,14 @@ 483A77E10D2EE91000CB2E4C /* Headers */ = { isa = PBXGroup; children = ( + 4818B0A212D5B9AE006DD66E /* bgmusic.h */, 483A77FD0D2EE9BD00CB2E4C /* cdaudio.h */, 483A77FE0D2EE9BD00CB2E4C /* q_sound.h */, + 4818B0AD12D5B9ED006DD66E /* snd_codec.h */, + 4818B0AF12D5BA1A006DD66E /* snd_codeci.h */, + 4818B0B112D5BA1A006DD66E /* snd_mp3.h */, + 4818B0B312D5BA1A006DD66E /* snd_vorbis.h */, + 4818B0B512D5BA1A006DD66E /* snd_wave.h */, ); name = Headers; sourceTree = ""; @@ -613,7 +640,14 @@ isa = PBXProject; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "QuakeSpasm" */; compatibilityVersion = "Xcode 2.4"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 29B97314FDCFA39411CA2CEA /* QuakeSpasm */; projectDirPath = ""; projectRoot = ""; @@ -729,6 +763,11 @@ 4890A5D21205D55700452753 /* UpdateButton.m in Sources */, 48134A1812102F400015BF15 /* net_bsd.c in Sources */, 48134A1912102F400015BF15 /* net_udp.c in Sources */, + 4818B0A312D5B9AE006DD66E /* bgmusic.c in Sources */, + 4818B0AE12D5B9ED006DD66E /* snd_codec.c in Sources */, + 4818B0B612D5BA1A006DD66E /* snd_mp3.c in Sources */, + 4818B0B712D5BA1A006DD66E /* snd_vorbis.c in Sources */, + 4818B0B812D5BA1A006DD66E /* snd_wave.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -768,9 +807,7 @@ COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "USE_QS_CONBACK", - ); + GCC_PREPROCESSOR_DEFINITIONS = USE_QS_CONBACK; PRODUCT_NAME = Distribution; }; name = Debug; @@ -781,9 +818,7 @@ COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "USE_QS_CONBACK", - ); + GCC_PREPROCESSOR_DEFINITIONS = USE_QS_CONBACK; PRODUCT_NAME = Distribution; ZERO_LINK = NO; }; @@ -792,8 +827,10 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; + ARCHS = ( + x86_64, + i386, + ); COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -804,9 +841,7 @@ GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "USE_QS_CONBACK", - ); + GCC_PREPROCESSOR_DEFINITIONS = USE_QS_CONBACK; HEADER_SEARCH_PATHS = ( /Library/Frameworks/SDL.framework/Headers, /Library/Frameworks/SDL_net.framework/Headers, @@ -814,6 +849,10 @@ ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + /opt/local/lib, + ); PRODUCT_NAME = QuakeSpasm; WRAPPER_EXTENSION = app; ZERO_LINK = YES; @@ -823,8 +862,11 @@ C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; + ARCHS = ( + i386, + x86_64, + ppc, + ); FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", @@ -832,9 +874,7 @@ FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; - GCC_PREPROCESSOR_DEFINITIONS = ( - "USE_QS_CONBACK", - ); + GCC_PREPROCESSOR_DEFINITIONS = USE_QS_CONBACK; HEADER_SEARCH_PATHS = ( /Library/Frameworks/SDL.framework/Headers, /Library/Frameworks/SDL_net.framework/Headers, @@ -842,6 +882,28 @@ ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + /opt/local/lib, + ); + OTHER_CFLAGS = ""; + "OTHER_CFLAGS[arch=ppc64]" = ( + "-arch", + ppc, + ); + "OTHER_CFLAGS[arch=ppc]" = ( + "-arch", + ppc, + ); + OTHER_LDFLAGS = ""; + "OTHER_LDFLAGS[arch=ppc64]" = ( + "-arch", + ppc, + ); + "OTHER_LDFLAGS[arch=ppc]" = ( + "-arch", + ppc, + ); PRODUCT_NAME = QuakeSpasm; WRAPPER_EXTENSION = app; }; @@ -850,48 +912,75 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; + ARCHS = ( + i386, + x86_64, + ); FRAMEWORK_SEARCH_PATHS = ( /Library/Frameworks, "$(FRAMEWORK_SEARCH_PATHS)", ); GCC_MODEL_TUNING = G3; + GCC_PREPROCESSOR_DEFINITIONS = USE_QS_CONBACK; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "USE_QS_CONBACK", - ); HEADER_SEARCH_PATHS = ( + /opt/local/include, /Library/Frameworks/SDL.framework/Headers, "$(HEADER_SEARCH_PATHS)", ); + LIBRARY_SEARCH_PATHS = /opt/local/lib; + ONLY_ACTIVE_ARCH = NO; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; + VALID_ARCHS = "i386 x86_64"; }; name = Debug; }; C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; + ARCHS = ( + x86_64, + i386, + ppc, + ); FRAMEWORK_SEARCH_PATHS = ( /Library/Frameworks, "$(FRAMEWORK_SEARCH_PATHS)", ); GCC_MODEL_TUNING = G3; + GCC_PREPROCESSOR_DEFINITIONS = USE_QS_CONBACK; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "USE_QS_CONBACK", - ); HEADER_SEARCH_PATHS = ( + /opt/local/include, /Library/Frameworks/SDL.framework/Headers, "$(HEADER_SEARCH_PATHS)", ); + LIBRARY_SEARCH_PATHS = /opt/local/lib; + ONLY_ACTIVE_ARCH = NO; + OTHER_CFLAGS = ""; + "OTHER_CFLAGS[arch=ppc64]" = ( + "-arch", + ppc, + ); + "OTHER_CFLAGS[arch=ppc]" = ( + "-arch", + ppc, + ); + OTHER_LDFLAGS = ""; + "OTHER_LDFLAGS[arch=ppc64]" = ( + "-arch", + ppc, + ); + "OTHER_LDFLAGS[arch=ppc]" = ( + "-arch", + ppc, + ); PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; + VALID_ARCHS = "i386 x86_64 ppc ppc64 ppc7400 ppc970"; }; name = Release; };