From 568365f5bdd4dc71a156ca963d89ac002f405a34 Mon Sep 17 00:00:00 2001
From: Wiimm <wiimm@wiimm.de>
Date: Fri, 13 May 2022 19:22:13 +0200
Subject: SZS v2.27a

---
 project/dclib/Makefile.inc | 49 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 8 deletions(-)

(limited to 'project/dclib/Makefile.inc')

diff --git a/project/dclib/Makefile.inc b/project/dclib/Makefile.inc
index d386594..45fc2a5 100644
--- a/project/dclib/Makefile.inc
+++ b/project/dclib/Makefile.inc
@@ -1,17 +1,45 @@
 
+ ###########################################################################
+ #                                                                         #
+ #                     _____     ____                                      #
+ #                    |  __ \   / __ \   _     _ _____                     #
+ #                    | |  \ \ / /  \_\ | |   | |  _  \                    #
+ #                    | |   \ \| |      | |   | | |_| |                    #
+ #                    | |   | || |      | |   | |  ___/                    #
+ #                    | |   / /| |   __ | |   | |  _  \                    #
+ #                    | |__/ / \ \__/ / | |___| | |_| |                    #
+ #                    |_____/   \____/  |_____|_|_____/                    #
+ #                                                                         #
+ #                       Wiimms source code library                        #
+ #                                                                         #
+ ###########################################################################
+
 #------------------------------------------------------------------------------
 # standard object files
 
-DCLIB_O = dclib-basics.o dclib-cli.o dclib-color.o dclib-numeric.o \
-		dclib-file.o dclib-option.o dclib-regex.o \
-		dclib-utf8.o dclib-shift-jis.o \
-		dclib-vector.o dclib-tables.o dclib-ui.o \
-		dclib-xdump.o dclib-debug.o
-DCLIB_O1 := lib-dol.o lib-bmg.o lib-mkw.o
-DCLIB_O2 := lib-wiimmfi.o lib-gamespy.o lib-natneg.o
+DCLIB_O		:= dclib-basics.o dclib-cli.o dclib-color.o dclib-numeric.o \
+			dclib-file.o dclib-option.o dclib-regex.o \
+			dclib-utf8.o dclib-shift-jis.o \
+			dclib-vector.o dclib-tables.o dclib-ui.o \
+			dclib-xdump.o dclib-debug.o
+
+DCLIB_O_MKW	:= lib-dol.o lib-bmg.o lib-mkw.o
+
+DCLIB_O_WIIMMFI	:= lib-wiimmfi.o lib-gamespy.o lib-natneg.o
+
+# legacy
+DCLIB_O1	:= $(DCLIB_O_MKW)
+DCLIB_O2	:= $(DCLIB_O_WIIMMFI)
 
 DCLIB_PRIVATE := dclib-terminal* dclib-command* lib-wiimmfi* lib-gamespy* lib-natneg*
 
+#------------------------------------------------------------------------------
+# if DCLIB_THREADS not set: disable it
+
+ifeq ($(origin DCLIB_THREAD), undefined)
+  DCLIB_THREAD := 0
+endif
+
 #------------------------------------------------------------------------------
 # if DCLIB_MYSQL not set: enable it if file 'mysql.h' is found
 
@@ -43,8 +71,13 @@ endif
 #------------------------------------------------------------------------------
 # add libraries and guardian macros
 
+ifeq ($(DCLIB_THREAD),1)
+    DCLIB_O += dclib-thread.o
+    DCLIB_FLAGS += -DDCLIB_THREAD=1
+endif
+
 ifeq ($(DCLIB_NETWORK),1)
-    DCLIB_O += dclib-network.o
+    DCLIB_O += dclib-network.o dclib-punycode.o
     DCLIB_FLAGS += -DDCLIB_NETWORK=1
 else
     DCLIB_MYSQL := 0
-- 
cgit v1.3.1