From b4d3b5d8beea2a48e97d993e852cfe2103a83b21 Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Mon, 11 Nov 2019 04:07:51 +0300
Subject: [PATCH] wscript: enable library naming

---
 cl_dll/wscript | 2 +-
 dlls/wscript   | 2 +-
 wscript        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cl_dll/wscript b/cl_dll/wscript
index 02a9d530..b45242d5 100644
--- a/cl_dll/wscript
+++ b/cl_dll/wscript
@@ -60,7 +60,7 @@ def build(bld):
 
 	bld.shlib(
 		source   = source,
-		target   = 'client',
+		target   = 'client' + bld.env.POSTFIX,
 		features = 'c cxx',
 		includes = includes,
 		defines  = defines,
diff --git a/dlls/wscript b/dlls/wscript
index e5268e05..24e93e71 100644
--- a/dlls/wscript
+++ b/dlls/wscript
@@ -68,7 +68,7 @@ def build(bld):
 
 	bld.shlib(
 		source   = source,
-		target   = bld.env.SERVER_NAME,
+		target   = bld.env.SERVER_NAME + bld.env.POSTFIX,
 		features = 'c cxx',
 		includes = includes,
 		defines  = defines,
diff --git a/wscript b/wscript
index 3a885ac9..15c4b175 100644
--- a/wscript
+++ b/wscript
@@ -87,7 +87,7 @@ def configure(conf):
 	conf.env.MSVC_TARGETS = ['x86'] # explicitly request x86 target for MSVC
 	if sys.platform == 'win32':
 		conf.load('msvc msdev')
-	conf.load('xcompile compiler_c compiler_cxx strip_on_install library_naming')
+	conf.load('xcompile compiler_c compiler_cxx strip_on_install')
 
 	try:
 		conf.env.CC_VERSION[0]
@@ -122,7 +122,7 @@ def configure(conf):
 	else:
 		conf.env.BIT32_ALLOW64 = True
 	conf.env.BIT32_MANDATORY = not conf.env.BIT32_ALLOW64
-	conf.load('force_32bit')
+	conf.load('force_32bit library_naming')
 
 	linker_flags = {
 		'common': {