From 06d7c2f2da4547c1646ad65878a730fe96c5688c Mon Sep 17 00:00:00 2001 From: TSnake41 Date: Sun, 10 May 2020 13:43:22 +0200 Subject: [PATCH] Add icon for Windows. --- .gitignore | 3 +++ makefile | 29 ++++++++++++++++++++--------- src/res/icon.ico | Bin 0 -> 11187 bytes src/res/icon.rc | 1 + 4 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 src/res/icon.ico create mode 100644 src/res/icon.rc diff --git a/.gitignore b/.gitignore index 9bccf8d..6ea76a7 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ raylua_s.exe src/autogen/bind.c src/autogen/boot.c src/autogen/builder.c + +libraylua.a +src/res/icon.res diff --git a/makefile b/makefile index 100d4f1..0a72e74 100644 --- a/makefile +++ b/makefile @@ -4,6 +4,8 @@ LDFLAGS := -O2 -s -lm AR ?= ar LUA ?= luajit/src/luajit +WINDRES ?= windres + CFLAGS += -Iluajit/src -Iraylib/src -Iraygui/src LDFLAGS += -Lluajit/src -Lraylib/src -lraylib @@ -11,31 +13,38 @@ MODULES := raymath rlgl easings gestures physac raygui ifeq ($(OS),Windows_NT) LDFLAGS += -lopengl32 -lgdi32 -lwinmm -static + EXTERNAL_FILES := src/res/icon.res else ifeq ($(shell uname),Darwin) - LDFLAGS += -framework CoreVideo -framework IOKit -framework Cocoa -framework GLUT -framework OpenGL -Wl,-pagezero_size,10000,-image_base,100000000 + LDFLAGS += -framework CoreVideo -framework IOKit -framework Cocoa \ + -framework GLUT -framework OpenGL \ + -Wl,-pagezero_size,10000,-image_base,100000000 + EXTERNAL_FILES := else LDFLAGS += -ldl -lX11 -lpthread + EXTERNAL_FILES := endif -all: raylua_s raylua_e +all: raylua_s raylua_e luajit raylib %.o: %.c $(CC) -c -o $@ $< $(CFLAGS) -all: raylua_s raylua_e luajit raylib - luajit: $(MAKE) -C luajit amalg BUILDMODE=static MACOSX_DEPLOYMENT_TARGET=10.13 raylib: $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" -C raylib/src -raylua_s: src/raylua.o src/raylua_s.o +raylua_s: src/raylua_s.o $(EXTERNAL_FILES) libraylua.a $(CC) -o $@ $^ $(LDFLAGS) luajit/src/libluajit.a -raylua_e: src/raylua.o src/raylua_e.o src/raylua_builder.o src/lib/miniz.o +raylua_e: src/raylua_e.o src/raylua_self.o src/raylua_builder.o src/lib/miniz.o \ + $(EXTERNAL_FILES) libraylua.a $(CC) -o $@ $^ $(LDFLAGS) luajit/src/libluajit.a +src/res/icon.res: src/res/icon.rc + $(WINDRES) $^ -O coff $@ + libraylua.a: src/raylua.o $(AR) rcu $@ $^ @@ -59,9 +68,11 @@ src/autogen/builder.c: src/raylua_builder.lua $(LUA) tools/lua2str.lua $@ raylua_builder_lua $^ clean: - rm -rf raylua_s raylua_e src/raylua_e.o src/raylua_s.o src/raylua.o \ - src/raylua_builder.o src/autogen/*.c src/lib/miniz.o + rm -rf raylua_s raylua_e libraylua.a src/raylua_e.o src/raylua_s.o \ + src/raylua.o src/raylua_self.o src/raylua_builder.o src/autogen/*.c \ + src/lib/miniz.o $(MAKE) -C luajit clean $(MAKE) -C raylib/src clean -.PHONY: all src/autogen/bind.c src/autogen/boot.c raylua_s raylua_e luajit raylib clean +.PHONY: all src/autogen/bind.c src/autogen/boot.c raylua_s raylua_e luajit \ + raylib clean diff --git a/src/res/icon.ico b/src/res/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..889623215315e789d23c8bd5cc60681d6baa1d93 GIT binary patch literal 11187 zcmeHtc~p~0({Df7L&6f)009y@$Q75YbV5$!Qn>|r4f&j3k1HfcX)OFAR zTwx$zB5kVgPoe-&SOP$$PSlqp^^{2fXlYH<+mY`dP6i;0Hzz<{%?RNR)Mp0zg#bh< z)jt7;6ie32VgVqf&Gh4hB}FWcj$Jc!gQ>>#<-20I(FA60{TBftM=Wnp7b;ME*AMw( zP$Pht#e|6wd_v9zz}+>9j6upjIxl7$L=x!^Z5WNM@|nh;?%l=IWL zU_y!>s&px=z<49`A?4S3yRg*RXk`AsG&=k66UltnvV5_;kNPiGSqx?uiaPrfGFnxB z{mS8Atd98b&ykqL-N+I!8FG~(M^vi;{~C%YV5Lg+zI?wOa)ANgwF;R)RjNi4S$i?8#Wff3SrHBlPs%3qX<(q&OwixauMDyE`iIMWF04hPh z>iAn@bo%&mgAff;XsA-GT<}h%OvE+53RtT}Rq68!V%l$d{Z85Q5X~U^98hWK-|6*R zqlE>Adkt_yKO-jW)}lHfex^i7#4o-IXo+YB@wEFY4I$-M0siHO@=P_M%F)tP0wU#C zYpdLG!rI?88Zww}IA-z9|6~^n7KZx+D1ENd5K{iBA;cTMYA9^n&2&co;%?uW=$qXd z2tox5Rup*|p)974yLYe3E{G<-3iv3E3vOQ`tXZnE)MU_JDgnDCv6zS*r{B2Y~J9|nqVcKiQZ>;L(! z6-b8mC;GySQ!-Lem!xu~jsbRG2;k+*NL9_`@CDP}$|5T)IX4Z&;b4js2=io#P zKJX8=zbcrE;F{_0GVY!@uPDs^JdwcW|6|EB*7a((zmQi&zv-L0a)g+IWa`DrT(SIb zgF&|zUj;hmW+?;KE;ecPZYM*@OUTX#qjGLScT|aE%;X>B8YH~^rk&tA9IA^dT|v?4 z$G9#AycuKMfQo=w?T3*@B%Kes{Wl?375-mOMl!~3sjoYfi}()$Jidn~|0Id7fW$Ks zL$_khE1oKrPafzCM)zw!SHXkaX-J6wmfQb*=0Z}Z35GWNlkN_AU#t7~Qv6-;p0HkN zW62RMs;6$EV3Jg&I0!*3|31a2rkTJds??8%0(3lX`ND;_gr%bF!Pyd(q)0ychr5UE z=I3=De<9N(+E@miR|tPU9C}0*>R(>{Pkz@&@BTB{&11+LTJ8;$Xq)9nbTNyUBfzKI z2Ub}g$&u~u|7ih#pCjQ%E9HtoXGHA`W}@#nR{N0m58Uw^eE1Gie3zU4ttq}kfd8lX z27vDCOA_~LSRY3~Ihg4`$M1{}KkdIlcK{>Z@Hlj@@rrB)fOzzOgYNMv)IQpP1U8JE zSq!+OainG?7Z6pDuvd%E=p9Z~a@~o(GlWbQ>(NH92N-!vO9S2UdaJy;x^^Jd)r5RJ zQBKJDd0!jFMJbgl){< zgbuhQEWOVbD}+*oA2S3&uxixPDDDQOKo3C=RPIR_X*Nfi)tOy5YU}6H)haxVkh9Tb z7464-hrnve^ezIe^;2oCT-8ZXIk<|HkJA_ndkl9gRC*a!1bY`EtT0puh&u~bXsd8z z9vXp!1%@aUv#D~y1GCkt1{G;U9VaOWfJT^cy9M=Tt1)>^2~vpk5oid{*pdIjetf0^eUxee z2>UZ;$V@*8DaI%jTSQBv0f>@ZRWtsRg-{N?TEzXubF~j#P#_fU-=78fDM!DQ^gO(( zw9#j=Sg0q4hGXa*%CS-WPZe1Tx9waVpzcG}eO}@<8WmnSpk0%p=}o24dJSK_>g~<~ zx{3@9%M-3$>7@V+U(o9^>U8en8o&CHCaN47ara;!nICE$wZmTY$p-j|TwGyGmt z9wN`HQp__w1orJWtfJh1uwBCO@qrmk-j5u=^j%O9=(?-P3Jmh89UATw61%-;lMs^t zbpHvUug@EBX2I({&N@h=%!=M~3Y_ekuYnM}wn(-d^`28k@I3JhF)c9SNZriBUWrt0 z>+e@7IP}N5EgJ$YK`&0P;w^Sn(!5zt7sRv{hdy;LpEc>b0m7|zZ1js$w!UPGG##33 zn6MCPP!C-H$6M)K(4cP1yWAA$*E#g&p*L>p)-6ojlxlV^D`+rkRRbfyD_Nx3-dAJ5 zkRCC;Ts6tQg?IpWlp9>39 zx^b3PxpjJ!=V)~5a5rQRS;p_d{OqM+Dux{ zksq_N3N8DvkA#Wy)&1gLPZD5gf;q;X;t@?W& zJzTm)&0$|nLnEVxJ3lN-l?XF3)bHi`n|`R#FBsyY7@>`t$8Rq%)Fy)4wz2%7x$j1% z`#7PK)IQ3E_~|a1vL8X=h^EQ*N&ZgBXzkE9+q&DGqI)%p0DaTQ3V7qff_|*}yY4s7 ze2q>tBsV%x#C|CF!%mLKJDm$D(5RmbEa$X%pjtE}$x(xk;@C%CV*T}HYj0Ge_6zaD zzCLOB&{DGN@1#(XQ;4F~Vj9GBcA3WiaSiH&HwW$b<)gm~EEpWKL7PAVYYo?6(oR~4 zwYTJhHY>jt82e*7-#)vMiraU&HqZQadxvxTtxo5Wp|=M9PVwPJu1$EO7ueZ!VRkYv zx^ySy<(z#HZTC>giSUW+Nprne(`Puu07c&_ZT^c4KO%T1Ez)&L+GcX0ijuODa@3%x zIdJCB?NtBT7^j9&iC;bL&>e7*bbwm%y3BRCMivG%)j2KO9!o!lfw9cvSp6wn%3FVp z^~TWCsqsu`D7L1A08))bWb)a<}lVb00u!pKaRF%N~L zDZvE|*JGNCIyfb5RC%Fy{2I zu>*vgN02X;r+;qkdm%9{sZGvk=e`gS*^jkgSNc`$cy?4M{speusO0D-hEi!}6eBM; zRkOYTWzAkXuV6-!2}7`3OE$`RMc0-IgYvny=L_$YmyqblfHNApaypB5L$nWDCXE1s z`hr8bVR4pelnPULAI|cE*jiAj-`-zqaJ>Ard9+#g=HI4-1k3_P3o9fWKgE-!CqT)3 z=?ipN(5YpqI+c_`_ZlABBF+;WFF?m((y~)|^VtGN@X+>2)j=C1TIY2@di~NYx=${< zx08*-)ho1-jR1w$Xt^H1z14qx#U$Djxu-)>=MaH{84a7h16_}mnsqz-a^;7gDj5s0 zFp8GGu61pVdAIkT0_u`vPAsQ4!T(|E0QV0u&i&L&Vt}zQG5Dj@(NGp>9lMGuFk_tk zBjGvL-%C)AFWE0Osn#@2kq3g>K9iQRYKbkx7CA`ArplUktd;5M7DyG-dmU+Bm(z{b z7xkIEnqMsm1kwhazpdbCe@(_4zrkOXLd_K@fBTimjJq`)9XDiDP(REm0en0IUhi5_ zb4p4$_sgyo;KO51>6XFUq~dTR+bn*dy;_W)+lKrOxa=c^b+pU9jR@QB^ohJr_i@4y`&>E@4vyGQ#rPe;JrAAbdRID5=KZq0T+ zay^TpaxM6ND}3~qTv2{ndoE5I+r*EGs*R)FCh%ipqa>2N>&4mk=Hs(Kt6*Ois znrr+Sjld@VHUY(TF(y}^gOCjf4%#Rem@pUPb8bTuWHAY6gW=lsD1wsCX`4E1pCDZg zau!ruxTxn`NaOy%DLpM!yh}Z&=h~%a)QVNr7PJW*sW5WB73WR$4LESP)c*z|#yLZ` zViFgrwYDjiFuTYmTUPSVnK9+-yo{hy3bTu1d^#n-J*w2C0_kQW2#uJ(pt^MTfZ(mm z1bLB<$gm&zNDq^Cy{Dtr083+``t^K7&)` z?`z}YG?*CNnb^wBZ#;*1p1c!y?3JJ21c{rPM!OGIth(cgTX-jiJZo=6B>2&G=IQii z*J3o4dS%;})`91L%G;S;wM_ z&RVDR!amlt@KJ|+8=IQaLzc;VCH<48?!nok*usRd5t5i>5aCSUYTDVO6nbgvKaCz3 z;Ke3=cwtv_Wt--}q2*2W^|jrv&$P&|UvDX2ebij9E zFuJS*(;mil{61{G2XnoFZr6MR*j`B5(n%fDSu{&iK*2PA$RS_35=Rz`wW%4kX&wwl z6?#sUR6l6-Y4tGmxKORI=u?X~s;77`*9WbrRYawCHp^kVM~t6fbJFn9A0%79;%DA^ zb6G_A??cY$8GJ2QUnSaty_;cG2lsqh+tRLXw{U(K#xQQx>Wa^luUoEVnPdEsKqix;g24gziT6X~8k7UW;oUacW)_tVk2-HVxA6)^*DK^?zV zQq1txFaM0aOq>-rqIvu2m(9~r~HS}$Ge4*M4Gycn9 zVei$H;kp3?QFbR_?5-zZo?~|pXS%_ZGM#Bh%|S?fT8MRzP*1YBZPCcx3-@Cx6IT+m zy*cYYy-Ah#(e7V-pU1EfAbSD?Rj5$H34bz5j`DWd;GT4E#m9KF@v7hUy^R*2i zt{=8t(z^teEs!jg#=encgYDZlbz4zJx;4m$-Eu^t9Z+HkBr6;I*uR;aszyj)B0!!6 zCm)wKg)c5PIQ6t9!;Bio@zo@7xVU-q*5FpI^cs-VUfS#}|3H?#K@cLT=rPK6N8(v_ ze~QE_{<~pand#Xt2RFbiYB6ivd{bOmN>o>uR2LU?v7q2(RSmIYjZ<1!wX&xMOW#oO z#J*QxJS=RK6sg0CfC$6Zlth~;zUbjux zri~Lb!d@2QDsAOiC-|llp9yT%C(^t6$l>_k=>6*&E>Dv>Z+#l*@6JR?}2o4JtJ zeKqMV_TJ#g=MM(A_dDR+(iou_;S10(j==%i+3e8_2;gh`Lx<|&QGrWz$1+MU(y=1W*e=(lQMb0Vent~2pyEQHmK$$I%g?WJ$J8S3<$3k?ias)Nqp^#-Hp4GQjy~FBQ!gpZA~4 zh`sAVuGuKIxqsyZV){YcudT$>GmmUa$sOk{Fl67|1djL2in}B-TWvx=zD@KeD@3x8 zXED`P&*8=X~dHd1=NL2+9guK_rw9~kNB;*-6t#lC|QN=4Q>f0Cq5|=w3 zC-d5Z|HdXvq@Ou%lZB|^3;?c=__%hAN8Ia@9&r6HmFT(zmLtGnv~}L>LJz7uade6;C1}`rWR*p+Ne65pk?U%)qR*{@onwshDLNJMT#VS+UBU(*l2J~%{7kN*wE^? z@x|oXrcy2O3=Q3PQigF`;@?Y@l3hSFywGR3O&MBHUhBXxdn3(~>})og1O&<-&O? zqLELwv*UU3Lfa{Wg=+U*TyvptnaI9w{x9a&S{_~{lcj3vN5;I-EGxa)o?zA|X|(8M zukg6g(zq`X)3&g7Pnh2pFypfMq)AI2m1||pE`oiuZ}UWTm~f{yCT}Gs$hP6I`dRd0 z(^ORbbBNbU+`mM=8XSJ4Sp?0y$=s8eeg;=JwXIjJjWJYA4flkX7?B5~&Em6(3%ASN zLi2xKIwxMcdchziG&0hqL{ckCvReL+rMi+ZA^`Y`g7qAT@k zZbyUpRe!T3=tw_(d`oOdP98+I#QMK%2^h|bgdx&zqslSGRQA4o)On};)&Un63sL3t zX=oP`lP`Ov!IfS{j;PC%-al0xQ3*9Y8eo_fJ)FIpLoO`zAd{7hY<`fTB2Df7Hs+Qk zuVYcab^m$q$ab~2^&JfPGjvBU3Q~}TzbUJKcWS`3_e*XzA8^PjrNk6Fs$qA20lIXPS{P-{(|0Z;f5iU z#qC?m@k%A0^FS@WDtcrTw)^J@ofbLa)EC1@2Qw*-CwSB}S@#J_a-#$?HoS3Y8)xMc zN#U7k?y201qL+3e?-qHsgSS#%HqerIn3v0xD;O3w=qx3hd^r#}}>ijYlj@RInl_lVl1 zdr3Cie0fn6N>3EPK1&U_lkJE%L@@sia8|3684uylVwTeMT^kO=`gk(GCQ@Hcu8M)qdPl~!ZM%`? zBl!o+I`~YM4Id3 zi(=PXhp5BDlJISQKfrbygf2QH9kk=l3a;}N8p&B=7=D|{d0QpYG_)Qpi5?n!J_&8H z$I`z@ldqrFwD;HzFBgyGLCO-{5v8)Er&}069vwX<)#rDy!?@_JW_^zgoUX9^(9Qb; z^1WDrGv6~$Ez+r$lkI5?f3yYqg0A=uD)AE>)P$TLU2G;3nL}SrvJy7@;>-??iRNR( z*bDUPmCza5XEVW((o&S~yb5g1LvJM&K3qG15A@#pc?X9Lqb*DWgMU&A#bbD5!qkIM zuTV)w4swwM;-Z>z{+K^5Ha6_o;USnPFmVZ4jR{qA9E52S($4HwL-JrC+@nl;yri~rRM}6!D$hMFyVjk$; z?Iml{)hnB~n|M~esJ;aHV>((7+zv8}c07wg?*`!d(C=2=`z!f><6>G!zt*^mnY~v= zBB1TS_bvu7$}!<&Tok0EV-Y@?lo_qMs4MDKUDQPl&6U%*(ktUnuE`&eC)bCmWPADn zPO*X0#}$%2Ph*Ax!+U)4p81Ctm#$`F| zW1=CtCq1$pqR&#IiIP=gkt{G{$v$=uHjK2vh7_zFZ9%As7hOy%V9T7VdO2!}A2kX^ zhU8L3>vD75)eVmPsPuOdR3@>L)ImmLjcl%S=6!tk!~h9iHqn00dUe>onc(R2=eur@ zr2@47qIGXg#e1EuIy24p%hQ@k^aIO0mGxRB-p<3a23lbfTv40ejHTB|miK)6 z`6`)CzG-h>-8k^&(=st~nqiJ`-{Cq)bORxZ(7TX|y9n>j-47L2_C6V+R$lC&hA-N0 zXdOJgabWDeX5}<_1SnfAF*B5AVV*ijk|M4c*8I9QRqoT;`jP+n%cqC@JMdC+Q?9hd u(ptQKKid%<8Gb^9HEpmPXu&vRXb?HnrvD3-2A9$R literal 0 HcmV?d00001 diff --git a/src/res/icon.rc b/src/res/icon.rc new file mode 100644 index 0000000..ff5fdbe --- /dev/null +++ b/src/res/icon.rc @@ -0,0 +1 @@ +id ICON "icon.ico" \ No newline at end of file