From e4c3343d0c866cc6e26a17d2d5af9b3f26696f8c Mon Sep 17 00:00:00 2001
From: LoRd_MuldeR <mulder2@gmx.de>
Date: Thu, 29 Sep 2022 21:05:16 +0200
Subject: [PATCH] Fixed detection of 32-Bit (x86) version of Haiku OS.

---
 Makefile                | 2 +-
 frontend/res/version.rc | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 74fcee0..e90eea6 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,7 @@ else
   CFLAGS += -DSLUNKBUILD_NOTHREADS
 endif
 
-ifneq (,$(firstword $(filter %-unknown-haiku,$(MACHINE))))
+ifneq (,$(firstword $(filter %-pc-haiku %-unknown-haiku,$(MACHINE))))
   LDFLGS += -lbsd
 endif
 
diff --git a/frontend/res/version.rc b/frontend/res/version.rc
index df2ecc7..953c43e 100644
--- a/frontend/res/version.rc
+++ b/frontend/res/version.rc
@@ -8,9 +8,9 @@
 
 #include "../../libslunkcrypt/src/version.h"
 
-#define VERSION_HELPER1(X,Y,Z) #X "." #Y "." #Z
-#define VERSION_HELPER2(X,Y,Z) VERSION_HELPER1(X,Y,Z)
-#define VERSION_STRING VERSION_HELPER2(LIB_VERSION_MAJOR,LIB_VERSION_MINOR,LIB_VERSION_PATCH)
+#define _VERSION_STRING_HELPER1(W,X,Y,Z) #W "." #X "." #Y "." #Z
+#define _VERSION_STRING_HELPER2(W,X,Y,Z) _VERSION_STRING_HELPER1(W,X,Y,Z)
+#define VERSION_STRING _VERSION_STRING_HELPER2(LIB_VERSION_MAJOR,LIB_VERSION_MINOR,0,LIB_VERSION_PATCH)
 
 /////////////////////////////////////////////////////////////////////////////
 //