From 2957645d9d1bb1928bed007e79baa7d88dcf213b Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sat, 3 Feb 2024 00:58:43 -0500 Subject: [PATCH] release v0.6.1 --- CMakeLists.txt | 2 +- README.md | 2 ++ android/app/build.gradle | 4 ++-- android/app/src/main/AndroidManifest.xml | 4 ++-- demos/specs2/back_into_adventure.fur | Bin 0 -> 1602 bytes demos/specs2/spa.fur | Bin 0 -> 7321 bytes papers/clipboard-format.md | 2 +- papers/format.md | 1 + res/Info.plist | 6 +++--- scripts/release-linux-AppImage.sh | 8 ++++---- src/engine/engine.h | 6 +++--- src/gui/settings.cpp | 2 +- 12 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 demos/specs2/back_into_adventure.fur create mode 100644 demos/specs2/spa.fur diff --git a/CMakeLists.txt b/CMakeLists.txt index c3bf5b826c..2490246a32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_PROJECT_VERSION_MAJOR 0) set(CMAKE_PROJECT_VERSION_MINOR 6) -set(CMAKE_PROJECT_VERSION_PATCH 0) +set(CMAKE_PROJECT_VERSION_PATCH 1) set(BUILD_GUI_DEFAULT ON) set(USE_SDL2_DEFAULT ON) diff --git a/README.md b/README.md index 5abdc8127b..3bf73dc142 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ for other operating systems, you may [build the source](#developer-info). - YM3812 (OPL2) - YMF262 (OPL3) with full 4-op support! - Y8950 (OPL with ADPCM) + - ESS ESFM (like OPL3 but with more features) - square wave chips: - AY-3-8910/YM2149(F) used in several computers and game consoles - Commodore VIC used in the VIC-20 @@ -86,6 +87,7 @@ for other operating systems, you may [build the source](#developer-info). - modern/fantasy: - Commander X16 VERA - tildearrow Sound Unit + - PowerNoise - Generic PCM DAC - mix and match sound chips! - over 200 ready to use presets from computers, game consoles and arcade boards... diff --git a/android/app/build.gradle b/android/app/build.gradle index 1b09780c50..6fed5ed8e3 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -15,8 +15,8 @@ android { } minSdkVersion 21 targetSdkVersion 26 - versionCode 181 - versionName "0.6" + versionCode 192 + versionName "0.6.1" externalNativeBuild { cmake { arguments "-DANDROID_APP_PLATFORM=android-21", "-DANDROID_STL=c++_static", "-DWARNINGS_ARE_ERRORS=ON" diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index a8b2007b1d..0c430ea6b4 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ diff --git a/demos/specs2/back_into_adventure.fur b/demos/specs2/back_into_adventure.fur new file mode 100644 index 0000000000000000000000000000000000000000..865a97e6b98cd05c40008675d5368e3011ee26a4 GIT binary patch literal 1602 zcmV-I2EF-soXu5VY*SSj|IRtL?RML>`@_1jF?Jb(L)aYafZ-ghly)qz7Tb1o!fSQHkA;^B_W=i$i}4hB>)g$wG9UR!CMR$HX8w$J_hsD|KWb{;07?vi*lqiUa z3E_~K%EqHeL2}!8a#~6WV`qg-G&UiLsZ{dJHq`a47bqpFRzeK@gnWR(Y&QXXfpAy= zzCpBOXqzhmt|GohT;l=GTLHeZu3APYA*hb9QhS&OadAQtq6xv>Da50RY(`2WabZ6g zcBntjFo~*LcnkZ393MI43;BeDL18pFER1*p5ngy;iv$I4Fc29G4Es8GexKkE1&4(2 zQJ**5B^>k(1=om$gMk6z;9$t-jRZrZ9qO6J?+FAWc%Kj+4M%)Ks0S|%@nu?c$&hcz zGZ+Z-ys%Hb_kiz+N*xRc{^3x-H zGp}thj~RXwaRuQ&;u*MzT;s9i_^GfI>+9slv*}DS?o|o6lg1~LeVJ5N(pCqhn0U5t z=PqsIm!yd?tc<=r+BPJmld)_jnoRU{YlLITSYJ;!KQ$5Wlf_tC;?rV$Dkcp{@o;oj zLfz>z;*@ViKX@?lRxNzk)GDM*C2=K3%Ga3Wu5&mq!A1ypOfV*<(=g0C)@MZJg@NiN~JPifxR-% z=dECeYPmMIF6UGll_sSTT+jdwx%yna?37*d`unZyCWe(3NM};f#LH-A3qdn$bjIu} z^J<$rlTJ)Z<746pS_|5Ny`g36j;=kud%HW@HZ|5)+suZU7Ool>uK~G>mG{>+f%s5c znSy#2l-}aru06SKxvTheu06Lsx6R$AY?ZgjPsp2dt?t(1CikYCAPcz`Xn~D#v$6p; zxSQn0+y%n|E!5^~lp3hXSIgCThvJYO zZb#m(tm!g#w;k;HDy2%Ua#sO%#U|UpW@I>Wf9yUh%dlExJ27cAS*;9G7;t$IU zmM_gOnwL#)n}Q~j=?Csz?gZD(Ik{WxI$L0;nUA@!|4whvkLVjTO^?w5+M{(Vy+^(y zOXPiGIPy-pBS$@vz>r~P%Lq&@&n&v`TG%LP(@}j2>C*_5pB;ws zoLgaJ^MsuvY>sT^W(cRVXu2+HEc1r0MNQYga4FuhxY%PsCe7bh^}j_7VuGGn=x0gF z(v(e8HcNq>);1Z+W+bzI<1O8>G0w5I)9Ru4yM&nvtoy81v9Kz zx`1ptP9hR3>+=ZJ3Qgu_>6@yjsvlGJ-kMZZYpLpgM5-|Au2Nhc8ZhKpNfDbNY?`d5 z2M=83>H5ca%n;3^+uGMi^iMM9;#V;sBCKalKvQ({!sNP zq)#KP{OmZ>A1c!xs=f&^L#b9W7FB5)OXlMXSW_3U)bu&MGM~rt0W7)VpXpoLmOH8# AtN;K2 literal 0 HcmV?d00001 diff --git a/demos/specs2/spa.fur b/demos/specs2/spa.fur new file mode 100644 index 0000000000000000000000000000000000000000..34ecd25582436bdbb150e4051ebf04578f134eda GIT binary patch literal 7321 zcmV;K9A@Kqob5ada2wZg?>@kRM*s&>Kgf`Xqdul&OBO9ywrol!_4kJoDeK!Nc1ekV z3<&~3f}kmiEbd5vB5cc1WUC46Osh6&;-;T4i85{anYistJ8i^CI!UMLOgmvcqqftG z5>GpwrkXVD?%oFnfYgVMI?haS+QZ(y-F^G^cK7W8pf>K!^e4MdM%A;uJ()yw<9m!T zm6cx49@yKVxd0JG?ngg7uv24;nJ2KA#c zL#b|dthYbWqxQzsW8KM~?o;Zzlf8q{e)YsTbs(PTiFWt*_r9_oWd30n<9QCHInL6< zaUl<5eE<_RjD1oDN-bl51Q78u_Rj#4pRq3iyreMp_W;WRjD_kLn*{g=fZwlY>=TRN zj)3$38o<8(mMe*irA0LTJd0a&t(^VEl|T4Tv{H%3OZF>pI1`hI??RO-<)M10HX(@)!F@tbI^1ya0zf4($6?-{g~ReHT&98>pqC!*^7ulL8k zt~NKzrjRN5qi_6)dH`688O)PO9b!1LW_z@#(1 z>alpT=WINYP%Tw^2BXP%@|67kXEe1vo;-6Kb5Q$d-cmPjUTfSc-aa!Zu7Y)D0t6n# zvs5Fy%dTqa2A7TsEfrUe7sT>ig>Tg@+uOcl-vt;riTB`8G_n0r`6NVk@7Y~Q*xoEh zPrlr{eV{)RC2V&z(S2_FmMwI#HyZ6Z(G6UW8f-5_)4hqzK)g4(eKQe`_JY3Vh@9#< zyFJ#ONJr&#_t{h;x<7jMP<%KF+S9Ler}p3s#xUEl``H&l%t#N|x2rP0u6_}+h~{z- zmn?SN`VVb}n#0~>4eY=Une}(W-R$p8rP=-+4G@<+H#>`dZ52#}Nft7DXurq+4<9-r z85z8n9oPf!dk&yhA7^Rxv3PQzzgHc28KUAGD87LKuNrEy1F`3~Hm`qh&1!fxhF69j zSiWq@qWU_;>#dR8BI8_)_`J-^O4hjc0HQPQx_W(Saq)D0q>cq*O3Xj)oA$=M#o9=1 zOlESdhSkJ8(^5<-x+8Apj=7lYZ80WB;9zh}3-cdLtUh9NMCgdwhjHz$^bc?Q$Ke#g zc8Z5#9DqZ>A2aBW0I&)mn4M*=u2Q)2NOvLKj>wf9WrR83N7oe>ZtIGd?Wn5(SESQw zG&u;q*o{F~y=H&;ngwIcY(>odHfPN@e%txJV$bKI`CzWgj=6T1=32@ebGcm))ze(x z;eEnB;hazq-Uc`>{Dl8?{s6z7U%~$y_dfS7*UlZ`qTDuaHTN*!QSKAmuW?h{pTc

N`+a_2t?ZFpB2;cpFz=Vwb|>e0z%)bMyd}22s9q0U55|^WUtC-iSp>mbKV288 zD?$J>3gL(^=AEu(wM7cy>Kyai#mF#uIahKOn!Fioc5$}N!uHjVtzX@+BD6fX6pKt< zAOJS|ymE~sxm}_#pUp=Mn`2GIaB)TCfyis;_HhH>x*Q63|7E! z4S`5tS}7_KSj)6O=8yPcJBKwDeK8+{hyMR?m4b44I|r|pC*Pv5ucusrn*%Tu!HpsV&hmDtI1XHRq|z(cR$U2Qb) z>Y100AAD}t(@#FuykXtiRSltKixjw_Zo%qdN&(eicx86;>?5-e$JWQ1VrwI-i;czb z^_7to*B^*2zrHNC6tZba5j+%G6su?TtPXt=Q6hfyLd<8`*=N})ns$D{wzHP?M+a5g z);An`hZXM7p?Yd+eM;S;CCeUYSi51%)6cx{v1sy@lBud$FTkNiX^4`HOzIS%K+5tZurlSkD&0ja^(^!j{E?#Rp<5uQ$$XZkmf9! zMYOfa;7oKMKiK}v?j28Wd-91bkw-T@vf-h153X5-J6>>cz2XHA(^@>nc2@^4qYIjU z|23w5+_8J7;{)COYO1@ZV)tHaNxLegf8vOTXe!>F>;=((LAzHNjOk>&=a)Wy{P4k! z_GkC)*|nqX>1{1fZGB?PW1Amsw$yJe70c%gM}N_~(fj4vQ0=eEHS+5>ea_gzip_8=6MriFRQTtLW3FxK8XWJy zF$PB*j!rn9s5lzvaM5AiyzQl8Yxp4QsISn-_9npv2P?K@kFz6`StKJH0dExOsJc$D#97B0ew>?FXHIf<}kTtbXb6{(ZZ)Z+&dj zL+jQyHarkqx~LAbT7+jUfmsD_j(zuQ+`*Csl536GYcv(t%r-{UVnb|YYy}HlUtSCr zp&%A1)!8Cek41c1G5U}g6uStNx)@|y1WI{KF4h#Gyu~EzmK?XYq{^jz+i`CO<0tyN zVPSua3tMCGJ@xqJO&cMT)~;TqhF3yiU%qVVlEqNkp|JameaOxN$DY2yEa+=s4J%nF z0;Q_BG`1uH+Ynn6A?sNn0@fFOP#M7TX*nVrr8xozmgZ@yB{4W6P^6iJMLGsY1P*Im z&s1$x+-zkx;x+bk^<<)ZFbbR^jVZIFw-^Rv>ed7bZJm-)}jb;H1O35Cr%W#Ba2_tgW#4?tfi1X@QaV8C&=o+-yT*okS5|*|cN1Rvh zf|HDXmyCu-W$*z_kVLVRbD1Vqnjm3Jkdgxo3CtKOV=shHJJj_VtLQ`nvL;3}93{@H zcfm>a(*6Jy8|>w?+SJAHkldzeIH#&hao)HSSBc5}GrAMP6-5``Qs^D*@aWQ;3Q#Wt z}8}}Qiy8sTtdnl3Q-N7HPX##L(fP#w z8lEoV=``9x*cM=-nTMJA=_ii&@gt&RHAIXLlK5(ovnWC=yRA*ZBL+3?(@ow}e3y2K1;zgH z+S9y<2&+w4NYX&YOB9obbPdsGbD#{hG;5mb)p7un0IzTIo#wkl?GoT`ZB@j6?bCpL zW|I$GENWK){~S@@1?+bKrU0%1`~kop1H5OxfhSrOQL$5 z^mU@5DY=q$BLG7H1EzQi@B}fw3|Nn8T^HaVC+cy)4g+)ov;#Z?up6Mwe8=l{Lw%>o ziXtC3)uW;wTYbW`4ksNTDw;CVuk>A$Hvthz zt^**)HF?1_!*8Y$BNTtXO!3G6fBb#8_>11(_=|qH_>11(_={HiE`Ha(b3~zlQ8mXx?4{s=JaIh{(3SsXB6Ib1}8t#8JzsT&tOLsit|L_ea`2^hl|4doX?4S zh{BV6;O?TZcR{{G^>-D8y>t4`vhF@bA*%myQMl6hkb|*@eNkT2Ixn^;@Sf48;IWin zchl%n>BA7tZ82#?REP+V51~^5@vWk8%6LS2%iLW*a?D@G?gM4j%C zgFI_}O2A=z5Pr>*2;@S4no0>C7|1V9d896$%i0*nHT01N{R$!xWESeAK%G-|Tw^N3WA=gcW4WwPfu z*#oO=mB>x-%)*DVZtapT47>Bf5Wpxvmfm%E*Wn!)ZgP0yL!*EJr!I`p$Q5Bof_DiX z5>Al*cG3?Eo*)j?Hwb{bN9f&<9Cn9BQ0EBh97df(=Ew->%z)03N}U4g%(|=X)PXhz zpu0n3sB;W;>ZsGO-mr7H+|FMjo#K3UR<3;%bs|RGIhyrSDC52<&`h~dAEM|SoZ(Gr z*lRp+_R%zuA)!&o$BUs6s2TZC7VvyXCwu~MJ(L4H7tVUyZgOGWo5kUAAnC+zs)@WkLI-2Gp1Sl$jnMOzzT5|~!AUx#l(x%W{ z4M$*HuduKHQQe|sy*GKSQ_#ISPBDd6=)|5iY+()wn*U9jU%IP>=feeDgD~k83SJhP zBnt~TjAmb;OM{zmB;uuT!7EGvf3C!UL&oJ;Nju?r!W}8;F`ejK!$a=on|xjxbZ752y|Xk5^G}q|KTPw7C!{v<1XD((tf+?zc%e%LNoD2y zWDtGj!F$1=CU4fAovV7?O;vEXVggNB?afJZdICrDFsjg%Zkb_3l8?+7G0a#&e zoG5Q-&b2DK;p0$&N{f!AC1;kF@h0#B7-d*9n}^-m2fMQoNpZ5r&sdAp=hHgHE1|Rx zLqFrgXdL!oWDXIYA^IymOcmmRxdY&EAsZ;PNJ*fJdMH6my(kdw^HG&alk}j^tTLlC zA#CQx6sx^sq(l$oNl7OtNzojA#vH>mJQ4tZm@HEU3m9e?Su*${8L8uBrop;7eTj#R z_!Tk&f18W5Ko5eoMm+HmsWxGV#G$j-{$K}Ij)N0xW^bv znxA`=dI)xZI|#eE<8ar#T|2Rzn4q252QBx=Z+oG>$oid%FET1dx$P z$wpEF3luVt6G;FROuO;AK+QlBpbrGn04YPLk%YuKh4Kc?V5}iV*n%yBn+R~GtG#pu z8&!*vgc}4ENa*u|+1`8zuBS>@xI2tf<%b0T4YviP!BXHV6}m>78gGSdaQC zDT8W9D%E0>8p@K|xvU+%!-n)JX}H4L6QowWv$bU#%!qS?x#<36IOA@!Th&qAPYULK zas_(7Hkv6-GeMr{&{DQx{T=a^8cUt<35v)Zb}-Pa2B=wW!{Kqe3A$qTnL}oqcplS+ zn$-X`t8Jw|aLfvMYH$R|NWHuz(;Y3D*{#CkK3c4qeXL$#qN7`#vbxnyvs*R0X{!k{ zCCGs9kO5M~+Q(XzVLy|vYF%SN$eW<7ghu^xrv?|g<3b6I00I>X>7hW)oX8LXfNSI|YssDU)=9vPTq=oK{t<7Gqlq%t+n6kRqK2kj#u)ADSz0n36W|d5&9(Rg*T+>9e9e421+&`eX z1K0xgK}qV;y0$715+WoRR-QK9s7V4O2CJ%CEecjDA@K86xYp2;>*mP%F3Nfd+vgAD zQui#Bx@XZydm4Mq{Jw_eKME~SsduFxY*jTxSIZhAYEA|Ev@VGm#(T4}*;QNL_?PwB zZs@ZC9|5r5ho~baZCgm&+>cTtAy6~y8E_@s5^iZbG)ofdBcy)J; zZFr|+y*0Pf0Z*`~#7F!~iC;#3(uuM0x#ibHR_fDnf3O#yQ@yo(sdL1?_-UO@)Ut+| zu!j%8MyQN-Ap z&6#SK$pJ_q;JB1C6n_AEI9+Y#11KyowV4ah<+vdPGl4DYRt3f34A)z~g}8jxys92) z-r7nQ%4K5){w>61ZjO;wW3G8+_&G-Avp}fU%q?8=tm%chteyv7{XwA?{dNHyyhIL+ zsco_bURBAp%$zrMhgEQQGt)hJ=e9V-%xCHE86j|PxyR)O#V2Hm$YU~{$(7%jtFjeMAQ#8oyji#X?&wK=R&?_hJ*%&U2qBixk($Sm$d z-3sH3v4UQ^;_%v4^q5gM>96obs5d{Q%LclHE#+2gtFEXJX5X6Oq}P=;DXVl!uPQGQ z*F$uFp(snEN|!XLd`vp89Fr!LL((~=L&_=7ORp$lvlu@3RH03ENtvoLMva(s~ zQ#MK?%6h3+St|`IjnY|Vr8J~0m(D1Qr9mYi#TBnKpm?NHirCcF54FBEo24$~s`y#n zetgoMk53a;7m_P=ArcE0><(el#tL?aaKWZc*w_Vov_#8Q@#P$}u`0ftO*8q-F65i! zSJ<^$TA^zS%!o|19-yGa&xkEb5+9;ue0XY6QtrtjDR0<8f-x zew<3r{Wz7eAEyS(9;Y&n$EmdQaVqV6oEmaGPK9VmB7VSRHde2uz8PJsnyiWTg{(~n{0T*b32a&iKPY`@KcNMBRBPvu)}i~ zg1kWE?=a){80K#KL0G!?-If` zCjKRv2o-=N`M{i#d?j_RxdjK6thi@g|I=XXsdtzSu{kzVS`Pjx75`>h#0Ab+?L92s7|AhqvOU% z@W6rK{{6xB_N_{LyDS8se?Iu!bHQhy#edH{6Wq5ixOXr9+p{OQdv|cxF8G&MMI+GY z|E6$3F~m6Ar+M~jo;{jpx8~Uu-1%N`XBUG);IhBT#h=5lCh%Kk`#jcD49p`dnYys`OOBhy!J zJ1i_))3~GHxU8?b%v)?gc|lmVu5kzH|3}i#IrXc}H->WMs!PJz8+VpT z9Tbq1w-CLYzA!1rB6(b72dW5GnA;&BDQ_WqIbC0<)P9r-RhYY9KvLd9^m6*bq#TPB zaFIt*g<4_mQ2|MLLIMtR4Z6NiDZ2k_D$J$ZzSFw@JN0tTSmaAfdSiVoRBHTZ$GrRxVX2XQs8Sr?t7N)&`}m zoHA+twv2u_;&xX%BXF&e7Qc94?i$i?T!`0~54)^kOT24t@ubTd*QIlHStgxx zsQ>{04}b{318^S|JIFgvlZ)}El{9N^?iuGBVy2HDA}xYbi%P6*$QrP;cy6)RO$lo8 zBypZw3)cnVGMkHD`rsD>!}L|j)N-2{TzBF%ymyt}ohw<80`zIgv9tdRt&n-K`HN1v literal 0 HcmV?d00001 diff --git a/papers/clipboard-format.md b/papers/clipboard-format.md index 06d1c4f4a6..7182b59e21 100644 --- a/papers/clipboard-format.md +++ b/papers/clipboard-format.md @@ -6,7 +6,7 @@ when copying pattern data from Furnace, it's stored in the clipboard as plain te org.tildearrow.furnace - Pattern Data (144) ``` -this top line of text is always the same except for the number in parentheses, which is the internal build number. for example, 0.6 is `181`. +this top line of text is always the same except for the number in parentheses, which is the internal build number. for example, 0.6.1 is `192`. the second line is a number between 0 and 18 (decimal) which indicates which column the clip starts from. - `0`: note. diff --git a/papers/format.md b/papers/format.md index fc442e8952..149c498695 100644 --- a/papers/format.md +++ b/papers/format.md @@ -32,6 +32,7 @@ these fields are 0 in format versions prior to 100 (0.6pre1). the format versions are: +- 192: Furnace 0.6.1 - 181: Furnace 0.6 - 180: Furnace 0.6pre18 - 179: Furnace 0.6pre17 diff --git a/res/Info.plist b/res/Info.plist index 7895024da8..20f1b73b52 100644 --- a/res/Info.plist +++ b/res/Info.plist @@ -15,17 +15,17 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 0.6 + 0.6.1 CFBundleName Furnace CFBundlePackageType APPL CFBundleShortVersionString - 0.6 + 0.6.1 CFBundleSignature ???? CFBundleVersion - 0.6 + 0.6.1 NSHumanReadableCopyright NSHighResolutionCapable diff --git a/scripts/release-linux-AppImage.sh b/scripts/release-linux-AppImage.sh index c535d2f6ec..f5fbfeeb7c 100755 --- a/scripts/release-linux-AppImage.sh +++ b/scripts/release-linux-AppImage.sh @@ -8,11 +8,11 @@ fi cd /tmp/furnace -if [ ! -e linuxbuild ]; then - mkdir linuxbuild || exit 1 +if [ ! -e aibuild ]; then + mkdir aibuild || exit 1 fi -cd linuxbuild +cd aibuild cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-O2" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Werror" -DWITH_DEMOS=OFF -DWITH_INSTRUMENTS=OFF -DWITH_WAVETABLES=OFF .. || exit 1 make -j4 || exit 1 @@ -20,7 +20,7 @@ make -j4 || exit 1 cd .. mkdir -p release/linux/furnace.AppDir || exit 1 -cd linuxbuild +cd aibuild make DESTDIR=/tmp/furnace/release/linux/furnace.AppDir install || exit 1 diff --git a/src/engine/engine.h b/src/engine/engine.h index c1d60bbea3..4ce839c0b2 100644 --- a/src/engine/engine.h +++ b/src/engine/engine.h @@ -52,10 +52,10 @@ class DivWorkPool; #define EXTERN_BUSY_BEGIN_SOFT e->softLocked=true; e->isBusy.lock(); #define EXTERN_BUSY_END e->isBusy.unlock(); e->softLocked=false; -#define DIV_UNSTABLE +//#define DIV_UNSTABLE -#define DIV_VERSION "dev191" -#define DIV_ENGINE_VERSION 191 +#define DIV_VERSION "0.6.1" +#define DIV_ENGINE_VERSION 192 // for imports #define DIV_VERSION_MOD 0xff01 #define DIV_VERSION_FC 0xff02 diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp index 1fdb594a2f..71f3cda809 100644 --- a/src/gui/settings.cpp +++ b/src/gui/settings.cpp @@ -44,7 +44,7 @@ #endif #ifdef HAVE_FREETYPE -#define FONT_BACKEND_DEFAULT 1 +#define FONT_BACKEND_DEFAULT 0 #else #define FONT_BACKEND_DEFAULT 0 #endif