From 0aea808d7d8b3fb226957e2a16bdd02c3f5afa9a Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@icculus.org>
Date: Sun, 8 May 2022 09:41:15 -0700
Subject: [PATCH] WorldSpawn and VMAP now fully build under MSYS2.

---
 libs/globaldefs.h           |  2 +-
 libs/uilib/Makefile         |  3 ++-
 plugins/archivezip/Makefile |  4 +++-
 src/Makefile                | 20 +++++++++++++-------
 tools/Makefile              |  4 ++--
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/libs/globaldefs.h b/libs/globaldefs.h
index 19c4623..78f49d0 100644
--- a/libs/globaldefs.h
+++ b/libs/globaldefs.h
@@ -25,7 +25,7 @@
 
 // OS
 
-#if defined(POSIX) || defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
+#if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
 #define GDEF_OS_POSIX 1
 #define XWINDOWS 1
 #else
diff --git a/libs/uilib/Makefile b/libs/uilib/Makefile
index 63739b2..62d24dc 100644
--- a/libs/uilib/Makefile
+++ b/libs/uilib/Makefile
@@ -1,7 +1,8 @@
 # WorldSpawn Makefile 
 
 GTK_CFLAGS=$(shell pkg-config --cflags gtk+-2.0)
-LIB_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) -I../../include -I../../libs -DGTK_TARGET=2 
+GLIB_CFLAGS=$(shell pkg-config --cflags glib-2.0)
+LIB_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -DGTK_TARGET=2 
 DO_CXX=$(CXX) -static -fPIC $(LIB_CFLAGS) -o $@ -c $<
 
 .cpp.o:
diff --git a/plugins/archivezip/Makefile b/plugins/archivezip/Makefile
index 3832bf7..8bf6d50 100644
--- a/plugins/archivezip/Makefile
+++ b/plugins/archivezip/Makefile
@@ -1,7 +1,9 @@
 # WorldSpawn Plugin Makefile 
 
+ZLIB_LDFLAGS=$(shell pkg-config --libs zlib)
+
 PLUGIN_CFLAGS=$(CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
-PLUGIN_LDFLAGS=$(LDFLAGS) -shared
+PLUGIN_LDFLAGS=$(LDFLAGS) -shared $(ZLIB_LDFLAGS)
 
 DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<
 
diff --git a/src/Makefile b/src/Makefile
index e4f35a7..1a6a75a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,18 +1,23 @@
 # WorldSpawn Makefile 
 
-# may be needed under msys2
-GLIB_CFLAGS=$(shell pkg-config --cflags glib-2.0)
-GLIB_LDFLAGS=$(shell pkg-config --libs glib-2.0)
-
 GTK_CFLAGS=$(shell pkg-config --cflags gtk+-2.0)
 GTK_LDFLAGS=$(shell pkg-config --libs gtk+-2.0)
 
+GLIB_CFLAGS=$(shell pkg-config --cflags glib-2.0)
+GLIB_LDLAGS=$(shell pkg-config --libs glib-2.0)
+
 XML_CFLAGS=$(shell pkg-config --cflags libxml-2.0)
 XML_LDFLAGS=$(shell pkg-config --libs libxml-2.0)
 
 GLEXT_CFLAGS=$(shell pkg-config --cflags gtkglext-1.0)
 GLEXT_LDFLAGS=$(shell pkg-config --libs gtkglext-1.0)
 
+PANGO_CFLAGS=$(shell pkg-config --cflags pango)
+PANGO_LDFLAGS=$(shell pkg-config --libs pango)
+
+PANGOFT2_CFLAGS=$(shell pkg-config --cflags pangoft2)
+PANGOFT2_LDFLAGS=$(shell pkg-config --libs pangoft2)
+
 WS_LIBS= ../libs/libcmdlib.a \
 	../libs/libcontainer.a \
 	../libs/libddslib.a \
@@ -35,8 +40,8 @@ WS_LIBS= ../libs/libcmdlib.a \
 	../libs/libuilib.a \
 	../libs/libxmllib.a
 
-WS_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) $(GLEXT_CFLAGS) -I../include -I../libs -DGTK_TARGET=2 $(WS_VERSION)
-WS_LDFLAGS=$(LDFLAGS) -lm $(GLIB_LDFLAGS) $(GTK_LDFLAGS) $(XML_LDFLAGS) $(GLEXT_LDFLAGS) -L../lib $(WS_LIBS)
+WS_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) $(GLEXT_CFLAGS) -I../include -I../libs -DGTK_TARGET=2 -static-libgcc -static-libstdc++ $(WS_VERSION)
+WS_LDFLAGS=$(LDFLAGS) -lm -lws2_32 $(GTK_LDFLAGS) $(GLIB_LDFLAGS) $(XML_LDFLAGS) $(PANGO_LDFLAGS) $(PANGOFT2_LDFLAGS) $(GLEXT_LDFLAGS) -static-libgcc -static-libstdc++ -L../lib
 
 DO_CXX=$(CXX) $(WS_CFLAGS) -o $@ -c $<
 
@@ -81,6 +86,7 @@ WS_OBJS = \
 	image.o \
 	main.o \
 	mainframe.o \
+	multimon.o \
 	map.o \
 	mru.o \
 	nullmodel.o \
@@ -127,7 +133,7 @@ WS_OBJS = \
 
 # binary target
 ../build/worldspawn: $(WS_OBJS)
-	$(CXX) -o $@ $(WS_OBJS) $(WS_LDFLAGS)
+	$(CXX) -o $@ $(WS_OBJS) $(WS_LIBS) $(WS_LDFLAGS)
 
 clean:
 	-rm -f *.o ../build/worldspawn
diff --git a/tools/Makefile b/tools/Makefile
index 268086d..7668532 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -24,7 +24,7 @@ PNG_CFLAGS=$(shell pkg-config --cflags libpng)
 PNG_LDFLAGS=$(shell pkg-config --libs libpng)
 
 VMAP_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS) $(MINIZIP_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) -I../include  -I./common -I../libs
-VMAP_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) $(XML_LDFLAGS) $(MINIZIP_LDFLAGS) $(JPEG_LDFLAGS) $(PNG_LDFLAGS) -lm -lpthread -L../lib $(LIBOBJS)
+VMAP_LDFLAGS=$(LDFLAGS) -lm -lws2_32 -lpthread -L../lib $(GLIB_LDFLAGS) $(XML_LDFLAGS) $(MINIZIP_LDFLAGS) $(JPEG_LDFLAGS) $(PNG_LDFLAGS)
 
 DO_CC=$(CC) $(VMAP_CFLAGS) -o $@ -c $<
 
@@ -91,7 +91,7 @@ VMAP_OBJS = \
 
 # binary target
 ../build/vmap: $(VMAP_OBJS)
-	$(CXX) -o $@ $(VMAP_OBJS) $(VMAP_LDFLAGS)
+	$(CXX) -o $@ $(VMAP_OBJS) $(LIBOBJS) $(VMAP_LDFLAGS)
 
 clean:
 	-rm -f ./common/*.o