From f53bb37c84206d502372fe6f0b90bf7bc8285f6e Mon Sep 17 00:00:00 2001
From: nakst <>
Date: Mon, 11 Oct 2021 18:30:05 +0100
Subject: [PATCH] fix building on other systems

---
 ports/gcc/port.sh    |   2 +-
 res/Theme Source.dat | Bin 500084 -> 513504 bytes
 start.sh             |  18 ++++++++++--------
 util/build.c         |  15 +++++++++------
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/ports/gcc/port.sh b/ports/gcc/port.sh
index 3eefe7e..d20025d 100755
--- a/ports/gcc/port.sh
+++ b/ports/gcc/port.sh
@@ -34,7 +34,7 @@ cp ports/gcc/changes/gcc_gcc_config_host_darwin.c bin/gcc-src/gcc/config/host-da
 cp ports/gcc/changes/gcc_libgcc_config.host bin/gcc-src/libgcc/config.host
 cp ports/gcc/changes/gcc_libstdc++-v3_configure bin/gcc-src/libstdc++-v3/configure
 
-if [ "$1" == "download-only" ]; then
+if [ "$1" = "download-only" ]; then
 	exit 0
 fi
 
diff --git a/res/Theme Source.dat b/res/Theme Source.dat
index e3ad4f457cd5398146676c38414e1ef11e92e23f..16cbbd836b3a7cc2ac416f7a6a6178579a41a785 100644
GIT binary patch
delta 3996
zcmb`Je@s<n7{@vHyl^fcfr^zI1qgT#33|yA)=a^%HcA3E6IAdf>knCs9|PpJfHe!l
zWfAwG-WXg)jkZi^w7W)bSZHl+t{ii_2ngMaf}$Y5MCaTZz30b0KRCE^VzHe+?s*=b
z&-eMh&-=b->C*GwbCE%mpP%0=w4dK&1hen&`Z4uD5QFwrRaTakK#zmPbI(zM@Mn-2
zdM?MpKspO~8|=8Rg0V8D(z41Tl2v|nGfwTK%%QaKqQYji6&IDfi#^e3^A_o4691CG
z)PL8I>r(I@hC)DX+$%xCqV0gfwTyhJoWM}mBEQ^7cqQdM0Xrn-iLJg?R9yUG)B0H4
z??GlL4wu{Q5C2ZnX@*q&2`UB+su;#OSE*z?bHv~5>ev*qfw*wNBDfI64rsWq>v2a6
za<B7i4N>u<g!oUqNUUO^;e|DHJ8F<Rh8Jx9$*#Az<;4)}`8Ne@M3%NuU4uOakzSlu
zXi9cPWJd%tD7UEOoziN!SQ(EK{vgX-cF2s2Jya}&wXjfg!VbF+n>C*A*YkYbpp+XV
z&y{*Og(AJbcSN>4rN9m~`Pxy>(F5Q74`6OnAn48)uweyS%XM)R262;O9)j@#0cW?d
zFdu4%iKE&sbw~P^LF{ehddgN}BIec}6R_T6+Aei*QwDK&kn8)x!UTc~X%ui}jar<p
zsdo+HrX^F;KKJ2R9Qg}nhSZiaNN>_QtIM7-$o5L?swRo;aA*$-U7~Swg+m;{S%*Me
z2Wv3*p1}rZr3S}9z@;{8ak`^3XAn1uTtQ!aLzB_z{z|}wwX6ZRU>rBn!f%X>HXn|4
zIP5s;;3}86ZkLM&v19xd^I@0s<1Qyf9us+J@*wi~_jWl0I)A1R&N;~J#RIKWES}0`
zSjY~r;{&;?$kH9HCBw4B(Zcn)3iKNMzi*hxeOL8P<uOC#xWE_dMJ$vxvUvX~=4`-<
z?<n0RcwmtH5cSTUVort=YI!T6_M8id1Lq+NwmKQ@?$yN_zW{pM+Zb-ZaaxDMV-^O!
zv_nsURddJwZ)oxj`$Oi_O;M3}E*b?wN^OGaksDw6gt6fB)pRbTqA2d$H3@#o3?*46
zKQ|=R?nIB=%gfO5Yz-GDpPh1ekPDL%@R?~V&Tb(S8iukVWs?<WGbS_iWt#aa*Z4Gc
zh)V<86*I8GW%SF5TVV&iT|x~hlBiBt2(6~4Mu$}?!^)K7e2V+`UsWk1K1FrY78w6F
z7dqH%wV3P5BD*0vxSHOVvO`s5)K`S)rFf2G+lrRPlvNsVc|Dy6A#@~diHU?PX94wh
zQ`$~y8OEI!yspka5Kh-bQj4%2S+KW`34~$ta}v5UpW*%S;ICVmm*~OeW!%5f6em=3
zW@V{`dpRUxhg4Yw)-Bk3#^eue{_&EP;{-0Qir^&qatoBAH@GNSjFQt9u6va6>aJzz
z$qeVE+*Gz6!8^z;dQHB(=o7pSZYHpGfQo}pd#lOR%JE6j8ueV!+v8(YCg0+lrUtp8
zphO3qrBN_>)GA56&7;n!TP8{L$&fy<(uq>ylv1|59PmM*tm_V6jPuVo%k<^n)YEfU
z)TEF;-<Ts&rg_R4evTEAO`Z`|XERDM&60=dO|q7Iz7%m0pbO;SEFa{zOFMnytv6J~
z=fwZSd*;b7{dJr+;|p#o3;LU7oeRF|+<xn@kwc|LuD+-UQvCdLH=P{6uZa6LD{jbR
wR&0PJIjx<$ljH&qxCnn{D5iPUIep025YGi(r(%pAD}vJ5LVr|QLF`EU7Y3At(*OVf

delta 664
zcmYjOKWGzS6wmdNe3zJD5>ty9(_k+)u_;_d5h-%#A_}LprGiLoVnpj;F@xZNMFI^t
zNiKN_k7$rsk`T3l>J6z|Dk2D#9-T5+%pwRb4sI@fcW0r)8{Y4Izd!GNgSVr9K89V4
z&1M^6ZMGfsXUN%i(!3jdelJ|C9>>%P#syn$4ssqD^nij=hfKllL9cezbCN)0>;SAB
zI%7@;yaLNX!NiJ>jus<s6n@${NDf=<_2D*lB!++(j=vw_12}j{JRrnRgI<fmmE1V2
z$J>~DLWI)9H%5Zp2@!m!WQr;<NC=n+I0bEE^7<H^`DaDY?L5?~G1zJ-;H5sHxft|n
zzG7rl`!#pWRXR^_wn@hE`L^8+Qj#mq@SxUXP)_DBpC^a4)th04YHco9K60u}yQMT$
z{+~xqDUiJ-Q1nQ~@>|a6+Naz1hA1?7*MgFFtO&xQ0BW9S-xseXO5nkMo#nB&%5reO
z%z*?l^vdlLIN(QR+Gw%xnc<*U&tm%vJ?S$P%}2&IREip$tM2WnQyQCjpji8?Nt7ps
zT{NZ)*%yYUR;eLtWU5;fwXSRZS7yu$jXlVSY29}v)Os3fF|>wgv9#>89NkdM+1Owt
z+*}|c=57!k^)!jWj8nnj4w=HG^gdiSzp8sFL;7@I2Sy8I+9bhmjNw{=yzYKg$>Si^
hyWFHa^#h4wr%ASrD|P?2NQEZG;+uVv)as>q@qg^H0eb)d

diff --git a/start.sh b/start.sh
index f6a3d36..fbd1405 100755
--- a/start.sh
+++ b/start.sh
@@ -6,7 +6,16 @@ cd "$(dirname "$0")"
 # Create the bin directory.
 mkdir -p bin
 
-if [[ "$OSTYPE" == "darwin"* ]]; then
+# Check that we are running on a sensible platform.
+uname -o | grep Cygwin > /dev/null
+if [ $? -ne 1 ]; then
+	echo Cygwin is not supported. Please install a modern GNU/Linux distro.
+	exit
+fi
+
+# Setup for Darwin.
+uname -o | grep Darwin > /dev/null
+if [ $? -ne 1 ]; then
 	export CC=gcc-11
 	export CXX=g++-11
 	export CPPFLAGS=-I/opt/homebrew/include
@@ -15,13 +24,6 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 	alias gcc="gcc-11"
 	alias g++="g++-11"
 	alias sed="gsed"
-else
-	# Check that we are running on a sensible platform.
-	uname -o | grep Cygwin > /dev/null
-	if [ $? -ne 1 ]; then
-		echo Cygwin is not supported. Please install a modern GNU/Linux distro.
-		exit
-	fi
 fi
 
 # Check that the source code is valid.
diff --git a/util/build.c b/util/build.c
index 6e724b4..1a6ff5a 100644
--- a/util/build.c
+++ b/util/build.c
@@ -36,6 +36,7 @@ bool foundValidCrossCompiler;
 bool coloredOutput;
 bool encounteredErrors;
 bool interactiveMode;
+bool canBuildLuigi;
 FILE *systemLog;
 char compilerPath[4096];
 int argc;
@@ -333,15 +334,15 @@ void BuildUtilities() {
 	BUILD_UTILITY("render_svg", "-lm", "");
 	BUILD_UTILITY("build_core", "-pthread -DPARALLEL_BUILD", "");
 
-#ifndef __APPLE__ // Luigi doesn't support macOS.
-	BUILD_UTILITY("config_editor", "-lX11 -Wno-unused-parameter", "");
+	if (canBuildLuigi) {
+		BUILD_UTILITY("config_editor", "-lX11 -Wno-unused-parameter", "");
 
-	if (CheckDependencies("Utilities.Designer")) {
-		if (!CallSystem("g++ -MMD -D UI_LINUX -O3 util/designer2.cpp -o bin/designer2 -g -lX11 -Wno-unused-parameter " WARNING_FLAGS)) {
-			ParseDependencies("bin/designer2.d", "Utilities.Designer", false);
+		if (CheckDependencies("Utilities.Designer")) {
+			if (!CallSystem("g++ -MMD -D UI_LINUX -O3 util/designer2.cpp -o bin/designer2 -g -lX11 -Wno-unused-parameter " WARNING_FLAGS)) {
+				ParseDependencies("bin/designer2.d", "Utilities.Designer", false);
+			}
 		}
 	}
-#endif
 }
 
 void Build(int optimise, bool compile) {
@@ -1573,6 +1574,8 @@ int main(int _argc, char **_argv) {
 	printf("Enter 'help' to get a list of commands.\n");
 	char *prev = NULL;
 
+	canBuildLuigi = !CallSystem("gcc -o bin/luigi.h.gch util/luigi.h -D UI_IMPLEMENTATION -D UI_LINUX");
+
 	while (true) {
 		char *l = NULL;
 		size_t pos = 0;