From b0bab273e21f8f648de011688d96baf78e064526 Mon Sep 17 00:00:00 2001 From: Exzap <13877693+Exzap@users.noreply.github.com> Date: Thu, 15 Aug 2024 02:16:03 +0200 Subject: [PATCH 01/11] padscore: Simulate queue behaviour for KPADRead --- src/Cafe/OS/libs/padscore/padscore.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/Cafe/OS/libs/padscore/padscore.cpp b/src/Cafe/OS/libs/padscore/padscore.cpp index 47f3bc4f..8ae4730d 100644 --- a/src/Cafe/OS/libs/padscore/padscore.cpp +++ b/src/Cafe/OS/libs/padscore/padscore.cpp @@ -12,6 +12,7 @@ enum class KPAD_ERROR : sint32 { NONE = 0, + NO_SAMPLE_DATA = -1, NO_CONTROLLER = -2, NOT_INITIALIZED = -5, }; @@ -106,6 +107,9 @@ void padscoreExport_WPADProbe(PPCInterpreter_t* hCPU) } else { + if(type) + *type = 253; + osLib_returnFromFunction(hCPU, WPAD_ERR_NO_CONTROLLER); } } @@ -420,9 +424,12 @@ void padscoreExport_KPADSetConnectCallback(PPCInterpreter_t* hCPU) osLib_returnFromFunction(hCPU, old_callback.GetMPTR()); } +uint64 g_kpadLastRead[InputManager::kMaxWPADControllers] = {0}; bool g_kpadIsInited = true; + sint32 _KPADRead(uint32 channel, KPADStatus_t* samplingBufs, uint32 length, betype* errResult) { + if (channel >= InputManager::kMaxWPADControllers) { debugBreakpoint(); @@ -446,6 +453,19 @@ sint32 _KPADRead(uint32 channel, KPADStatus_t* samplingBufs, uint32 length, bety return 0; } + // On console new input samples are only received every few ms and calling KPADRead(Ex) clears the internal queue regardless of length value + // thus calling KPADRead(Ex) again too soon on the same channel will result in no data being returned + // Games that depend on this: Affordable Space Adventures + uint64 currentTime = coreinit::OSGetTime(); + uint64 timeDif = currentTime - g_kpadLastRead[channel]; + if(length == 0 || timeDif < coreinit::EspressoTime::ConvertNsToTimerTicks(1000000)) + { + if (errResult) + *errResult = KPAD_ERROR::NO_SAMPLE_DATA; + return 0; + } + g_kpadLastRead[channel] = currentTime; + memset(samplingBufs, 0x00, sizeof(KPADStatus_t)); samplingBufs->wpadErr = WPAD_ERR_NONE; samplingBufs->data_format = controller->get_data_format(); From 2843da4479630e82d93ca0bb0c7e0c1748c86c48 Mon Sep 17 00:00:00 2001 From: Exzap <13877693+Exzap@users.noreply.github.com> Date: Thu, 15 Aug 2024 05:00:09 +0200 Subject: [PATCH 02/11] padscore: Invoke sampling callbacks every 5ms This fixes high input latency in games like Pokemon Rumble U which update input via the sampling callbacks --- src/Cafe/OS/libs/padscore/padscore.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Cafe/OS/libs/padscore/padscore.cpp b/src/Cafe/OS/libs/padscore/padscore.cpp index 8ae4730d..a83711fe 100644 --- a/src/Cafe/OS/libs/padscore/padscore.cpp +++ b/src/Cafe/OS/libs/padscore/padscore.cpp @@ -746,7 +746,8 @@ namespace padscore // call sampling callback for (auto i = 0; i < InputManager::kMaxWPADControllers; ++i) { - if (g_padscore.controller_data[i].sampling_callback) { + if (g_padscore.controller_data[i].sampling_callback) + { if (const auto controller = instance.get_wpad_controller(i)) { cemuLog_log(LogType::InputAPI, "Calling WPADsamplingCallback({})", i); @@ -761,7 +762,7 @@ namespace padscore { OSCreateAlarm(&g_padscore.alarm); const uint64 start_tick = coreinit::coreinit_getOSTime(); - const uint64 period_tick = coreinit::EspressoTime::GetTimerClock(); // once a second + const uint64 period_tick = coreinit::EspressoTime::GetTimerClock() / 200; // every 5ms MPTR handler = PPCInterpreter_makeCallableExportDepr(TickFunction); OSSetPeriodicAlarm(&g_padscore.alarm, start_tick, period_tick, handler); } From 294a6de779ddf9c6294dafa603ad23a404052ec3 Mon Sep 17 00:00:00 2001 From: 20943204920434 <160030054+20943204920434@users.noreply.github.com> Date: Thu, 15 Aug 2024 16:22:41 +0200 Subject: [PATCH 03/11] Update appimage.sh to support runtime libstdc++.so.6 loading (#1292) Add checkrt plugin in order to detect the right libstdc++.so.6 version to load. --- dist/linux/appimage.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist/linux/appimage.sh b/dist/linux/appimage.sh index 7bfc4701..e9081521 100755 --- a/dist/linux/appimage.sh +++ b/dist/linux/appimage.sh @@ -10,6 +10,8 @@ curl -sSfL https://github.com"$(curl https://github.com/probonopd/go-appimage/re chmod a+x mkappimage.AppImage curl -sSfLO "https://raw.githubusercontent.com/linuxdeploy/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh" chmod a+x linuxdeploy-plugin-gtk.sh +curl -sSfLO "https://github.com/darealshinji/linuxdeploy-plugin-checkrt/releases/download/continuous/linuxdeploy-plugin-checkrt.sh" +chmod a+x linuxdeploy-plugin-checkrt.sh if [[ ! -e /usr/lib/x86_64-linux-gnu ]]; then sed -i 's#lib\/x86_64-linux-gnu#lib64#g' linuxdeploy-plugin-gtk.sh @@ -39,7 +41,8 @@ export NO_STRIP=1 -d "${GITHUB_WORKSPACE}"/AppDir/info.cemu.Cemu.desktop \ -i "${GITHUB_WORKSPACE}"/AppDir/info.cemu.Cemu.png \ -e "${GITHUB_WORKSPACE}"/AppDir/usr/bin/Cemu \ - --plugin gtk + --plugin gtk \ + --plugin checkrt if ! GITVERSION="$(git rev-parse --short HEAD 2>/dev/null)"; then GITVERSION=experimental From 958137a301208141b1e62f6b2f5b3ce2f04335d6 Mon Sep 17 00:00:00 2001 From: Exzap <13877693+Exzap@users.noreply.github.com> Date: Thu, 15 Aug 2024 18:26:58 +0200 Subject: [PATCH 04/11] vpad: Keep second channel empty if no extra GamePad is configured --- src/Cafe/OS/libs/padscore/padscore.cpp | 1 - src/Cafe/OS/libs/vpad/vpad.cpp | 24 +++++++++++------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/Cafe/OS/libs/padscore/padscore.cpp b/src/Cafe/OS/libs/padscore/padscore.cpp index a83711fe..0a577b97 100644 --- a/src/Cafe/OS/libs/padscore/padscore.cpp +++ b/src/Cafe/OS/libs/padscore/padscore.cpp @@ -494,7 +494,6 @@ void padscoreExport_KPADReadEx(PPCInterpreter_t* hCPU) osLib_returnFromFunction(hCPU, samplesRead); } -bool debugUseDRC1 = true; void padscoreExport_KPADRead(PPCInterpreter_t* hCPU) { ppcDefineParamU32(channel, 0); diff --git a/src/Cafe/OS/libs/vpad/vpad.cpp b/src/Cafe/OS/libs/vpad/vpad.cpp index 94bb0ca2..ded4304d 100644 --- a/src/Cafe/OS/libs/vpad/vpad.cpp +++ b/src/Cafe/OS/libs/vpad/vpad.cpp @@ -50,7 +50,6 @@ extern bool isLaunchTypeELF; -bool debugUseDRC = true; VPADDir g_vpadGyroDirOverwrite[VPAD_MAX_CONTROLLERS] = { {{1.0f,0.0f,0.0f}, {0.0f,1.0f,0.0f}, {0.0f, 0.0f, 0.1f}}, @@ -240,19 +239,20 @@ namespace vpad status->tpProcessed2.validity = VPAD_TP_VALIDITY_INVALID_XY; const auto controller = InputManager::instance().get_vpad_controller(channel); - if (!controller || debugUseDRC == false) + if (!controller) { - // no controller + // most games expect the Wii U GamePad to be connected, so even if the user has not set it up we should still return empty samples for channel 0 + if(channel != 0) + { + if (error) + *error = VPAD_READ_ERR_NO_CONTROLLER; + if (length > 0) + status->vpadErr = -1; + return 0; + } if (error) - *error = VPAD_READ_ERR_NONE; // VPAD_READ_ERR_NO_DATA; // VPAD_READ_ERR_NO_CONTROLLER; - + *error = VPAD_READ_ERR_NONE; return 1; - //osLib_returnFromFunction(hCPU, 1); return; - } - - if (channel != 0) - { - debugBreakpoint(); } const bool vpadDelayEnabled = ActiveSettings::VPADDelayEnabled(); @@ -274,9 +274,7 @@ namespace vpad // not ready yet if (error) *error = VPAD_READ_ERR_NONE; - return 0; - //osLib_returnFromFunction(hCPU, 0); return; } else if (dif <= ESPRESSO_TIMER_CLOCK) { From 9e53c1ce2760ac6a33d52f8813d79402b5183203 Mon Sep 17 00:00:00 2001 From: Cemu-Language CI Date: Thu, 22 Aug 2024 05:17:01 +0000 Subject: [PATCH 05/11] Update translation files --- bin/resources/es/cemu.mo | Bin 65733 -> 68744 bytes bin/resources/ko/cemu.mo | Bin 69784 -> 70573 bytes bin/resources/ru/cemu.mo | Bin 89284 -> 90752 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/bin/resources/es/cemu.mo b/bin/resources/es/cemu.mo index 856049de037de70de90a2868e6da991fe25d1235..a43d4a1dc46c8db327cd91f2ae906dccb734169b 100644 GIT binary patch delta 20556 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 a-@xeozio_(w*BKsObmbcl=y2)%>MwjNrbNe delta 17814 zcmZYG2Y6IP|Mu~-NeDd&H3=;Xgc6X@1eD%;N4f$_vfx4*n}m)lsPy8)0ugDVNRuWD z29OR4A|PE*6j88&AcBDX{oZ>9FMR*!x+b6BlruADX3l0K&og~-*awrtd|ws~TWE1T z2(hd(crMzqehsy(*)>&aSwosxR$+8uAxy`DI1%&XbmM&EQsZh=yDeB6cVi@8#0dNz z3s{!VdSEI-n%e^u#V{JgVNs07eAobsU~|laJuw#hVP*7U6fVZ%xZb!Arnk| zHu;^XarR+B#8{~x3pI%8cUFmM?FbH)Bqh&1NK5qq`xs4 z)o(ghLLX|px6!8?HxX!{9jLwDZyKD$81kQ*{LiQ}@EZmv)XLtfXw>~>P!o?w4Okzw z6>W_JQ3Ge7R%~1=)?bHY4h34u#i*HYKushU^`sx5ZulHE&~4NfJV15$H|jz1wzdZ@ zf}CTkJeI_#QSG{;#_MnL?$)foI!ZGI*{BJ;fa+ids^gWYCw~XEYgpWW2&O|-gLd=89uq?iXsy~1l_&5ev0<{IVu?Jdh zEh`jyqL#i7>b_y9en(+&$*~;yIjH-68weT_?7>O+5cOJ(Zf6hpDrzfMpa$58&)~bL zCk$_I4-kvf$d^a;w+=OtYp8bjkYi)z?O<6fj@1!4*FI|=L1PL|qn0S5Bb{JH%!6$( zKX$?}?2YPh0BTE8QA;@<>*4FDcBfGHokuPC71V<~#Jm{ZNoRunj|c|r6>5o`#wSrX zw8w(j2Q}bOEP&~#!#N%c;;R^rOHnKJ7HXnvP!rjO`h-1f@>j7O<6AcfwB!Xk+j|m^ zI#l&ghp;oM<78BaBT;+z0_u#+L#^CKtd9px{x|GOKB9}=&vST*d^V22ZdCf7CfG$# z5bt4cw7S_d?t_cT4#9l*yD_x8eTWL7R;)T|tD2#fwhd~@yO{hiQ=ewcLj6t{-<|c> z4T~ty0Lw8F*I*&cMb#fhCmu%)_!Blm2S;C9)B@G68)|F%qS_5Ljz+bci8=Th*1}pn zS$|f^a`m*VcDM;O^ZTf!j_hSGZ3V1Gz5xb1#-`*)BXhB~qqZWPSEC5Vqb5`zHKC@c zE$o1L^6scDPw^4N5llrVu0{=f1UKSmsF_b^UmD>eR7Yn}16@Kb{SDNiyMwy_SJVXZ z^|4nr3e_$aOJbbSSD!!)yP!Jmjq3PWtcq!<*C_{eMwX(sYAve$yI34|nDP@CMg9WT z#_v!QkL}Bc5%$Iu+>O-xtb~5{Ycvpb<0#`4bdvX@&crsXf`?HPxrwFlA?md%*5B@@ z7HTWnqE;f=l#fC6KL=S0fuHPC~lF$eV^fx)bQMS?FW&{BmAv8*RB7WE`; zu`y;~W!#7=KZgzRZ!C{byX+1Jq8@0faSrP2EI>_cl_}qf<;m}K`Rp4$r=Sc4Ut=Tu z2h~xdp|&kiPuu~6zl5+9`2nc2k&W8Z8K^B>ifXsUo!_B5X7emM&#*KIcHNos*_F0;UIs9$F|08fJj>a+g z7bfZb&wie-%oJS077k9T$9|&p5%vep7*vNVFb{4+t;jCa1P-BA;=HN9h2iAyq1yd{ znn2h{yWc2O`xwm6_*QKKmcnX;dhME{ZtR0vfx)O1NkzTS6R{v}#!!48)qWqUpQBg_ zPhdg3i(0vVP#;W@DR%n=^i`ms4uNj$jhguY)Qv98i>anQ8w-#hkDBN!$cLD<1T~Qd zsDA!H9a<~Z9=Hgqygce`R7P!8LMrR888x9mOWYULaSG~&DX7Ld68s-p<6eM3pq z4P{YJUIoiy6V%oWM0GqCwZuMj;sVqs>2@rHcZ`3d`Y)Ind~lytjG#3I?XVTjMm0Ev z+PjOW0lq~i{)Af6h%EcbVo~)KOg;g1e;w2rYKWR>Gc1bFqP8j>BlZ4IAkaXwP)o8H z)!_=%jjJ&l4`DWbj>WMD8Fe@ebwDi zp%{wQ@nuxQEm$AFME(9Q!N*n|?1C-uMby?E#Av*V)$ljeFQ@pi_6Jxq)P#nkCOXsP zH=|F7;|xIw{2VpoJE)EwR=&iFE^mJ=3Uet??6p#KkAptDN}#bl;1Um zPO$GQhMH(8)EP*aVBY_F6sW`2s3+)*da?mn42PTg30RT*OQ@AwW6HM}cc4~iKkEK7 zsQa&=KA7&J9^gLet@_Jn3i3|0JB~mtO&!!knxM``CtQuGSO$wvvfqZ<80X;cer!j% z_XW-e?!u=r9}n0VTVhZ2VHG@sPUU|$LFpIm8ye#eRE)+xIApTjFc;PFMXciBGkl8u zCs@~)>;dLt3+g|{xmfsR`>WhiY(V}aj6=sO_TL5Nu|DHly$E!wXX4wq2Q|Z_socmw zvoN0gp=tJ$e~*pG=b3JAK?~GMbwmx&4=dqV)L~nWIzyXLEBhhl!_$~w@Be26RVlcJ z`LOT|dnHO@Uh>^h9reR7^k68ap-#CMTjF%o)_jaw^6!zwuqw^u7a6WY?fnz8?EdOv z5yrP#6X>w?!OEC~Iy5s;11v|)d>eMfeWpBOwp|~OI@Jxa7j{6kUuNppqCT?sn)1t- zhx~WwQ}7dkW_}m7v{7^HCGCt_x&fFUN1?W20%~R6Kt0h~)QW62226b}E~9)O>Or34 zU}%dnQ7i7B%lgL-}se2ePvAuhr{mFNBO&*R$>`JDgRpJ*4cF!?`FE0=#h ztAMpI7Dr+ed<75TA=DO5^V?fJ+t2#zvwR^1T8Z_jz1)JD@m*v71@@E1p*pCHYG2*t zYh!Wp^-aE$u{&xjdZXG8!J;?}HQ{kS0)2wLff2X`^+fwnH=IBXcowx47qJ@N#)4RC zp*^w6sCG3_TT=&FFsq@dZ-QOPw??hBAB&@J6~SKwJ5fuY%X+K9N2rN?hMLfi#)ro6 z9J{RI-$c#$57e*W ze6QP|2USo5G(rv72Gy>!u|Jj~KMbG5$*A`48TX?md<>)UEc&!0Hwa4Mebfy_me>Q9 zMy*Uu)ZuE4TDlIXCGUYcGtZ;$ACLN=S%~T#EsKa_0OXK&bal@9f|HTL*m)aE- zQA^Vd)j@C6je}8d!${N>O%EuAnAx7quc0D>!f%kNRYsg4%+qs57$+btX2TCK|w+cnbAE)*JRG zV;P)5wl5~4?<#?27PZoTt;(VHxF#lH1JoHh}#w&;4(e&V%Qj{E^^hhJe+ ztooMyy zj6+cE_M-+kiJHg-R7aOlA4IoN12{IaO;`Y1;}z_O@tf@5f|F1ycYG7;uYs;ppeOwu z6R{}Eq1UbjcEG;a2Unu%AENH7vc;ZAV^sT=Cf^UMkspLwff-mEw_;tqhT4i4-@E*Q zNKg|a@gHoCkz4I2?v9%2Ak-6&K^?kDSOh1dR>Y45afxva>b(ybKfws{H&9#iJL+@7 z=Lp#UY*r4#D0l`7VSm&qABO5U19i$Ln*1Wv3cQIrjJfy}{(`Sy^=*95!*{VJR@!bq zNN-gCX;@6}{{(^r3g%%H?!@|d3^lOhJ^S@5jOEE!MQ*e@q7w&UQS@P1oR6C57R<(D z=)~r^_5-=F3;B^4!}!)t0(E!>3*)z_4(_22Q^XEVHb$d5Jd9fMhC6vmY>DxhhB~}{ ztbhU3=f(xBgm+L|7`@AW(6X4o_*No8J?w{Cs<~Jj_hKFV*_2m&-~Pj-7gnKsj>&Jw z`s8n8bF94E?q@h^uXBvcQ4@F@^yUi)vqr%)eE8L09c)C2C^%lhjzxj{i6EV<7<3#q7;$ien_ z1hu45`|YKyi+Ym&s3#nZn#eHJDIbH{qN%8*pNqQw6Xc+lcm-;tob_Q$Mudo_VN4x(>teG-|>ZP%HNh z7S;QIhd?t7J7RZS0<~mus6$rUfbGz~&OwhvVts^iM&#F`k7-7yblV_uwq;rJ33#F?o3 z7NHYYpq_X?>b{d$4$ol$&YyLcKui5M>Vv4*ar-M%71WI$48<|1jwhf7d>IpP7P6Gq zcGUexF%~bQR`5PnM#l+zE2^Ratg3t`Pq?3p*l2=Ym& ziFz@(^v0J^XJ{5`z@?}&v;+0z$4vbl)LRg8%6_o2r&#|dC}==IHB3egFb{ROUPBGM z9Sh@O)DxaTE%jw|;?JmdMNZrIJ5l{5;8lDE^*Yx-W3OB)YK60W1nN*u#TnQIqt4oU zItVqPQRu|+sHIyG=?FsiajzIM{37g_H?1>*@XN$F-;qdtJ24vr#KD7uC^jtcho^B!*nFmo^q#lCO_W9EVz|*YQa_ zfX(ne*3tW4|1UbfbH-W>X6mHY=0?rVFLMAu@3IS z+V~UdaK?RMuS6o2BHs~xI{j_}y>9a{23MdHcc2c}CDa!EfJN|kW1%nYCoYFNT#ZmG zIT*DV(qh^4OZ{zntIuh;`mLha=u)E+HIor$-xG;TtD1Rpc?w^0+k zkJ^Ipuk7|^QTCEym$y)NAw!=Eu*B*U(A+ z78b+EtM*D%MEzE5jvA;H>b_2>2kDLa1RR8#z{@@YE!hH0z%{rPPh%N1_}czfyAu03 z`0s+)kn)&o{AXG0g_4>zU={K!upS=4=J*%tFgCr( zhZSZZZm%(;dJ>{1%I2iJ$GWQ4J%> zcS9Y*!Kf|D#=1BI3*#Pa%J|mD1Umf%?${O47)HJl=EZ8Lt*C>2up8>Muf}e84Bx?0 zzu5nahYwMwKI^VM;g?YNFGC&5U8pTMgK>;+6}V?NsD?$!x5Gg=04v~5)Cb6AERLbS z^2Y|opiccXtc1(aiHETuUPryocQ6kYxNom;6!swB7=wTR&n3_jzlpkWFE+wss8bvM zz+Q<+3?(0JERAX(ha0dumcWas6}p8_V9|&6-Z#UNlk{^Itp_L|o7{4N4@GpA{Z(u=Uy71Jn?t5EO%0o0NmHJ&u(=TIy4IqJQBV9Fi;*b~f$x~~{&C1SBY*2E|rhB_N# zP=|D?k3ffP5o)QIV+^iAz32N;H~xWYSIBY%2QH3U`f{iVS3`AN8wX)?)O{;ZXJ!lX zl34*(w;I7BVqHEPwt$LcwJ;YeX6>Qu(Um}557K9*ESe_3?+pJbyhJwWA`3w2PKHTwc=qlvkqcb5eEUMp%(ll(dZedDH7f z+-YL%yRK2xKe|rQK8d8OG35nFH(e`kEzcmZD_mE)fESQeY&K<@dIxC-hu{em)GAK)?E zLwb?=hg$#prjjst_2=gfDvyy~A=M`7T5I#~&vo2a-qaPveWWp@6O`Ac)i_h9kLGyF z-ZJA%__qiC3cg$`pKmu6`jGgO)RK7dV+|CRrL5IsWlxfyMt%lqqbVbhgJbN0_aOlFnwYufB3-ipWRr~6~~d`J2Frk(J0;78?2jAZA1KyEjVWba9>y_bZL3)q63flh& zZfHcoQ>x(_M&3_4YiF&GusDqyQTBrAaEPf(rK}=p6Zv;>0rjz_ZYuczsV-$jP*)91 zM19ZbPuyJR@6BKp?Pyn~HfaU%cwEHI4UsQ7)-S}paTH0{A=+G_ zY#pfyX$Sd9coVl#e*{aA{G=n={~o%Ft1ty0(C`#-P13idj->gNwZ=BoZz8UZ?~=9> zPsjbFro>;9biGc#B(c8feu^)W|An-WIDxXYc!m5_;^6sPLZB;(3SArV0%-${=8+y< z9?A}zHu}$K*(M%@Q)u@Q=_c_^bI*0`M7}hsjp^hvaUtS6cHU_~D8i&0}&yp&WA5CgO{5x$T@FaP#4v>nFbZw;IY3f^%)<60V zpo$w*)Ku%ouC_FKf|S>k-5`F8w3l{opsweLcaf@+hM2OCu@vbU%I;wf=`!&olKzyt zhc)p@J=w1Whj9yqy@_WMCzD2!??&oE3Ma3tJ83g*E|Pi%OY9$Y$akP!eQZs7bagR7 z9^C(^5EqbE(cbqnKW=lwBntjV{3#Z}uPFPO*h$JyoDah(casvy4<}!TSYJ4GH6?|S z=1_K31zi7-T9enc5YxENgSAML?P8zxh8P7vukXJ)rXTzd3Fq4xvof z`S%02`DW4pQm&*;Khi_$Q_1VvLP{q+OW8zH7O5!t8MvIbzNG}Z4qydbMqvx$ zbHP$hKJixKw@7bOr|So!owI*#r`_v>Rq!d&Z=`{=+lfz`hA-m{6N~D4vyT&;qhS=O z6sZj9=wppmldnN~bWNv2T{9@_g@wqwi2cMbk}}CJeXKo2Rz32|6`1QaV>NxUc)6iG z1JAdG zARa-wOTGm8)BnB4K7-LzbS6Ezb`VrH4bNj7`Mf4ylK9)l+GdhZA?XT`-ZXWSje{xs zjQCyr;<5Xx1^ctd5B^VFb7*jc1}AVLm2-(JU>)-Bk!BG`VRy>EC3cYBAr&Nlh7?Ww z1oeH1yAsbKK27`z&cl_c>kMf=^})-GAB-buG=cOvxfgISjefw{q@E;Q4Jcb~;y%Q2 z#KlcM+ivpj&w-TpBRA62tKuc@c|d+5aUyZYj|uWo@Xlk6ej>h1c|5*=x~|fAC^}5L zZP+eYWB<4v5(sZmys&>@*B*fzUH=yvc)e$p&_JI)9!DUm-Wbg$c!=E-vQbPxArW_i>7)mzr~FIesk6j;&8;Ybejd1Jl9ANuC(JkPt5-QK|B zH^Uuyv)p5|vc0ar`nN8J^J^wX{1m+c_%R?M!hw zlUzy9A6iE%XJ&A0|Dw%9ViOA#=;=;MPj#myyHe9LokP>TUYD2V{ubxT`JdiWxR5hD z)8#$1(#a^9fqq+#If@6LFv&wRcZxHUr*x;f{57^_`!8&5TF{;rgV05EAh~d++dJBm zpo>LmXcJ$i1aP>DNDfZ(IqlGu55tN_J(XXIib@ znMp41aF;i*fA2zvKV^SQd$s*L_K)}1I}lgm@lL%S)<-8J;5yLC5jc2oT1cMYL-=QZ zP$tG|Gd3gLo8__}D=9tAd1&2OPgc5r+y@;BbnMlwtCM5pN(ub(LE8{BNXw(~p&eRx z^^Z8(H*o9d4oA%B^pqqQ|CgGM+3w-#R?qA#SEg2DL}1^s`Hm2`*Wc%Oa=u6F=HGXG zV@T3S|ELo|DxT~c+rnNc?n!ZuP#@0ruFU5-BY{OHbMyGSpBo(M89yr9~$wwy*$Hdn3m-Zl>D@=!;#_dc(H|l?!|pEIw7u< z)O3!9CxtlEo#FDbp8kQCn&(ST9qM)S2!WNCUUxWL{>Gml^G9AD;cV+l$zo$toStO* z^bF$^CZ~HjvmSOVgJqd>Io1*R|8?zu=ZkWcf+sN3I=HV*iYL{R7CdtQ_k=$DVrU4v zIN-}_js&mMlQt~fn`*X#1#~54WxG;5ofez zuIHMa8T75EV3x<7nh`vWl>=wKjds{ofxF+GVl@JXe~5DUo8Ej=XYl4vp?S@M`_KK{ z-(Tm>uYS)j*B!0=&)jY6Uvk&&NSuGKwZGlHI(fRdlRYl~zA_iwmA zI)oLk@ZfnzzTgRED+7xkMrbM5{&pzh-^B|afC=Rm0A#r$rL(r6BKa&E^k$JUTAZE5bG;f}K*q3&dN?&rkVj?5=5 diff --git a/bin/resources/ko/cemu.mo b/bin/resources/ko/cemu.mo index 63d82220c256cda72cbc9cf550ff5f36d8da6bb4..b812df970a34b41a6d2407c9ec4771adadd6a5db 100644 GIT binary patch delta 19394 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 D^s~21 diff --git a/bin/resources/ru/cemu.mo b/bin/resources/ru/cemu.mo index 619ba6783440be10ac2b2c0c77cda8523926e8da..4ff04e2bf7ba65f396cd0c2f640e8bc7df3c35cf 100644 GIT binary patch delta 22957 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 C7n9Kd From 573c98b2f80826c2bf0a9994c4e7d1f0950b4dc7 Mon Sep 17 00:00:00 2001 From: Exzap <13877693+Exzap@users.noreply.github.com> Date: Fri, 23 Aug 2024 19:26:33 +0200 Subject: [PATCH 06/11] GfxPack: Workaround for invisible detail panel Fixes #1307 There is probably a better way to calculate the maximum width. But this suffices for now as a workaround --- src/gui/GraphicPacksWindow2.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/GraphicPacksWindow2.cpp b/src/gui/GraphicPacksWindow2.cpp index 29f4b865..c49cbeae 100644 --- a/src/gui/GraphicPacksWindow2.cpp +++ b/src/gui/GraphicPacksWindow2.cpp @@ -458,10 +458,10 @@ void GraphicPacksWindow2::OnTreeSelectionChanged(wxTreeEvent& event) m_shown_graphic_pack = gp; - m_graphic_pack_name->Wrap(m_graphic_pack_name->GetParent()->GetClientSize().GetWidth() - 10); + m_graphic_pack_name->Wrap(m_graphic_pack_name->GetParent()->GetClientSize().GetWidth() - 20); m_graphic_pack_name->GetGrandParent()->Layout(); - m_graphic_pack_description->Wrap(m_graphic_pack_description->GetParent()->GetClientSize().GetWidth() - 10); + m_graphic_pack_description->Wrap(m_graphic_pack_description->GetParent()->GetClientSize().GetWidth() - 20); m_graphic_pack_description->GetGrandParent()->Layout(); m_right_panel->FitInside(); From dc9d99b03b38f3cf427714ad1ebb4d6d29f645fa Mon Sep 17 00:00:00 2001 From: bl <147349656+squelchiee@users.noreply.github.com> Date: Sat, 24 Aug 2024 16:03:03 -0300 Subject: [PATCH 07/11] nn_fp: Implement GetMyComment and UpdateCommentAsync (#1173) --- src/Cafe/IOSU/legacy/iosu_fpd.cpp | 55 ++++++++++++++++++++++++++----- src/Cafe/IOSU/legacy/iosu_fpd.h | 2 ++ src/Cafe/OS/libs/nn_fp/nn_fp.cpp | 33 +++++++++++++++++++ src/Cemu/nex/nexFriends.cpp | 25 +++++++++++++- src/Cemu/nex/nexFriends.h | 7 +++- 5 files changed, 111 insertions(+), 11 deletions(-) diff --git a/src/Cafe/IOSU/legacy/iosu_fpd.cpp b/src/Cafe/IOSU/legacy/iosu_fpd.cpp index aca1a332..28d248ae 100644 --- a/src/Cafe/IOSU/legacy/iosu_fpd.cpp +++ b/src/Cafe/IOSU/legacy/iosu_fpd.cpp @@ -511,6 +511,8 @@ namespace iosu return CallHandler_GetBlackList(fpdClient, vecIn, numVecIn, vecOut, numVecOut); case FPD_REQUEST_ID::GetFriendListEx: return CallHandler_GetFriendListEx(fpdClient, vecIn, numVecIn, vecOut, numVecOut); + case FPD_REQUEST_ID::UpdateCommentAsync: + return CallHandler_UpdateCommentAsync(fpdClient, vecIn, numVecIn, vecOut, numVecOut); case FPD_REQUEST_ID::UpdatePreferenceAsync: return CallHandler_UpdatePreferenceAsync(fpdClient, vecIn, numVecIn, vecOut, numVecOut); case FPD_REQUEST_ID::AddFriendRequestByPlayRecordAsync: @@ -719,18 +721,23 @@ namespace iosu nnResult CallHandler_GetMyComment(FPDClient* fpdClient, IPCIoctlVector* vecIn, uint32 numVecIn, IPCIoctlVector* vecOut, uint32 numVecOut) { - static constexpr uint32 MY_COMMENT_LENGTH = 0x12; // are comments utf16? Buffer length is 0x24 if(numVecIn != 0 || numVecOut != 1) return FPResult_InvalidIPCParam; - if(vecOut->size != MY_COMMENT_LENGTH*sizeof(uint16be)) - { - cemuLog_log(LogType::Force, "GetMyComment: Unexpected output size"); - return FPResult_InvalidIPCParam; - } std::basic_string myComment; - myComment.resize(MY_COMMENT_LENGTH); - memcpy(vecOut->basePhys.GetPtr(), myComment.data(), MY_COMMENT_LENGTH*sizeof(uint16be)); - return 0; + if(g_fpd.nexFriendSession) + { + if(vecOut->size != MY_COMMENT_LENGTH * sizeof(uint16be)) + { + cemuLog_log(LogType::Force, "GetMyComment: Unexpected output size"); + return FPResult_InvalidIPCParam; + } + nexComment myNexComment; + g_fpd.nexFriendSession->getMyComment(myNexComment); + myComment = StringHelpers::FromUtf8(myNexComment.commentString); + } + myComment.insert(0, 1, '\0'); + memcpy(vecOut->basePhys.GetPtr(), myComment.c_str(), MY_COMMENT_LENGTH * sizeof(uint16be)); + return FPResult_Ok; } nnResult CallHandler_GetMyPreference(FPDClient* fpdClient, IPCIoctlVector* vecIn, uint32 numVecIn, IPCIoctlVector* vecOut, uint32 numVecOut) @@ -1143,6 +1150,36 @@ namespace iosu return FPResult_Ok; } + nnResult CallHandler_UpdateCommentAsync(FPDClient* fpdClient, IPCIoctlVector* vecIn, uint32 numVecIn, IPCIoctlVector* vecOut, uint32 numVecOut) + { + std::unique_lock _l(g_fpd.mtxFriendSession); + if (numVecIn != 1 || numVecOut != 0) + return FPResult_InvalidIPCParam; + if (!g_fpd.nexFriendSession) + return FPResult_RequestFailed; + uint32 messageLength = vecIn[0].size / sizeof(uint16be); + DeclareInputPtr(newComment, uint16be, messageLength, 0); + if (messageLength == 0 || newComment[messageLength-1] != 0) + { + cemuLog_log(LogType::Force, "UpdateCommentAsync: Message must contain at least a null-termination character"); + return FPResult_InvalidIPCParam; + } + IPCCommandBody* cmd = ServiceCallDelayCurrentResponse(); + + auto utf8_comment = StringHelpers::ToUtf8(newComment, messageLength); + nexComment temporaryComment; + temporaryComment.ukn0 = 0; + temporaryComment.commentString = utf8_comment; + temporaryComment.ukn1 = 0; + + g_fpd.nexFriendSession->updateCommentAsync(temporaryComment, [cmd](NexFriends::RpcErrorCode result) { + if (result != NexFriends::ERR_NONE) + return ServiceCallAsyncRespond(cmd, FPResult_RequestFailed); + ServiceCallAsyncRespond(cmd, FPResult_Ok); + }); + return FPResult_Ok; + } + nnResult CallHandler_UpdatePreferenceAsync(FPDClient* fpdClient, IPCIoctlVector* vecIn, uint32 numVecIn, IPCIoctlVector* vecOut, uint32 numVecOut) { std::unique_lock _l(g_fpd.mtxFriendSession); diff --git a/src/Cafe/IOSU/legacy/iosu_fpd.h b/src/Cafe/IOSU/legacy/iosu_fpd.h index 0a6f0885..b1c30765 100644 --- a/src/Cafe/IOSU/legacy/iosu_fpd.h +++ b/src/Cafe/IOSU/legacy/iosu_fpd.h @@ -212,6 +212,7 @@ namespace iosu static const int RELATIONSHIP_FRIEND = 3; static const int GAMEMODE_MAX_MESSAGE_LENGTH = 0x80; // limit includes null-terminator character, so only 0x7F actual characters can be used + static const int MY_COMMENT_LENGTH = 0x12; enum class FPD_REQUEST_ID { @@ -245,6 +246,7 @@ namespace iosu CheckSettingStatusAsync = 0x7596, GetFriendListEx = 0x75F9, GetFriendRequestListEx = 0x76C1, + UpdateCommentAsync = 0x7726, UpdatePreferenceAsync = 0x7727, RemoveFriendAsync = 0x7789, DeleteFriendFlagsAsync = 0x778A, diff --git a/src/Cafe/OS/libs/nn_fp/nn_fp.cpp b/src/Cafe/OS/libs/nn_fp/nn_fp.cpp index fc757ea9..86ca4708 100644 --- a/src/Cafe/OS/libs/nn_fp/nn_fp.cpp +++ b/src/Cafe/OS/libs/nn_fp/nn_fp.cpp @@ -464,6 +464,14 @@ namespace nn return ipcCtx->Submit(std::move(ipcCtx)); } + nnResult GetMyPlayingGame(iosu::fpd::GameKey* myPlayingGame) + { + FP_API_BASE(); + auto ipcCtx = std::make_unique(iosu::fpd::FPD_REQUEST_ID::GetMyPlayingGame); + ipcCtx->AddOutput(myPlayingGame, sizeof(iosu::fpd::GameKey)); + return ipcCtx->Submit(std::move(ipcCtx)); + } + nnResult GetMyPreference(iosu::fpd::FPDPreference* myPreference) { FP_API_BASE(); @@ -472,6 +480,14 @@ namespace nn return ipcCtx->Submit(std::move(ipcCtx)); } + nnResult GetMyComment(uint16be* myComment) + { + FP_API_BASE(); + auto ipcCtx = std::make_unique(iosu::fpd::FPD_REQUEST_ID::GetMyComment); + ipcCtx->AddOutput(myComment, iosu::fpd::MY_COMMENT_LENGTH * sizeof(uint16be)); + return ipcCtx->Submit(std::move(ipcCtx)); + } + nnResult GetMyMii(FFLData_t* fflData) { FP_API_BASE(); @@ -607,6 +623,20 @@ namespace nn return resultBuf != 0 ? 1 : 0; } + nnResult UpdateCommentAsync(uint16be* newComment, void* funcPtr, void* customParam) + { + FP_API_BASE(); + auto ipcCtx = std::make_unique(iosu::fpd::FPD_REQUEST_ID::UpdateCommentAsync); + uint32 commentLen = CafeStringHelpers::Length(newComment, iosu::fpd::MY_COMMENT_LENGTH-1); + if (commentLen >= iosu::fpd::MY_COMMENT_LENGTH-1) + { + cemuLog_log(LogType::Force, "UpdateCommentAsync: message too long"); + return FPResult_InvalidIPCParam; + } + ipcCtx->AddInput(newComment, sizeof(uint16be) * commentLen + 2); + return ipcCtx->SubmitAsync(std::move(ipcCtx), funcPtr, customParam); + } + nnResult UpdatePreferenceAsync(iosu::fpd::FPDPreference* newPreference, void* funcPtr, void* customParam) { FP_API_BASE(); @@ -763,7 +793,9 @@ namespace nn cafeExportRegisterFunc(GetMyAccountId, "nn_fp", "GetMyAccountId__Q2_2nn2fpFPc", LogType::NN_FP); cafeExportRegisterFunc(GetMyScreenName, "nn_fp", "GetMyScreenName__Q2_2nn2fpFPw", LogType::NN_FP); cafeExportRegisterFunc(GetMyMii, "nn_fp", "GetMyMii__Q2_2nn2fpFP12FFLStoreData", LogType::NN_FP); + cafeExportRegisterFunc(GetMyPlayingGame, "nn_fp", "GetMyPlayingGame__Q2_2nn2fpFPQ3_2nn2fp7GameKey", LogType::NN_FP); cafeExportRegisterFunc(GetMyPreference, "nn_fp", "GetMyPreference__Q2_2nn2fpFPQ3_2nn2fp10Preference", LogType::NN_FP); + cafeExportRegisterFunc(GetMyComment, "nn_fp", "GetMyComment__Q2_2nn2fpFPQ3_2nn2fp7Comment", LogType::NN_FP); cafeExportRegisterFunc(GetFriendAccountId, "nn_fp", "GetFriendAccountId__Q2_2nn2fpFPA17_cPCUiUi", LogType::NN_FP); cafeExportRegisterFunc(GetFriendScreenName, "nn_fp", "GetFriendScreenName__Q2_2nn2fpFPA11_wPCUiUibPUc", LogType::NN_FP); @@ -774,6 +806,7 @@ namespace nn cafeExportRegisterFunc(CheckSettingStatusAsync, "nn_fp", "CheckSettingStatusAsync__Q2_2nn2fpFPUcPFQ2_2nn6ResultPv_vPv", LogType::NN_FP); cafeExportRegisterFunc(IsPreferenceValid, "nn_fp", "IsPreferenceValid__Q2_2nn2fpFv", LogType::NN_FP); + cafeExportRegisterFunc(UpdateCommentAsync, "nn_fp", "UpdateCommentAsync__Q2_2nn2fpFPCwPFQ2_2nn6ResultPv_vPv", LogType::NN_FP); cafeExportRegisterFunc(UpdatePreferenceAsync, "nn_fp", "UpdatePreferenceAsync__Q2_2nn2fpFPCQ3_2nn2fp10PreferencePFQ2_2nn6ResultPv_vPv", LogType::NN_FP); cafeExportRegisterFunc(GetRequestBlockSettingAsync, "nn_fp", "GetRequestBlockSettingAsync__Q2_2nn2fpFPUcPCUiUiPFQ2_2nn6ResultPv_vPv", LogType::NN_FP); diff --git a/src/Cemu/nex/nexFriends.cpp b/src/Cemu/nex/nexFriends.cpp index 927418ca..36ba4a53 100644 --- a/src/Cemu/nex/nexFriends.cpp +++ b/src/Cemu/nex/nexFriends.cpp @@ -277,7 +277,8 @@ void NexFriends::handleResponse_getAllInformation(nexServiceResponse_t* response } NexFriends* session = (NexFriends*)nexFriends; session->myPreference = nexPrincipalPreference(&response->data); - nexComment comment(&response->data); + auto comment = nexComment(&response->data); + session->myComment = comment; if (response->data.hasReadOutOfBounds()) return; // acquire lock on lists @@ -391,6 +392,28 @@ void NexFriends::getMyPreference(nexPrincipalPreference& preference) preference = myPreference; } +bool NexFriends::updateCommentAsync(nexComment newComment, std::function cb) +{ + uint8 tempNexBufferArray[1024]; + nexPacketBuffer packetBuffer(tempNexBufferArray, sizeof(tempNexBufferArray), true); + newComment.writeData(&packetBuffer); + nexCon->callMethod( + NEX_PROTOCOL_FRIENDS_WIIU, 15, &packetBuffer, [this, cb, newComment](nexServiceResponse_t* response) -> void { + if (!response->isSuccessful) + return cb(NexFriends::ERR_RPC_FAILED); + this->myComment = newComment; + return cb(NexFriends::ERR_NONE); + }, + true); + // TEST + return true; +} + +void NexFriends::getMyComment(nexComment& comment) +{ + comment = myComment; +} + bool NexFriends::addProvisionalFriendByPidGuessed(uint32 principalId) { uint8 tempNexBufferArray[512]; diff --git a/src/Cemu/nex/nexFriends.h b/src/Cemu/nex/nexFriends.h index 1077b0d5..05cc433f 100644 --- a/src/Cemu/nex/nexFriends.h +++ b/src/Cemu/nex/nexFriends.h @@ -297,7 +297,9 @@ public: void writeData(nexPacketBuffer* pb) const override { - cemu_assert_unimplemented(); + pb->writeU8(ukn0); + pb->writeString(commentString.c_str()); + pb->writeU64(ukn1); } void readData(nexPacketBuffer* pb) override @@ -554,6 +556,7 @@ public: bool getFriendRequestByMessageId(nexFriendRequest& friendRequestData, bool* isIncoming, uint64 messageId); bool isOnline(); void getMyPreference(nexPrincipalPreference& preference); + void getMyComment(nexComment& comment); // asynchronous API (data has to be requested) bool addProvisionalFriend(char* name, std::function cb); @@ -565,6 +568,7 @@ public: void acceptFriendRequest(uint64 messageId, std::function cb); void deleteFriendRequest(uint64 messageId, std::function cb); // rejecting incoming friend request (differs from blocking friend requests) bool updatePreferencesAsync(const nexPrincipalPreference newPreferences, std::function cb); + bool updateCommentAsync(const nexComment newComment, std::function cb); void updateMyPresence(nexPresenceV2& myPresence); void setNotificationHandler(void(*notificationHandler)(NOTIFICATION_TYPE notificationType, uint32 pid)); @@ -619,6 +623,7 @@ private: // local friend state nexPresenceV2 myPresence; nexPrincipalPreference myPreference; + nexComment myComment; std::recursive_mutex mtx_lists; std::vector list_friends; From d7f39aab054a715e7b0481407298cbd654212fb9 Mon Sep 17 00:00:00 2001 From: Cemu-Language CI Date: Mon, 26 Aug 2024 09:16:11 +0000 Subject: [PATCH 08/11] Update translation files --- bin/resources/hu/cemu.mo | Bin 71267 -> 72404 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/bin/resources/hu/cemu.mo b/bin/resources/hu/cemu.mo index dd3d2fbc74157e457fac7fefe3356bdbfbbe9e11..51b00d083cc320a55615d50774d60c74f71108d5 100644 GIT binary patch delta 22802 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 delta 21762 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 From 1234e2c11808a97c76381f147e564d74f6ffbbd1 Mon Sep 17 00:00:00 2001 From: Exzap <13877693+Exzap@users.noreply.github.com> Date: Mon, 26 Aug 2024 11:43:38 +0200 Subject: [PATCH 09/11] Preparations for 2.1 (#1306) --- .github/getversion.cpp | 9 -- .github/workflows/build.yml | 66 ++++--------- .github/workflows/build_check.yml | 3 - .../workflows/deploy_experimental_release.yml | 93 ++++++++++++++++--- .../workflows/determine_release_version.yml | 74 +++++++++++++++ CMakeLists.txt | 27 +++--- src/Cafe/HW/Latte/Core/LatteShader.cpp | 2 +- src/Cafe/HW/Latte/Renderer/RendererShader.cpp | 6 +- .../Latte/Renderer/Vulkan/VulkanRenderer.cpp | 4 +- .../OS/libs/coreinit/coreinit_Spinlock.cpp | 2 +- src/Common/version.h | 29 ++---- src/config/CemuConfig.cpp | 2 + src/config/CemuConfig.h | 3 +- src/config/LaunchSettings.cpp | 6 +- src/gui/CemuUpdateWindow.cpp | 4 +- src/gui/DownloadGraphicPacksWindow.cpp | 2 +- src/gui/GeneralSettings2.cpp | 56 ++++++++--- src/gui/GeneralSettings2.h | 2 +- src/resource/cemu.rc | 6 +- 19 files changed, 261 insertions(+), 135 deletions(-) delete mode 100644 .github/getversion.cpp create mode 100644 .github/workflows/determine_release_version.yml diff --git a/.github/getversion.cpp b/.github/getversion.cpp deleted file mode 100644 index 469a796e..00000000 --- a/.github/getversion.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include "./../src/Common/version.h" - -// output current Cemu version for CI workflow. Do not modify -int main() -{ - printf("%d.%d", EMULATOR_VERSION_LEAD, EMULATOR_VERSION_MAJOR); - return 0; -} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9fb775e2..dd28ceb5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,10 +3,10 @@ name: Build Cemu on: workflow_call: inputs: - deploymode: + next_version_major: required: false type: string - experimentalversion: + next_version_minor: required: false type: string @@ -24,25 +24,17 @@ jobs: submodules: "recursive" fetch-depth: 0 - - name: Setup release mode parameters (for deploy) - if: ${{ inputs.deploymode == 'release' }} + - name: Setup release mode parameters run: | echo "BUILD_MODE=release" >> $GITHUB_ENV echo "BUILD_FLAGS=" >> $GITHUB_ENV echo "Build mode is release" - - name: Setup debug mode parameters (for continous build) - if: ${{ inputs.deploymode != 'release' }} + - name: Setup build flags for version + if: ${{ inputs.next_version_major != '' }} run: | - echo "BUILD_MODE=debug" >> $GITHUB_ENV - echo "BUILD_FLAGS=" >> $GITHUB_ENV - echo "Build mode is debug" - - - name: Setup version for experimental - if: ${{ inputs.experimentalversion != '' }} - run: | - echo "[INFO] Experimental version ${{ inputs.experimentalversion }}" - echo "BUILD_FLAGS=${{ env.BUILD_FLAGS }} -DEXPERIMENTAL_VERSION=${{ inputs.experimentalversion }}" >> $GITHUB_ENV + echo "[INFO] Version ${{ inputs.next_version_major }}.${{ inputs.next_version_minor }}" + echo "BUILD_FLAGS=${{ env.BUILD_FLAGS }} -DEMULATOR_VERSION_MAJOR=${{ inputs.next_version_major }} -DEMULATOR_VERSION_MINOR=${{ inputs.next_version_minor }}" >> $GITHUB_ENV - name: "Install system dependencies" run: | @@ -81,12 +73,10 @@ jobs: cmake --build build - name: Prepare artifact - if: ${{ inputs.deploymode == 'release' }} run: mv bin/Cemu_release bin/Cemu - name: Upload artifact uses: actions/upload-artifact@v4 - if: ${{ inputs.deploymode == 'release' }} with: name: cemu-bin-linux-x64 path: ./bin/Cemu @@ -128,24 +118,17 @@ jobs: with: submodules: "recursive" - - name: Setup release mode parameters (for deploy) - if: ${{ inputs.deploymode == 'release' }} + - name: Setup release mode parameters run: | echo "BUILD_MODE=release" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append echo "BUILD_FLAGS=" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append echo "Build mode is release" - - - name: Setup debug mode parameters (for continous build) - if: ${{ inputs.deploymode != 'release' }} + + - name: Setup build flags for version + if: ${{ inputs.next_version_major != '' }} run: | - echo "BUILD_MODE=debug" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - echo "BUILD_FLAGS=" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - echo "Build mode is debug" - - name: Setup version for experimental - if: ${{ inputs.experimentalversion != '' }} - run: | - echo "[INFO] Experimental version ${{ inputs.experimentalversion }}" - echo "BUILD_FLAGS=${{ env.BUILD_FLAGS }} -DEXPERIMENTAL_VERSION=${{ inputs.experimentalversion }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + echo "[INFO] Version ${{ inputs.next_version_major }}.${{ inputs.next_version_minor }}" + echo "BUILD_FLAGS=${{ env.BUILD_FLAGS }} -DEMULATOR_VERSION_MAJOR=${{ inputs.next_version_major }} -DEMULATOR_VERSION_MINOR=${{ inputs.next_version_minor }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - name: "Setup cmake" uses: jwlawson/actions-setup-cmake@v2 @@ -184,12 +167,10 @@ jobs: cmake --build . --config ${{ env.BUILD_MODE }} - name: Prepare artifact - if: ${{ inputs.deploymode == 'release' }} run: Rename-Item bin/Cemu_release.exe Cemu.exe - name: Upload artifact uses: actions/upload-artifact@v4 - if: ${{ inputs.deploymode == 'release' }} with: name: cemu-bin-windows-x64 path: ./bin/Cemu.exe @@ -202,24 +183,17 @@ jobs: with: submodules: "recursive" - - name: Setup release mode parameters (for deploy) - if: ${{ inputs.deploymode == 'release' }} + - name: Setup release mode parameters run: | echo "BUILD_MODE=release" >> $GITHUB_ENV echo "BUILD_FLAGS=" >> $GITHUB_ENV echo "Build mode is release" - - name: Setup debug mode parameters (for continous build) - if: ${{ inputs.deploymode != 'release' }} + + - name: Setup build flags for version + if: ${{ inputs.next_version_major != '' }} run: | - echo "BUILD_MODE=debug" >> $GITHUB_ENV - echo "BUILD_FLAGS=" >> $GITHUB_ENV - echo "Build mode is debug" - - - name: Setup version for experimental - if: ${{ inputs.experimentalversion != '' }} - run: | - echo "[INFO] Experimental version ${{ inputs.experimentalversion }}" - echo "BUILD_FLAGS=${{ env.BUILD_FLAGS }} -DEXPERIMENTAL_VERSION=${{ inputs.experimentalversion }}" >> $GITHUB_ENV + echo "[INFO] Version ${{ inputs.next_version_major }}.${{ inputs.next_version_minor }}" + echo "BUILD_FLAGS=${{ env.BUILD_FLAGS }} -DEMULATOR_VERSION_MAJOR=${{ inputs.next_version_major }} -DEMULATOR_VERSION_MINOR=${{ inputs.next_version_minor }}" >> $GITHUB_ENV - name: "Install system dependencies" run: | @@ -275,7 +249,6 @@ jobs: cmake --build build - name: Prepare artifact - if: ${{ inputs.deploymode == 'release' }} run: | mkdir bin/Cemu_app mv bin/Cemu_release.app bin/Cemu_app/Cemu.app @@ -289,7 +262,6 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v4 - if: ${{ inputs.deploymode == 'release' }} with: name: cemu-bin-macos-x64 path: ./bin/Cemu.dmg diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml index 49ef79e9..5d24b0c6 100644 --- a/.github/workflows/build_check.yml +++ b/.github/workflows/build_check.yml @@ -16,6 +16,3 @@ on: jobs: build: uses: ./.github/workflows/build.yml - with: - deploymode: release - experimentalversion: 999999 diff --git a/.github/workflows/deploy_experimental_release.yml b/.github/workflows/deploy_experimental_release.yml index a8c5ec53..97e0c69e 100644 --- a/.github/workflows/deploy_experimental_release.yml +++ b/.github/workflows/deploy_experimental_release.yml @@ -1,20 +1,83 @@ name: Deploy experimental release on: workflow_dispatch: + inputs: + changelog0: + description: 'Enter the changelog lines for this release. Each line is a feature / bullet point. Do not use dash.' + required: true + type: string + changelog1: + description: 'Feature 2' + required: false + type: string + changelog2: + description: 'Feature 3' + required: false + type: string + changelog3: + description: 'Feature 4' + required: false + type: string + changelog4: + description: 'Feature 5' + required: false + type: string + changelog5: + description: 'Feature 6' + required: false + type: string + changelog6: + description: 'Feature 7' + required: false + type: string + changelog7: + description: 'Feature 8' + required: false + type: string + changelog8: + description: 'Feature 9' + required: false + type: string + changelog9: + description: 'Feature 10' + required: false + type: string jobs: + calculate-version: + name: Calculate Version + uses: ./.github/workflows/determine_release_version.yml call-release-build: uses: ./.github/workflows/build.yml + needs: calculate-version with: - deploymode: release - experimentalversion: ${{ github.run_number }} + next_version_major: ${{ needs.calculate-version.outputs.next_version_major }} + next_version_minor: ${{ needs.calculate-version.outputs.next_version_minor }} deploy: name: Deploy experimental release runs-on: ubuntu-22.04 - needs: call-release-build + needs: [call-release-build, calculate-version] steps: - - uses: actions/checkout@v3 - + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Generate changelog + id: generate_changelog + run: | + CHANGELOG="" + if [ -n "${{ github.event.inputs.changelog0 }}" ]; then CHANGELOG="$CHANGELOG- ${{ github.event.inputs.changelog0 }}\n"; fi + if [ -n "${{ github.event.inputs.changelog1 }}" ]; then CHANGELOG="$CHANGELOG- ${{ github.event.inputs.changelog1 }}\n"; fi + if [ -n "${{ github.event.inputs.changelog2 }}" ]; then CHANGELOG="$CHANGELOG- ${{ github.event.inputs.changelog2 }}\n"; fi + if [ -n "${{ github.event.inputs.changelog3 }}" ]; then CHANGELOG="$CHANGELOG- ${{ github.event.inputs.changelog3 }}\n"; fi + if [ -n "${{ github.event.inputs.changelog4 }}" ]; then CHANGELOG="$CHANGELOG- ${{ github.event.inputs.changelog4 }}\n"; fi + if [ -n "${{ github.event.inputs.changelog5 }}" ]; then CHANGELOG="$CHANGELOG- ${{ github.event.inputs.changelog5 }}\n"; fi + if [ -n "${{ github.event.inputs.changelog6 }}" ]; then CHANGELOG="$CHANGELOG- ${{ github.event.inputs.changelog6 }}\n"; fi + if [ -n "${{ github.event.inputs.changelog7 }}" ]; then CHANGELOG="$CHANGELOG- ${{ github.event.inputs.changelog7 }}\n"; fi + if [ -n "${{ github.event.inputs.changelog8 }}" ]; then CHANGELOG="$CHANGELOG- ${{ github.event.inputs.changelog8 }}\n"; fi + if [ -n "${{ github.event.inputs.changelog9 }}" ]; then CHANGELOG="$CHANGELOG- ${{ github.event.inputs.changelog9 }}\n"; fi + echo -e "$CHANGELOG" + echo "RELEASE_BODY=$CHANGELOG" >> $GITHUB_ENV - uses: actions/download-artifact@v4 with: name: cemu-bin-linux-x64 @@ -40,15 +103,13 @@ jobs: mkdir upload sudo apt install zip - - name: Get version + - name: Set version dependent vars run: | - echo "Experimental version: ${{ github.run_number }}" - ls - gcc -o getversion .github/getversion.cpp - ./getversion - echo "Cemu CI version: $(./getversion)" - echo "CEMU_FOLDER_NAME=Cemu_$(./getversion)-${{ github.run_number }}" >> $GITHUB_ENV - echo "CEMU_VERSION=$(./getversion)-${{ github.run_number }}" >> $GITHUB_ENV + echo "Version: ${{ needs.calculate-version.outputs.next_version }}" + echo "CEMU_FOLDER_NAME=Cemu_${{ needs.calculate-version.outputs.next_version }}" + echo "CEMU_VERSION=${{ needs.calculate-version.outputs.next_version }}" + echo "CEMU_FOLDER_NAME=Cemu_${{ needs.calculate-version.outputs.next_version }}" >> $GITHUB_ENV + echo "CEMU_VERSION=${{ needs.calculate-version.outputs.next_version }}" >> $GITHUB_ENV - name: Create release from windows-bin run: | @@ -83,4 +144,8 @@ jobs: wget -O ghr.tar.gz https://github.com/tcnksm/ghr/releases/download/v0.15.0/ghr_v0.15.0_linux_amd64.tar.gz tar xvzf ghr.tar.gz; rm ghr.tar.gz echo "[INFO] Release tag: v${{ env.CEMU_VERSION }}" - ghr_v0.15.0_linux_amd64/ghr -prerelease -t ${{ secrets.GITHUB_TOKEN }} -n "Cemu ${{ env.CEMU_VERSION }} (Experimental)" -b "Cemu experimental release" "v${{ env.CEMU_VERSION }}" ./upload + CHANGELOG_UNESCAPED=$(printf "%s\n" "${{ env.RELEASE_BODY }}" | sed 's/\\n/\n/g') + RELEASE_BODY=$(printf "%s\n%s" \ + "**Changelog:**" \ + "$CHANGELOG_UNESCAPED") + ghr_v0.15.0_linux_amd64/ghr -draft -t ${{ secrets.GITHUB_TOKEN }} -n "Cemu ${{ env.CEMU_VERSION }}" -b "$RELEASE_BODY" "v${{ env.CEMU_VERSION }}" ./upload diff --git a/.github/workflows/determine_release_version.yml b/.github/workflows/determine_release_version.yml new file mode 100644 index 00000000..be606941 --- /dev/null +++ b/.github/workflows/determine_release_version.yml @@ -0,0 +1,74 @@ +name: Calculate Next Version from release history + +on: + workflow_dispatch: + workflow_call: + outputs: + next_version: + description: "The next semantic version" + value: ${{ jobs.calculate-version.outputs.next_version }} + next_version_major: + description: "The next semantic version (major)" + value: ${{ jobs.calculate-version.outputs.next_version_major }} + next_version_minor: + description: "The next semantic version (minor)" + value: ${{ jobs.calculate-version.outputs.next_version_minor }} + +jobs: + calculate-version: + runs-on: ubuntu-latest + outputs: + next_version: ${{ steps.calculate_next_version.outputs.next_version }} + next_version_major: ${{ steps.calculate_next_version.outputs.next_version_major }} + next_version_minor: ${{ steps.calculate_next_version.outputs.next_version_minor }} + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Get all releases + id: get_all_releases + run: | + # Fetch all releases and check for API errors + RESPONSE=$(curl -s -o response.json -w "%{http_code}" "https://api.github.com/repos/${{ github.repository }}/releases?per_page=100") + if [ "$RESPONSE" -ne 200 ]; then + echo "Failed to fetch releases. HTTP status: $RESPONSE" + cat response.json + exit 1 + fi + + # Extract and sort tags + ALL_TAGS=$(jq -r '.[].tag_name' response.json | grep -E '^v[0-9]+\.[0-9]+(-[0-9]+)?$' | sed 's/-.*//' | sort -V | tail -n 1) + + # Exit if no tags were found + if [ -z "$ALL_TAGS" ]; then + echo "No valid tags found." + exit 1 + fi + + echo "::set-output name=tag::$ALL_TAGS" + # echo "tag=$ALL_TAGS" >> $GITHUB_STATE + + - name: Calculate next semver minor + id: calculate_next_version + run: | + LATEST_VERSION=${{ steps.get_all_releases.outputs.tag }} + + # strip 'v' prefix and split into major.minor + LATEST_VERSION=${LATEST_VERSION//v/} + IFS='.' read -r -a VERSION_PARTS <<< "$LATEST_VERSION" + + MAJOR=${VERSION_PARTS[0]} + MINOR=${VERSION_PARTS[1]} + + # increment the minor version + MINOR=$((MINOR + 1)) + + NEXT_VERSION="${MAJOR}.${MINOR}" + + echo "Major: $MAJOR" + echo "Minor: $MINOR" + + echo "Next version: $NEXT_VERSION" + echo "::set-output name=next_version::$NEXT_VERSION" + echo "::set-output name=next_version_major::$MAJOR" + echo "::set-output name=next_version_minor::$MINOR" \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 48e18637..80ac6cf0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,18 +2,19 @@ cmake_minimum_required(VERSION 3.21.1) option(ENABLE_VCPKG "Enable the vcpkg package manager" ON) option(MACOS_BUNDLE "The executable when built on macOS will be created as an application bundle" OFF) -set(EXPERIMENTAL_VERSION "" CACHE STRING "") # used by CI script to set experimental version -if (EXPERIMENTAL_VERSION) - add_definitions(-DEMULATOR_VERSION_MINOR=${EXPERIMENTAL_VERSION}) - execute_process( - COMMAND git log --format=%h -1 - WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} - OUTPUT_VARIABLE GIT_HASH - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - add_definitions(-DEMULATOR_HASH=${GIT_HASH}) -endif() +# used by CI script to set version: +set(EMULATOR_VERSION_MAJOR "0" CACHE STRING "") +set(EMULATOR_VERSION_MINOR "0" CACHE STRING "") +set(EMULATOR_VERSION_PATCH "0" CACHE STRING "") + +execute_process( + COMMAND git log --format=%h -1 + WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} + OUTPUT_VARIABLE GIT_HASH + OUTPUT_STRIP_TRAILING_WHITESPACE +) +add_definitions(-DEMULATOR_HASH=${GIT_HASH}) if (ENABLE_VCPKG) # check if vcpkg is shallow and unshallow it if necessary @@ -62,6 +63,10 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) add_compile_definitions($<$:CEMU_DEBUG_ASSERT>) # if build type is debug, set CEMU_DEBUG_ASSERT +add_definitions(-DEMULATOR_VERSION_MAJOR=${EMULATOR_VERSION_MAJOR}) +add_definitions(-DEMULATOR_VERSION_MINOR=${EMULATOR_VERSION_MINOR}) +add_definitions(-DEMULATOR_VERSION_PATCH=${EMULATOR_VERSION_PATCH}) + set_property(GLOBAL PROPERTY USE_FOLDERS ON) # enable link time optimization for release builds diff --git a/src/Cafe/HW/Latte/Core/LatteShader.cpp b/src/Cafe/HW/Latte/Core/LatteShader.cpp index b59702cd..77f16468 100644 --- a/src/Cafe/HW/Latte/Core/LatteShader.cpp +++ b/src/Cafe/HW/Latte/Core/LatteShader.cpp @@ -524,7 +524,7 @@ void LatteSHRC_UpdateGSBaseHash(uint8* geometryShaderPtr, uint32 geometryShaderS // update hash from geometry shader data uint64 gsHash1 = 0; uint64 gsHash2 = 0; - _calculateShaderProgramHash((uint32*)geometryShaderPtr, geometryShaderSize, &hashCacheVS, &gsHash1, &gsHash2); + _calculateShaderProgramHash((uint32*)geometryShaderPtr, geometryShaderSize, &hashCacheGS, &gsHash1, &gsHash2); // get geometry shader uint64 gsHash = gsHash1 + gsHash2; gsHash += (uint64)_activeVertexShader->ringParameterCount; diff --git a/src/Cafe/HW/Latte/Renderer/RendererShader.cpp b/src/Cafe/HW/Latte/Renderer/RendererShader.cpp index f66dc9f4..23c8d0ea 100644 --- a/src/Cafe/HW/Latte/Renderer/RendererShader.cpp +++ b/src/Cafe/HW/Latte/Renderer/RendererShader.cpp @@ -12,9 +12,9 @@ uint32 RendererShader::GeneratePrecompiledCacheId() v += (uint32)(*s); s++; } - v += (EMULATOR_VERSION_LEAD * 1000000u); - v += (EMULATOR_VERSION_MAJOR * 10000u); - v += (EMULATOR_VERSION_MINOR * 100u); + v += (EMULATOR_VERSION_MAJOR * 1000000u); + v += (EMULATOR_VERSION_MINOR * 10000u); + v += (EMULATOR_VERSION_PATCH * 100u); // settings that can influence shaders v += (uint32)g_current_game_profile->GetAccurateShaderMul() * 133; diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp index fb54a803..f464c7a3 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp @@ -125,7 +125,7 @@ std::vector VulkanRenderer::GetDevices() VkApplicationInfo app_info{}; app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; app_info.pApplicationName = EMULATOR_NAME; - app_info.applicationVersion = VK_MAKE_VERSION(EMULATOR_VERSION_LEAD, EMULATOR_VERSION_MAJOR, EMULATOR_VERSION_MINOR); + app_info.applicationVersion = VK_MAKE_VERSION(EMULATOR_VERSION_MAJOR, EMULATOR_VERSION_MINOR, EMULATOR_VERSION_PATCH); app_info.pEngineName = EMULATOR_NAME; app_info.engineVersion = app_info.applicationVersion; app_info.apiVersion = apiVersion; @@ -339,7 +339,7 @@ VulkanRenderer::VulkanRenderer() VkApplicationInfo app_info{}; app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; app_info.pApplicationName = EMULATOR_NAME; - app_info.applicationVersion = VK_MAKE_VERSION(EMULATOR_VERSION_LEAD, EMULATOR_VERSION_MAJOR, EMULATOR_VERSION_MINOR); + app_info.applicationVersion = VK_MAKE_VERSION(EMULATOR_VERSION_MAJOR, EMULATOR_VERSION_MINOR, EMULATOR_VERSION_PATCH); app_info.pEngineName = EMULATOR_NAME; app_info.engineVersion = app_info.applicationVersion; app_info.apiVersion = apiVersion; diff --git a/src/Cafe/OS/libs/coreinit/coreinit_Spinlock.cpp b/src/Cafe/OS/libs/coreinit/coreinit_Spinlock.cpp index 4c55c2b0..5201d441 100644 --- a/src/Cafe/OS/libs/coreinit/coreinit_Spinlock.cpp +++ b/src/Cafe/OS/libs/coreinit/coreinit_Spinlock.cpp @@ -140,7 +140,7 @@ namespace coreinit // we are in single-core mode and the lock will never be released unless we let other threads resume work // to avoid an infinite loop we have no choice but to yield the thread even it is in an uninterruptible state if( !OSIsInterruptEnabled() ) - cemuLog_log(LogType::APIErrors, "OSUninterruptibleSpinLock_Acquire(): Lock is occupied which requires a wait but current thread is already in an uninterruptible state (Avoid cascaded OSDisableInterrupts and/or OSUninterruptibleSpinLock)"); + cemuLog_logOnce(LogType::APIErrors, "OSUninterruptibleSpinLock_Acquire(): Lock is occupied which requires a wait but current thread is already in an uninterruptible state (Avoid cascaded OSDisableInterrupts and/or OSUninterruptibleSpinLock)"); while (!spinlock->ownerThread.atomic_compare_exchange(nullptr, currentThread)) { OSYieldThread(); diff --git a/src/Common/version.h b/src/Common/version.h index 8c08f238..36925a52 100644 --- a/src/Common/version.h +++ b/src/Common/version.h @@ -1,36 +1,19 @@ #ifndef EMULATOR_NAME #define EMULATOR_NAME "Cemu" -#define EMULATOR_VERSION_LEAD 2 -#define EMULATOR_VERSION_MAJOR 0 -// the minor version is used for experimental builds to indicate the build index. Set by command line option from CI build script -// if zero, the version text will be constructed as LEAD.MAJOR, otherwise as LEAD.MAJOR-MINOR - -#if defined(EMULATOR_VERSION_MINOR) && EMULATOR_VERSION_MINOR == 0 #define EMULATOR_VERSION_SUFFIX "" -#else -#define EMULATOR_VERSION_SUFFIX " (experimental)" -#endif - -#ifndef EMULATOR_VERSION_MINOR -#define EMULATOR_VERSION_MINOR 0 -#endif #define _XSTRINGFY(s) _STRINGFY(s) #define _STRINGFY(s) #s -#if EMULATOR_VERSION_MINOR != 0 -#if defined(EMULATOR_HASH) && EMULATOR_VERSION_MINOR == 999999 -#define BUILD_VERSION_WITH_NAME_STRING (EMULATOR_NAME " " _XSTRINGFY(EMULATOR_VERSION_LEAD) "." _XSTRINGFY(EMULATOR_VERSION_MAJOR) "-" _XSTRINGFY(EMULATOR_HASH) EMULATOR_VERSION_SUFFIX) -#define BUILD_VERSION_STRING (_XSTRINGFY(EMULATOR_VERSION_LEAD) "." _XSTRINGFY(EMULATOR_VERSION_MAJOR) "-" _XSTRINGFY(EMULATOR_HASH) EMULATOR_VERSION_SUFFIX) +#if EMULATOR_VERSION_MAJOR != 0 +#define BUILD_VERSION_WITH_NAME_STRING (EMULATOR_NAME " " _XSTRINGFY(EMULATOR_VERSION_MAJOR) "." _XSTRINGFY(EMULATOR_VERSION_MINOR) EMULATOR_VERSION_SUFFIX) +#define BUILD_VERSION_STRING (_XSTRINGFY(EMULATOR_VERSION_MAJOR) "." _XSTRINGFY(EMULATOR_VERSION_MINOR) EMULATOR_VERSION_SUFFIX) #else -#define BUILD_VERSION_WITH_NAME_STRING (EMULATOR_NAME " " _XSTRINGFY(EMULATOR_VERSION_LEAD) "." _XSTRINGFY(EMULATOR_VERSION_MAJOR) "-" _XSTRINGFY(EMULATOR_VERSION_MINOR) EMULATOR_VERSION_SUFFIX) -#define BUILD_VERSION_STRING (_XSTRINGFY(EMULATOR_VERSION_LEAD) "." _XSTRINGFY(EMULATOR_VERSION_MAJOR) "-" _XSTRINGFY(EMULATOR_VERSION_MINOR) EMULATOR_VERSION_SUFFIX) -#endif -#else -#define BUILD_VERSION_STRING (_XSTRINGFY(EMULATOR_VERSION_LEAD) "." _XSTRINGFY(EMULATOR_VERSION_MAJOR) EMULATOR_VERSION_SUFFIX) -#define BUILD_VERSION_WITH_NAME_STRING (EMULATOR_NAME " " _XSTRINGFY(EMULATOR_VERSION_LEAD) "." _XSTRINGFY(EMULATOR_VERSION_MAJOR) EMULATOR_VERSION_SUFFIX) +// no version provided. Only show commit hash +#define BUILD_VERSION_STRING (_XSTRINGFY(EMULATOR_HASH) EMULATOR_VERSION_SUFFIX) +#define BUILD_VERSION_WITH_NAME_STRING (EMULATOR_NAME " " _XSTRINGFY(EMULATOR_HASH) EMULATOR_VERSION_SUFFIX) #endif #endif diff --git a/src/config/CemuConfig.cpp b/src/config/CemuConfig.cpp index 338392dd..e7920e84 100644 --- a/src/config/CemuConfig.cpp +++ b/src/config/CemuConfig.cpp @@ -38,6 +38,7 @@ void CemuConfig::Load(XMLConfigParser& parser) fullscreen_menubar = parser.get("fullscreen_menubar", false); feral_gamemode = parser.get("feral_gamemode", false); check_update = parser.get("check_update", check_update); + receive_untested_updates = parser.get("receive_untested_updates", check_update); save_screenshot = parser.get("save_screenshot", save_screenshot); did_show_vulkan_warning = parser.get("vk_warning", did_show_vulkan_warning); did_show_graphic_pack_download = parser.get("gp_download", did_show_graphic_pack_download); @@ -360,6 +361,7 @@ void CemuConfig::Save(XMLConfigParser& parser) config.set("fullscreen_menubar", fullscreen_menubar); config.set("feral_gamemode", feral_gamemode); config.set("check_update", check_update); + config.set("receive_untested_updates", receive_untested_updates); config.set("save_screenshot", save_screenshot); config.set("vk_warning", did_show_vulkan_warning); config.set("gp_download", did_show_graphic_pack_download); diff --git a/src/config/CemuConfig.h b/src/config/CemuConfig.h index 5db8f58c..e2fbb74c 100644 --- a/src/config/CemuConfig.h +++ b/src/config/CemuConfig.h @@ -413,7 +413,8 @@ struct CemuConfig Vector2i pad_size{ -1,-1 }; ConfigValue pad_maximized; - ConfigValue check_update{false}; + ConfigValue check_update{true}; + ConfigValue receive_untested_updates{false}; ConfigValue save_screenshot{true}; ConfigValue did_show_vulkan_warning{false}; diff --git a/src/config/LaunchSettings.cpp b/src/config/LaunchSettings.cpp index 1731f500..bf38b9cf 100644 --- a/src/config/LaunchSettings.cpp +++ b/src/config/LaunchSettings.cpp @@ -112,10 +112,10 @@ bool LaunchSettings::HandleCommandline(const std::vector& args) { requireConsole(); std::string versionStr; -#if EMULATOR_VERSION_MINOR == 0 - versionStr = fmt::format("{}.{}{}", EMULATOR_VERSION_LEAD, EMULATOR_VERSION_MAJOR, EMULATOR_VERSION_SUFFIX); +#if EMULATOR_VERSION_PATCH == 0 + versionStr = fmt::format("{}.{}{}", EMULATOR_VERSION_MAJOR, EMULATOR_VERSION_MINOR, EMULATOR_VERSION_SUFFIX); #else - versionStr = fmt::format("{}.{}-{}{}", EMULATOR_VERSION_LEAD, EMULATOR_VERSION_MAJOR, EMULATOR_VERSION_MINOR, EMULATOR_VERSION_SUFFIX); + versionStr = fmt::format("{}.{}-{}{}", EMULATOR_VERSION_MAJOR, EMULATOR_VERSION_MINOR, EMULATOR_VERSION_PATCH, EMULATOR_VERSION_SUFFIX); #endif std::cout << versionStr << std::endl; return false; // exit in main diff --git a/src/gui/CemuUpdateWindow.cpp b/src/gui/CemuUpdateWindow.cpp index 445c7c17..6a4e6885 100644 --- a/src/gui/CemuUpdateWindow.cpp +++ b/src/gui/CemuUpdateWindow.cpp @@ -116,9 +116,11 @@ bool CemuUpdateWindow::QueryUpdateInfo(std::string& downloadUrlOut, std::string& #elif BOOST_OS_MACOS urlStr.append("&platform=macos_bundle_x86"); #elif - #error Name for current platform is missing #endif + const auto& config = GetConfig(); + if(config.receive_untested_updates) + urlStr.append("&allowNewUpdates=1"); curl_easy_setopt(curl, CURLOPT_URL, urlStr.c_str()); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); diff --git a/src/gui/DownloadGraphicPacksWindow.cpp b/src/gui/DownloadGraphicPacksWindow.cpp index 03f102d2..9ea9e1dd 100644 --- a/src/gui/DownloadGraphicPacksWindow.cpp +++ b/src/gui/DownloadGraphicPacksWindow.cpp @@ -115,7 +115,7 @@ void DownloadGraphicPacksWindow::UpdateThread() curlDownloadFileState_t tempDownloadState; std::string queryUrl("https://cemu.info/api2/query_graphicpack_url.php?"); char temp[64]; - sprintf(temp, "version=%d.%d.%d", EMULATOR_VERSION_LEAD, EMULATOR_VERSION_MAJOR, EMULATOR_VERSION_MINOR); + sprintf(temp, "version=%d.%d.%d", EMULATOR_VERSION_MAJOR, EMULATOR_VERSION_MINOR, EMULATOR_VERSION_PATCH); queryUrl.append(temp); queryUrl.append("&"); sprintf(temp, "t=%u", (uint32)std::chrono::seconds(std::time(NULL)).count()); // add a dynamic part to the url to bypass overly aggressive caching (like some proxies do) diff --git a/src/gui/GeneralSettings2.cpp b/src/gui/GeneralSettings2.cpp index 08395cd3..bd394479 100644 --- a/src/gui/GeneralSettings2.cpp +++ b/src/gui/GeneralSettings2.cpp @@ -141,49 +141,66 @@ wxPanel* GeneralSettings2::AddGeneralPage(wxNotebook* notebook) second_row->SetFlexibleDirection(wxBOTH); second_row->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED); + sint32 checkboxCount = 0; + auto CountRowElement = [&]() + { + checkboxCount++; + if(checkboxCount != 2) + return; + second_row->AddSpacer(10); + checkboxCount = 0; + }; + + auto InsertEmptyRow = [&]() + { + while(checkboxCount != 0) + CountRowElement(); + second_row->AddSpacer(10); + second_row->AddSpacer(10); + second_row->AddSpacer(10); + }; + const int topflag = wxALIGN_CENTER_VERTICAL | wxALL; m_save_window_position_size = new wxCheckBox(box, wxID_ANY, _("Remember main window position")); m_save_window_position_size->SetToolTip(_("Restores the last known window position and size when starting Cemu")); second_row->Add(m_save_window_position_size, 0, topflag, 5); - second_row->AddSpacer(10); + CountRowElement(); + //second_row->AddSpacer(10); m_save_padwindow_position_size = new wxCheckBox(box, wxID_ANY, _("Remember pad window position")); m_save_padwindow_position_size->SetToolTip(_("Restores the last known pad window position and size when opening it")); second_row->Add(m_save_padwindow_position_size, 0, topflag, 5); + CountRowElement(); const int botflag = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT | wxBOTTOM; m_discord_presence = new wxCheckBox(box, wxID_ANY, _("Discord Presence")); m_discord_presence->SetToolTip(_("Enables the Discord Rich Presence feature\nYou will also need to enable it in the Discord settings itself!")); second_row->Add(m_discord_presence, 0, botflag, 5); + CountRowElement(); #ifndef ENABLE_DISCORD_RPC m_discord_presence->Disable(); #endif - second_row->AddSpacer(10); + //second_row->AddSpacer(10); m_fullscreen_menubar = new wxCheckBox(box, wxID_ANY, _("Fullscreen menu bar")); m_fullscreen_menubar->SetToolTip(_("Displays the menu bar when Cemu is running in fullscreen mode and the mouse cursor is moved to the top")); second_row->Add(m_fullscreen_menubar, 0, botflag, 5); + CountRowElement(); - m_auto_update = new wxCheckBox(box, wxID_ANY, _("Automatically check for updates")); - m_auto_update->SetToolTip(_("Automatically checks for new cemu versions on startup")); - second_row->Add(m_auto_update, 0, botflag, 5); -#if BOOST_OS_LINUX - if (!std::getenv("APPIMAGE")) { - m_auto_update->Disable(); - } -#endif - second_row->AddSpacer(10); m_save_screenshot = new wxCheckBox(box, wxID_ANY, _("Save screenshot")); m_save_screenshot->SetToolTip(_("Pressing the screenshot key (F12) will save a screenshot directly to the screenshots folder")); second_row->Add(m_save_screenshot, 0, botflag, 5); + CountRowElement(); m_disable_screensaver = new wxCheckBox(box, wxID_ANY, _("Disable screen saver")); m_disable_screensaver->SetToolTip(_("Prevents the system from activating the screen saver or going to sleep while running a game.")); second_row->Add(m_disable_screensaver, 0, botflag, 5); + CountRowElement(); // Enable/disable feral interactive gamemode #if BOOST_OS_LINUX && defined(ENABLE_FERAL_GAMEMODE) m_feral_gamemode = new wxCheckBox(box, wxID_ANY, _("Enable Feral GameMode")); m_feral_gamemode->SetToolTip(_("Use FeralInteractive GameMode if installed.")); second_row->Add(m_feral_gamemode, 0, botflag, 5); + CountRowElement(); #endif // temporary workaround because feature crashes on macOS @@ -191,6 +208,22 @@ wxPanel* GeneralSettings2::AddGeneralPage(wxNotebook* notebook) m_disable_screensaver->Enable(false); #endif + // InsertEmptyRow(); + + m_auto_update = new wxCheckBox(box, wxID_ANY, _("Automatically check for updates")); + m_auto_update->SetToolTip(_("Automatically checks for new cemu versions on startup")); + second_row->Add(m_auto_update, 0, botflag, 5); + CountRowElement(); + + m_receive_untested_releases = new wxCheckBox(box, wxID_ANY, _("Receive untested updates")); + m_receive_untested_releases->SetToolTip(_("When checking for updates, include brand new and untested releases. These may contain bugs!")); + second_row->Add(m_receive_untested_releases, 0, botflag, 5); +#if BOOST_OS_LINUX + if (!std::getenv("APPIMAGE")) { + m_auto_update->Disable(); + } +#endif + box_sizer->Add(second_row, 0, wxEXPAND, 5); } @@ -1536,6 +1569,7 @@ void GeneralSettings2::ApplyConfig() m_fullscreen_menubar->SetValue(config.fullscreen_menubar); m_auto_update->SetValue(config.check_update); + m_receive_untested_releases->SetValue(config.receive_untested_updates); m_save_screenshot->SetValue(config.save_screenshot); m_disable_screensaver->SetValue(config.disable_screensaver); diff --git a/src/gui/GeneralSettings2.h b/src/gui/GeneralSettings2.h index a3429fa1..b1ab01e8 100644 --- a/src/gui/GeneralSettings2.h +++ b/src/gui/GeneralSettings2.h @@ -41,7 +41,7 @@ private: wxCheckBox* m_save_window_position_size; wxCheckBox* m_save_padwindow_position_size; wxCheckBox* m_discord_presence, *m_fullscreen_menubar; - wxCheckBox* m_auto_update, *m_save_screenshot; + wxCheckBox* m_auto_update, *m_receive_untested_releases, *m_save_screenshot; wxCheckBox* m_disable_screensaver; #if BOOST_OS_LINUX && defined(ENABLE_FERAL_GAMEMODE) wxCheckBox* m_feral_gamemode; diff --git a/src/resource/cemu.rc b/src/resource/cemu.rc index 860ca8fb..6f78bfc3 100644 --- a/src/resource/cemu.rc +++ b/src/resource/cemu.rc @@ -73,8 +73,8 @@ END #define str(s) #s VS_VERSION_INFO VERSIONINFO -FILEVERSION EMULATOR_VERSION_LEAD, EMULATOR_VERSION_MAJOR, EMULATOR_VERSION_MINOR, 0 -PRODUCTVERSION EMULATOR_VERSION_LEAD, EMULATOR_VERSION_MAJOR, EMULATOR_VERSION_MINOR, 0 +FILEVERSION EMULATOR_VERSION_MAJOR, EMULATOR_VERSION_MINOR, EMULATOR_VERSION_PATCH, 0 +PRODUCTVERSION EMULATOR_VERSION_MAJOR, EMULATOR_VERSION_MINOR, EMULATOR_VERSION_PATCH, 0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -94,7 +94,7 @@ BEGIN VALUE "LegalCopyright", "Team Cemu" VALUE "OriginalFilename", "Cemu.exe" VALUE "ProductName", "Cemu" - VALUE "ProductVersion", xstr(EMULATOR_VERSION_LEAD) "." xstr(EMULATOR_VERSION_MAJOR) "." xstr(EMULATOR_VERSION_MINOR) EMULATOR_VERSION_SUFFIX "\0" + VALUE "ProductVersion", xstr(EMULATOR_VERSION_MAJOR) "." xstr(EMULATOR_VERSION_MINOR) "." xstr(EMULATOR_VERSION_PATCH) EMULATOR_VERSION_SUFFIX "\0" END END BLOCK "VarFileInfo" From 03484d214678cd5e442f196bbfc38b79c53509f9 Mon Sep 17 00:00:00 2001 From: Cemu-Language CI Date: Wed, 28 Aug 2024 09:05:50 +0000 Subject: [PATCH 10/11] Update translation files --- bin/resources/fr/cemu.mo | Bin 72178 -> 73978 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/bin/resources/fr/cemu.mo b/bin/resources/fr/cemu.mo index 8328991f01eb915b5ea722452ccefde985d6416c..f3f3b49871a8078edf991f90f995d71f14e80f94 100644 GIT binary patch delta 25041 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

6St{+jX!tOk4R)*ctg7C=)jM%9y?j)W}9dO-(+O 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 delta 23379 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 From 9a53b19403d4fea5861bcdf115a673d801759245 Mon Sep 17 00:00:00 2001 From: squidbus <175574877+squidbus@users.noreply.github.com> Date: Wed, 28 Aug 2024 02:06:49 -0700 Subject: [PATCH 11/11] CI+build: Improve macOS builds (#1310) --- .github/workflows/build.yml | 20 +++++------- BUILD.md | 50 ++++++++++++++++++------------ CMakeLists.txt | 1 + dependencies/ih264d/CMakeLists.txt | 12 +++++-- src/asm/CMakeLists.txt | 12 +++++-- 5 files changed, 57 insertions(+), 38 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dd28ceb5..72bbcf52 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -176,7 +176,7 @@ jobs: path: ./bin/Cemu.exe build-macos: - runs-on: macos-12 + runs-on: macos-14 steps: - name: "Checkout repo" uses: actions/checkout@v4 @@ -198,17 +198,14 @@ jobs: - name: "Install system dependencies" run: | brew update - brew install llvm@15 ninja nasm automake libtool - brew install cmake ninja + brew install ninja nasm automake libtool - - name: "Build and install molten-vk" + - name: "Install molten-vk" run: | - git clone https://github.com/KhronosGroup/MoltenVK.git - cd MoltenVK - git checkout bf097edc74ec3b6dfafdcd5a38d3ce14b11952d6 - ./fetchDependencies --macos - make macos - make install + curl -L -O https://github.com/KhronosGroup/MoltenVK/releases/download/v1.2.9/MoltenVK-macos.tar + tar xf MoltenVK-macos.tar + sudo mkdir -p /usr/local/lib + sudo cp MoltenVK/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib /usr/local/lib - name: "Setup cmake" uses: jwlawson/actions-setup-cmake@v2 @@ -239,9 +236,8 @@ jobs: cd build cmake .. ${{ env.BUILD_FLAGS }} \ -DCMAKE_BUILD_TYPE=${{ env.BUILD_MODE }} \ + -DCMAKE_OSX_ARCHITECTURES=x86_64 \ -DMACOS_BUNDLE=ON \ - -DCMAKE_C_COMPILER=/usr/local/opt/llvm@15/bin/clang \ - -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm@15/bin/clang++ \ -G Ninja - name: "Build Cemu" diff --git a/BUILD.md b/BUILD.md index 1e92527e..44d69c6c 100644 --- a/BUILD.md +++ b/BUILD.md @@ -16,11 +16,11 @@ - [Compiling Errors](#compiling-errors) - [Building Errors](#building-errors) - [macOS](#macos) - - [On Apple Silicon Macs, Rosetta 2 and the x86_64 version of Homebrew must be used](#on-apple-silicon-macs-rosetta-2-and-the-x86_64-version-of-homebrew-must-be-used) - [Installing brew](#installing-brew) - - [Installing Dependencies](#installing-dependencies) - - [Build Cemu using CMake and Clang](#build-cemu-using-cmake-and-clang) - - [Updating Cemu and source code](#updating-cemu-and-source-code) + - [Installing Tool Dependencies](#installing-tool-dependencies) + - [Installing Library Dependencies](#installing-library-dependencies) + - [Build Cemu using CMake](#build-cemu-using-cmake) +- [Updating Cemu and source code](#updating-cemu-and-source-code) ## Windows @@ -141,31 +141,41 @@ If you are getting a different error than any of the errors listed above, you ma ## macOS -To compile Cemu, a recent enough compiler and STL with C++20 support is required! LLVM 13 and -below, built in LLVM, and Xcode LLVM don't support the C++20 feature set required. The OpenGL graphics -API isn't support on macOS, Vulkan must be used. Additionally Vulkan must be used through the -Molten-VK compatibility layer - -### On Apple Silicon Macs, Rosetta 2 and the x86_64 version of Homebrew must be used - -You can skip this section if you have an Intel Mac. Every time you compile, you need to perform steps 2. - -1. `softwareupdate --install-rosetta` # Install Rosetta 2 if you don't have it. This only has to be done once -2. `arch -x86_64 zsh` # run an x64 shell +To compile Cemu, a recent enough compiler and STL with C++20 support is required! LLVM 13 and below +don't support the C++20 feature set required, so either install LLVM from Homebrew or make sure that +you have a recent enough version of Xcode. Xcode 15 is known to work. The OpenGL graphics API isn't +supported on macOS, so Vulkan must be used through the Molten-VK compatibility layer. ### Installing brew 1. `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"` -2. `eval "$(/usr/local/Homebrew/bin/brew shellenv)"` # set x86_64 brew env +2. Set up the Homebrew shell environment: + 1. **On an Intel Mac:** `eval "$(/usr/local/Homebrew/bin/brew shellenv)"` + 2. **On an Apple Silicon Mac:** eval `"$(/opt/homebrew/bin/brew shellenv)"` -### Installing Dependencies +### Installing Tool Dependencies -`brew install boost git cmake llvm ninja nasm molten-vk automake libtool` +The native versions of these can be used regardless of what type of Mac you have. + +`brew install git cmake ninja nasm automake libtool` + +### Installing Library Dependencies + +**On Apple Silicon Macs, Rosetta 2 and the x86_64 version of Homebrew must be used to install these dependencies:** +1. `softwareupdate --install-rosetta` # Install Rosetta 2 if you don't have it. This only has to be done once +2. `arch -x86_64 zsh` # run an x64 shell +3. `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"` +4. `eval "$(/usr/local/Homebrew/bin/brew shellenv)"` + +Then install the dependencies: + +`brew install boost molten-vk` + +### Build Cemu using CMake -### Build Cemu using CMake and Clang 1. `git clone --recursive https://github.com/cemu-project/Cemu` 2. `cd Cemu` -3. `cmake -S . -B build -DCMAKE_BUILD_TYPE=release -DCMAKE_C_COMPILER=/usr/local/opt/llvm/bin/clang -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm/bin/clang++ -G Ninja` +3. `cmake -S . -B build -DCMAKE_BUILD_TYPE=release -DCMAKE_OSX_ARCHITECTURES=x86_64 -G Ninja` 4. `cmake --build build` 5. You should now have a Cemu executable file in the /bin folder, which you can run using `./bin/Cemu_release`. diff --git a/CMakeLists.txt b/CMakeLists.txt index 80ac6cf0..54e2012a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,6 +92,7 @@ endif() if (APPLE) enable_language(OBJC OBJCXX) + set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0") endif() if (UNIX AND NOT APPLE) diff --git a/dependencies/ih264d/CMakeLists.txt b/dependencies/ih264d/CMakeLists.txt index d97d6dda..686a9d08 100644 --- a/dependencies/ih264d/CMakeLists.txt +++ b/dependencies/ih264d/CMakeLists.txt @@ -117,7 +117,13 @@ add_library (ih264d "decoder/ivd.h" ) -if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") +if (CMAKE_OSX_ARCHITECTURES) +set(IH264D_ARCHITECTURE ${CMAKE_OSX_ARCHITECTURES}) +else() +set(IH264D_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR}) +endif() + +if (IH264D_ARCHITECTURE STREQUAL "x86_64" OR IH264D_ARCHITECTURE STREQUAL "amd64" OR IH264D_ARCHITECTURE STREQUAL "AMD64") set(LIBAVCDEC_X86_INCLUDES "common/x86" "decoder/x86") include_directories("common/" "decoder/" ${LIBAVCDEC_X86_INCLUDES}) target_sources(ih264d PRIVATE @@ -140,7 +146,7 @@ target_sources(ih264d PRIVATE "decoder/x86/ih264d_function_selector_sse42.c" "decoder/x86/ih264d_function_selector_ssse3.c" ) -elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") +elseif(IH264D_ARCHITECTURE STREQUAL "aarch64" OR IH264D_ARCHITECTURE STREQUAL "arm64") enable_language( C CXX ASM ) set(LIBAVCDEC_ARM_INCLUDES "common/armv8" "decoder/arm") include_directories("common/" "decoder/" ${LIBAVCDEC_ARM_INCLUDES}) @@ -178,7 +184,7 @@ target_sources(ih264d PRIVATE ) target_compile_options(ih264d PRIVATE -DARMV8) else() -message(FATAL_ERROR "ih264d unknown architecture: ${CMAKE_SYSTEM_PROCESSOR}") +message(FATAL_ERROR "ih264d unknown architecture: ${IH264D_ARCHITECTURE}") endif() if(MSVC) diff --git a/src/asm/CMakeLists.txt b/src/asm/CMakeLists.txt index 5d9f84c2..19a7ddd8 100644 --- a/src/asm/CMakeLists.txt +++ b/src/asm/CMakeLists.txt @@ -1,6 +1,12 @@ project(CemuAsm C) -if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)") +if (CMAKE_OSX_ARCHITECTURES) + set(CEMU_ASM_ARCHITECTURE ${CMAKE_OSX_ARCHITECTURES}) +else() + set(CEMU_ASM_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR}) +endif() + +if (CEMU_ASM_ARCHITECTURE MATCHES "(x86)|(X86)|(amd64)|(AMD64)") if (WIN32) @@ -40,8 +46,8 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)") endif() -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(aarch64)|(AARCH64)") +elseif(CEMU_ASM_ARCHITECTURE MATCHES "(aarch64)|(AARCH64)|(arm64)|(ARM64)") add_library(CemuAsm stub.cpp) else() - message(STATUS "CemuAsm - Unsupported arch: ${CMAKE_SYSTEM_PROCESSOR}") + message(STATUS "CemuAsm - Unsupported arch: ${CEMU_ASM_ARCHITECTURE}") endif()