From 0cba8d011ef90c7ce4150d543c79a76f3fba9dfd Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Wed, 3 Jan 2024 00:01:30 +0100 Subject: [PATCH] updating license year, fixing fetch dependencies script, adding VMA auto update, removing useless dependency in xmake build --- LICENSE | 2 +- {test => example}/42_logo.png | Bin example/Test | Bin 0 -> 14536 bytes {test => example}/build.sh | 0 {test => example}/font.ttf | Bin {test => example}/main.c | 0 {test => example}/run.sh | 0 scripts/fetch_dependencies.sh | 12 +++++++++++- valgrind.supp | 2 +- xmake.lua | 7 +++---- 10 files changed, 16 insertions(+), 7 deletions(-) rename {test => example}/42_logo.png (100%) create mode 100755 example/Test rename {test => example}/build.sh (100%) rename {test => example}/font.ttf (100%) rename {test => example}/main.c (100%) rename {test => example}/run.sh (100%) diff --git a/LICENSE b/LICENSE index eaf8ee4..08cd0c4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ MIT License - Copyright (c) 2022-2023 kbz_8 + Copyright (c) 2022-2024 kbz_8 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/42_logo.png b/example/42_logo.png similarity index 100% rename from test/42_logo.png rename to example/42_logo.png diff --git a/example/Test b/example/Test new file mode 100755 index 0000000000000000000000000000000000000000..2a36f9cf146cc860f8188059bdbd23237bb5e972 GIT binary patch literal 14536 zcmeHOeQ+Da6<_%y5s4!SNT`$0<^~jS2v#H~aShbT$ySmx<3I=wgf>KxE!kF)B~>~n zN(vLFPH2RqVwjfl)i!OXKwCNk{h&#ppx_WfhfYJwv>|1v+XBk?{dhUMve($~Ax9{$DCEa@aiuRQiHXEZ-$(Avcj-F#MvQQlHi3)(sn%E3D zpU>v9DIiyI&d|#SfYvC-Dkh^{@Rfk*SBsT1;Q0m(eHeuzL`1(*#XjB85Hgn`qhB>v zg>1#I;6R`dlD^oV#MO*h@B|t_AvF78lgWCnX36Hs=oRB`5=efSF7z7^egndfP!{-^ztZ0t;kRDm%`hucKZMlZHQ*;M zk>U6c&UBgAivCJnhhdRVLUB3SqFA)Eamk`sxIPw*_h;%eO^x-9OFZd>r-Ap3ae3ju zdur8H>sZAA%OgkrHfH1US-@eb5Hjh}b|xH{cJyB``{wG+jSrq0_sh>dv1x4E)a~ak zLmM0i`k)OK}P|IrfmFO=Z#E5U!h1i!KbkN1rPhqXYMXXGy} z!Lwknr!Nr?rqxhN4F*}Ttz&gC97#obqG>gf>R8Ac`i5o&R z9yKb^Q8eCDH0p{)LaC4R8;OUD-F7G9YB1dufaNEurkIH40dHgz{Nwc=r+h*5GI^1k>1 z?oc$wz~I_IdqaJL$BXlj7YT?K>R3yw;jV=XQPId1#ad4nG>eiC`7VQB)!x?98f@?^ zVN_c@QEl)nW$vrjwykQrYLUl-caRO|FZiqEXRK8fYbZ_rGdwEUFW_dQd3a_tIs<2} z-wN)>ciaWjc_sUUko)IEVXCZPuY-(*)=OHa^5+_SMy!X#Ck21EZ0Lz6IltWCaqSRO zJtvNsc>cM-Fk?qe{4BvC95eCfnfOr?|1lF!3++_k#E`hwE*nP3)6$QOOU5%}$eZW) zS{Ye`$1zZmWTS@mcu=X6jT&;43uL@9o()@ClTdDw@oezZj4D6NvLRqQ;v*F&6cb-# znDFx&6Au@-zNa0mmkAs{bq5l-wj z@won$OF0AO43snQ|C)ifouBwX8GPNY3{^k3h%seXUaioNDuajYBRnPg(w_sZ&wn1y z&UrG_Q0_%tVN{1Q|7nzQi7OoC@&S}9P|kDthbZGxS9pZW-$NOfxWZm8e+y+?f(yf3 zz87U&>Iwr~z7u7f#tTU<--a?SZG}x-{sPLlq!re1c^k^Oloezyr%=Wvtl;JHXHmwb zs~~Z?6J=bo3N9{x8f9Fn3XIEZQFfv{b{dHJSE7tdQ(=_LEhyuXR5%LqwUA6XtPEAn zuLDZS2HZ`)ypr4Cc4=pW_km%^)RTBpax)%;UX<*!Xyno^1g$c3v)kqSRa^F$l06It zw?o=cTdVbRt?I5t9a@3*o1i^_iPNqpUnSS>u2FIwZo86Ox)z$(Vi1!u1diOxzfXrj z?Z@mKI3nVcv^s9n;g-0ef8Ud+!A`iLHXGI1-)kX^rr1<_ZpJud&A*R98u#N;dH_!t zZk_f3ZxO@H9*0PJV7yuYO)#b|V78KFaNvb|Ne|tz^fPgKsWZ z4xX%3Y=@N>POCGafnA~jyFS|OoEMnz$M^=C=YucnU%XBkY`z>UA#1OyGnAp`DZuNq z>VVR^AlSpzA41i3^R<%@O)qIQiiqw zF4vR~F_G)wmgu+p_k9ZcAG(F@zY8kbrJx(Cz74wFm3Qv^0oOsAQQrW<3f~F1hoJC_ z{Ww1M{-50r0Jp=_@Q`T_gFnWFZKGHArR?z)xt(qpm##f^3OhCwf$X0b9M8UlcO=ub z?|{aa_wV@dG_>gadVX-k=C>W%aq13ey8lN*)$cE4Y%p)jR*ylYc{hBbQ#UrRp9|o@ zxe9K98~q#nH;z#2N^aIA5YF39SM?__taqXPLIcEYGLVG9I6My8ix}FOTGB2D%}{j) z`h6|eJv^u{P^bIya69aTNFj4Px68Ccd;omjG+m+Y;a$2~1LklOOt$}W348x_ZQ0WY z@Zvp*C%Bv)>wItEC4|Rg`J{=Z)|Y=a;N~A<6{yr;INB2*=z3fBnb+os`(f~zD#&Fv z=B~+ZaJvRib#1?8$N2L58QZ=(w`=Se3=QaJ*Tsx&e$l`C^`Un6%(kIr+2euiXnXd} z-7ovIhn$ZcJUHrF;r!_d|5=CpJD!Jb?pcu?)pkHvuYH4_3wSVVCmzg8AQMu1Rx>V( ze`7IUgAlO|qUE3M3!j54qRobO_;bs13D;l*M^Y~343sla&OkW> z;4k~|YpEaKfOu53o2k7a_2RS?lGI2>W#LG7s6VE%)mtU;He*Qxyte5{c;Jl&x8-)A zjKw5)T@p$r;av-~Xq#JkMF0@LxF7k8u4e#Gj_GgpskD0Fff&Wq;x}d2^BTl2 zu9c43E1lD~*az71Iage=*nI)8tR0RGa2y5yjcC{6aOEmiJ8Jh-`W@1(RRKrcV0FOZ zt$1acqpsB<`5m=j(c-ZCr&sttLK*Qq49$$fm@Wil9S+x34m*$Y5Qrx&ybRpSaJXRX ze*?t+zf^Ixqc&IB;*j=K`5kq)R<}C5gHr;IH5HFeb9f;lh^&R;Xq(O?aKk+9fwA6< zWAHm%gB4(38MjSyxLPq-V9TYPfpP}Q87OCw=nKow45b|!ZscE*5Y5x_xV&Mf}xMG=O z0Hb|a_#F%j>EAuACs5AA%R(%)w@MP5muL^usLUY#?-KZcz{dn07Wf;1 ze-ikfz$s$W)_DRi64)qkr9g`BZrP} z*y*W;I+-ULhs~%-=7}fNh^Hss?@6W-$w*4wYN9&(qp+Pj8WxnlrLA5K^)PPU8%p;w zPk3uQy|vFkHDzcvM^fo%B0fn7f-V(_h0sCNlJFx5L;)L6J^Y6g5A5uWf-VsbsUhZx z^ai_Ap}t74Hw?Zc86LqRg77C0Jb4UI(&)|M@ z44M3Cz9gji5lnco=05~1&PC);^ADj{_)+|1M;He^&TS;q{6;7Xe{1}LX172Eb4va+ zzY^w!A@y$^{}+XSi?E~lnvmvq^v5~f>VF4tm=kKB);B_0$H0Ua>-FCQtl3`@^A;ih zEm8O)2z3#^YVltq<}<=i(n2WOAb%mUuUY(QJtm}en(VFde_Qxd{+T2!1zsma0;~V` zL4o5Z|Mik#Nf){7(k_|(Dfr~1S+`cN<6m3{onL|J63y=34aN` zPLn@CY7puH literal 0 HcmV?d00001 diff --git a/test/build.sh b/example/build.sh similarity index 100% rename from test/build.sh rename to example/build.sh diff --git a/test/font.ttf b/example/font.ttf similarity index 100% rename from test/font.ttf rename to example/font.ttf diff --git a/test/main.c b/example/main.c similarity index 100% rename from test/main.c rename to example/main.c diff --git a/test/run.sh b/example/run.sh similarity index 100% rename from test/run.sh rename to example/run.sh diff --git a/scripts/fetch_dependencies.sh b/scripts/fetch_dependencies.sh index bedebfc..d40d1b2 100644 --- a/scripts/fetch_dependencies.sh +++ b/scripts/fetch_dependencies.sh @@ -3,13 +3,23 @@ # Update volk rm -f ../third_party/volk.c rm -f ../third_party/volk.h -wget https://api.github.com/repos/zeux/volk/zipball/1.3.270 -O volk.zip +tag_name=$(curl -sL https://api.github.com/repos/zeux/Volk/releases/latest | jq -r '.tag_name') +wget https://api.github.com/repos/zeux/volk/zipball/$tag_name -O volk.zip unzip -o volk.zip -d ../third_party/ mv ../third_party/zeux-volk*/volk.h ../third_party mv ../third_party/zeux-volk*/volk.c ../third_party rm -rf ../third_party/zeux-volk* rm volk.zip +# Update VMA +rm -f ../third_party/vma.h +tag_name=$(curl -sL https://api.github.com/repos/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/releases/latest | jq -r '.tag_name') +wget https://api.github.com/repos/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/zipball/$tag_name -O vma.zip +unzip -o vma.zip -d ../third_party/ +mv ../third_party/GPUOpen-LibrariesAndSDKs-VulkanMemoryAllocator*/include/vk_mem_alloc.h ../third_party/vma.h +rm -rf ../third_party/GPUOpen-LibrariesAndSDKs-VulkanMemoryAllocator* +rm vma.zip + # Update Vulkan headers rm -rf ../third_party/vulkan rm -rf ../third_party/vk_video diff --git a/valgrind.supp b/valgrind.supp index d746267..d81f800 100644 --- a/valgrind.supp +++ b/valgrind.supp @@ -1,4 +1,4 @@ -{ + name Memcheck:Leak fun:*alloc diff --git a/xmake.lua b/xmake.lua index 885bf81..0a71c0c 100644 --- a/xmake.lua +++ b/xmake.lua @@ -6,13 +6,12 @@ -- By: maldavid +#+ +:+ +#+ -- -- +#+#+#+#+#+ +#+ -- -- Created: 2023/12/07 15:21:38 by kbz_8 #+# #+# -- --- Updated: 2023/12/07 15:21:38 by kbz_8 ### ########.fr -- +-- Updated: 2024/01/02 23:40:20 by kbz_8 ### ########.fr -- -- -- -------------------------------------------------------------------------------- -- Global settings -add_requires("vulkan-headers") add_requires("libsdl", {configs = { sdlmain = false }}) add_rules("mode.debug", "mode.release") @@ -55,7 +54,7 @@ target("mlx") add_files("src/**.cpp") - add_packages("libsdl", "vulkan-headers") + add_packages("libsdl") if is_mode("debug") then add_defines("DEBUG") @@ -71,7 +70,7 @@ target("Test") add_deps("mlx") - add_files("test/main.c") + add_files("example/main.c") add_defines("SDL_MAIN_HANDLED")