From a5fc3d9fec5e931ee03d45ec03db7e762544d552 Mon Sep 17 00:00:00 2001 From: Franck Charlet Date: Thu, 10 Mar 2011 23:38:38 +0000 Subject: [PATCH] new OSX version should be ready git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1753 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- src/.DS_Store | Bin 21508 -> 24580 bytes src/Makefile | 7 ++++--- src/SDLMain.m | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/.DS_Store b/src/.DS_Store index 6f0fb88d3ef427d0597c2df68b9fad8040d488a5..800eb5af569ded69ea499608d60d1d381a2406b5 100644 GIT binary patch literal 24580 zcmeHOJC7Vi5U#yl_H{nvBf}EXMnqtYML>Yi$+CF~Bukb+BH+Ax58uMx?Xh3~w#Jr>={e2x-fmS_)mPQkT|F~I zRJ(Yz`8?4Y5w&r0d*&3r#y>r@=W!MX|IVj()bULX=QlVT;3qny4`_>S&;gzEs2{#B zmY@=!(49K8Lt{t(o#Ed0crY3d@auV^pTE9!7N3ZkI2-@WIY9H6(2i-J)@cKH?7Ti2 zZ{+;}D%yka7qV{fpZRs^X+Znp^jDTT1ji5>q9;$YC(*;=nzf`aVM&*SKtdoPkP!GE zBEWMuj`niarfWhVA&?N5BEb2fhm+g2ygkWUNgcTG@|l0>*76dgma*geUQV}`wd!c6Y??5$rz1-`2h~k z{TQi(_}s*Sn61XQ?}n$J0D6YFLkB+Jpv2G$2ONiyhJ9 z-u@9sZ-D0k=wUDvJ+vP~dQ^?3w%GO|(C7n|Fc#X6mOiBOZR5jZ@%b(!mE--}9G-xj zdQT(zvk~cL+cgismDS=!edCraZLdrcJBS$m~@r>Ygp4)dyqU#sslR`Jm z6OdEaJROX~zGUGN%me|gna^Qli2Zu(cIYZyqBrR+NMb48?z~t(n`75q)reM_V;OdA zVw4|X_n*<;5;=htfRiD@T*e-WWt~@Akis+V5q#stm_(&U*rhgoGggfy<--=RdPU|! zzV~4CmoegMqNxLYJNb<@*^%)Ph+45yXG53T^evibYL1G1pt1oEb3XKRXG`mD_Ou*E zhG?WY+K|DS@CZ`m&Ws-uj)W$twj@J)+OU@#+%>JyLwxj%<0D>c^Sl*UWwO={O}#8S z_tDD%ZNsw@+V#<4JQv_Hnu!%!R%em*6g{DA32>NI%uV`ADw!s(i`;D!FB!_V>_VN;s4QG5BYBM%t?~=Q{1xDEn z*;T8GWo7p|a>IToH*g+wbSUAfh(iau93d|s%1m35qv$0kM|m7phr6-$vh6YCkJ&m@ z^~tKiVI6bYHvV`XKP>f+)@gwrEKZS6cC?@i?+x(WA6z-ow(^sqt|+?=B=)eM#PeBT z%~a=YagByY@5zsg5!;`M5XlzWdXK)M{1v(^_H*5m>M6~9eCNG90=U5aS`idxaFrxZ0 zqImUp!_WE>M_Pjbho?i_9+%%^D3-Jb0~{4~SOE^%y17^fb7dRIzTy$B%M4Dd)8C(Q zSSQYHvVqQ2Ud8C^Pp#}DlkK}Y zOBVY{=@8^GdfZ&O9Tjn>LwW%9Pk_78r?HNn&nkVE4R6p>jC?~^OJ@w%vCOEv&lk?+ z*3)zOH;1F*S<9YaL90Dzjeh7I!t_k^S3ZJ%<@N2Vqt7~BfnRvtF+}{GgH9XX^O?_q z>koy)0zDWn#jljFOSJ5ltJ=&Nx`l#-*=NY_67e9Qju<+8u;RY3i4^gQ zjueNsqWx{TAI)#j;D_y2_`T@nHbfkzX8TI15yOBZ2V{%)OTB~NfY zoY!#j!E`750S7+w&)mwZc=(6!p}&@YcO`GHamxqjPO_GJ;s1plt+1obZoxmW7Xbrx zi>%mnRaahXdwZUdcUH@L4$X18ikQLatuW$NH=(-Qtd>*#k5J`TOZm=&j+Fmy{m+9h y9SMPiKtdoPkPt`+Bm@!y34w$_LLecK5J(6l1QG%XfrLOpAR&+tNC-Sq2>c5KeyB(Q literal 21508 zcmeHNO>bLO5WO!={MkaXV2NaQut89XB~nzSMU_ATb%BJ0f@3?4!Hr$VZkz>DHn4^z zKY%4afE{Je59pE~P_bfN&YAa|%$<832Q~;gFYJO^b_m!#s+Q?zlm2Xd=&-} z{_W7aKN|NAM&ko~4(H)Bg!%l19Qe-3UKbl(J=FUdDqXbfGhA) zE5PxggBP#6)%Co*%Fuxmm+<_YOL#f(o=bJ!>r~g>>Uv&Y@d=KigyLF4i|P@hDB-x@ zsqA*E>v?%C;h~Vo@KZ%Dswb2}qT_x?%tNtTUj6I}xB{sH_i!us?0pnJdv823&)$tN z!gKx^p4q42BqY!3#VfG?Sv{*;d*i?O)!5&H{~>l0rigMHZigP;&2Ua42{RpOHPXc7 ze!}K!ien2gxqHz^M&0lPxh2sgFTDqm!ODL>}6(9fvuzo=HWW;F`3mRKjDGPab92GBb^;A<`u5 zXH|gSD{YNmVe^|}(-ObzY0P?v|B?(u<#iYnhjqEBF?F!-hKHz@Ophk3t+y1b*xLGr zHj#Bxe4~Dm!3^g#1F%_xFfoMDH;PdUG1zN4B2lGG|C0L9ZAQ!jJ%lxK!2Xpo6O7g= zhcVoUiLz-(oX3d5@g>P#>~${IKIi{;llwyQeuPLX^QgVQ29t?X`$1t!UNdAd!e2Iz z+Mie0XZ+VcQTD8p1uCTUe>;u9RT_wY`+=mWVlKz_Kmd|6NhaWVM?t| z5rrdgq7^e~G*u?n-uP!8k$tJv(tk!PX0ZlgVlW4Tn1VZNmh;sx&4R49bmcaoYm6{4 z$SOj#E)bmak5_5671#SR$|c6eA+sE2gjVNBdX#1(Z8A`8vgD>QnK%uNX`&yN>xWgE zQ31^?MVJ`m74_X_co6o&hcerjD+z;OyR1PxGP62ZMTj=?=%bf&UZ>iF+=wd7^aznh z<=AOd9Z@(p%+WSUPm!wB3dh#Qx3u9?)rNIwbx-Dl%-qjvj7GTFI^#PU-^k=h`bVaR zOB?9XFt#?ng^9LiRZO5t550opVWJB&HKV6R*chma2+=?cj)ZeWp*q$c>O}T6SPf)^ zPS{8*Y2CH0@k{2-*P}M#%7*h+X6->8BkQ(s?xG$~E>?sIAL@Axlwrm!B2@D_Yl`rO z%B6`X7WPT5Do%6xNcLw}A`B~0KqJy8Iltoy{Cx%Z#eZF%v*)PP6*FQ~-LZA1P9y8K z^1YA#Fv;}?_S6W~1Zs{xK9f;9Ga|4Dg|DL?WDz-L8nI(y>|^XX#2?4o?6ak?)E?@v zTYfa+`|pa`(q@6Qwk_CUoUq0^4(nU87{Imh7)am>A68WO2O65M5|8PbN}j~ zS}WujY5%S80otN_!K#aDvAaa96rDxeVDg!8-aS*9Y#Y=<`i<;LNe$)dQ!`zQ?+-`I z-wAb4oj7(nh!6JR(-00{gz(3AC7)-<{4nCPA3g?)a(``s)|r5v(M~ExGpa*tYByOm zVs6}5`N!7QH&{m2O<7M4vFA5uKgqNT>sPl*Jwh1&QoGu^25VONigmWx*SoaM_>FkC zF8nTgQ?i<5pWXOTDZ^aH7!}Ijer3javR{KRyx3L|ubPawLqthNor2nHKH4_tSKHRb z??mRQ)H7JzC{(7gweig?BkN80&g}A0zpS0{$Gk4>6brp$fJadF6#Vv&-~ZoT{rf*L z@{=pz3j9A6C^q*V?A<|b)pzSjmK(U!!RrgWX!8qRJn&v1IMIav$k*|>%4!kUcX*!% z-tSh|^YV&2IR1qn0{Hyz^S}H|tSy0aw5ka0OfeSHKl;1zZ7Fz!h)> rTme_W6>tSy0aw5ka0OfeSHKl;1zZ7Fz!h)>Tme_W6>tUqdkXvo9aGw! diff --git a/src/Makefile b/src/Makefile index 79cc11ba..325880b8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -33,9 +33,10 @@ STRIP = strip ### Specific to build MAC OS X universal binaries on Tiger ### -### (may need to be changed on your OS) ### +### (may need to be changed or removed depedning on the OSX version) ### MACOSX_SYSROOT = /Developer/SDKs/MacOSX10.4u.sdk +MACOSX_ARCH = -arch ppc -arch i386 ### PLATFORM DETECTION AND CONFIGURATION ### @@ -95,9 +96,9 @@ else # Where the SDL frameworks are located FWDIR = /Library/Frameworks BIN = ../bin/grafx2 - SDLCOPT = -arch ppc -arch i386 -I$(FWDIR)/SDL.framework/Headers -I$(FWDIR)/SDL_image.framework/Headers -I$(FWDIR)/SDL_ttf.framework/Headers -D_THREAD_SAFE + SDLCOPT = $(MACOSX_ARCH) -I$(FWDIR)/SDL.framework/Headers -I$(FWDIR)/SDL_image.framework/Headers -I$(FWDIR)/SDL_ttf.framework/Headers -D_THREAD_SAFE #-framework SDL_ttf - SDLLOPT = -isysroot $(MACOSX_SYSROOT) -arch ppc -arch i386 -L/usr/lib -framework SDL -framework SDL_image -framework Cocoa -framework Carbon -framework OpenGL + SDLLOPT = -isysroot $(MACOSX_SYSROOT) $(MACOSX_ARCH) -L/usr/lib -framework SDL -framework SDL_image -framework Cocoa -framework Carbon -framework OpenGL COPT = -D_DARWIN_C_SOURCE -D__macosx__ -D__linux__ -W -Wall -Wdeclaration-after-statement -O$(OPTIM) -std=c99 -c -g $(SDLCOPT) $(TTFCOPT) -I/usr/X11/include LOPT = $(SDLLOPT) -lpng -lz # Use gcc for compiling. Use ncc to build a callgraph and analyze the code. diff --git a/src/SDLMain.m b/src/SDLMain.m index 5274d96c..06b858aa 100644 --- a/src/SDLMain.m +++ b/src/SDLMain.m @@ -82,7 +82,7 @@ static NSString *getApplicationName(void) if (NSKeyDown == [anEvent type] || NSKeyUp == [anEvent type]) { if ([anEvent modifierFlags] & NSCommandKeyMask) { - SDL_SetModState(SDL_GetModState() | KMOD_META); +// SDL_SetModState(SDL_GetModState() /*| KMOD_META*/); [super sendEvent: anEvent]; } } else