From 47bea6772b59261e7b69955c1d903e8a52f318e1 Mon Sep 17 00:00:00 2001
From: Tim Stahlhut <stahta01@gmail.com>
Date: Wed, 8 Jun 2022 23:53:30 -0400
Subject: Revert some of sip via python changes

---
 build.py             | 51 ++++++++++++++++++++++----------------------
 buildtools/config.py |  4 ++--
 sip/siplib/sip.h     |  3 +++
 wscript              |  7 ++++++
 4 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/buildtools/config.py b/buildtools/config.py
index 4482ba9d..bc46412a 100644
--- a/buildtools/config.py
+++ b/buildtools/config.py
@@ -27,8 +27,6 @@ from distutils.dep_util  import newer
 
 import distutils.sysconfig
 
-from attrdict import AttrDict
-
 runSilently = False
 
 #----------------------------------------------------------------------
@@ -174,6 +172,8 @@ class Configuration(object):
                              ('WXUSINGDLL', '1'),
                              ('ISOLATION_AWARE_ENABLED', None),
                              #('NDEBUG',),  # using a 1-tuple makes it do an undef
+                             ('SIP_MODULE_NAME', 'wx.siplib'),
+                             ('SIP_MODULE_BASENAME', 'siplib'),
                              ]
             if int(getVisCVersion()) > 100:
                 self.defines += [ ('wxUSE_RC_MANIFEST', '1'),
diff --git a/sip/siplib/sip.h b/sip/siplib/sip.h
index 5f0f0591..449a4e8a 100644
--- a/sip/siplib/sip.h
+++ b/sip/siplib/sip.h
@@ -109,6 +109,9 @@ typedef unsigned int uint;
 
 #endif
 
+/* Remove in v5.0. */
+#define SIP_MLNAME_CAST(s)  ((char *)(s))
+#define SIP_MLDOC_CAST(s)   ((char *)(s))
 
 /* Remove in v5.1. */
 #define SIP_SSIZE_T             Py_ssize_t
diff --git a/wscript b/wscript
index 4f0d0bf5..9ec28673 100644
--- a/wscript
+++ b/wscript
@@ -33,7 +33,7 @@
 
 
 def options(opt):
-    if isWindows:
+    if False:
         opt.load('msvc')
     opt.load('compiler_c compiler_cxx')
     opt.load('python')
@@ -308,6 +308,13 @@
         conf.env.CFLAGS_WXPY.append('-UNDEBUG')
         conf.env.CXXFLAGS_WXPY.append('-UNDEBUG')
 
+        # set the name of our siplib module
+        conf.env.CFLAGS_WXPY.append('-DSIP_MODULE_NAME=wx.siplib')
+        conf.env.CXXFLAGS_WXPY.append('-DSIP_MODULE_NAME=wx.siplib')
+
+        conf.env.CFLAGS_WXPY.append('-DSIP_MODULE_BASENAME=siplib')
+        conf.env.CXXFLAGS_WXPY.append('-DSIP_MODULE_BASENAME=siplib')
+
         # Add basic debug info for all builds
         conf.env.CFLAGS_WXPY.append('-g')
         conf.env.CXXFLAGS_WXPY.append('-g')