View | Details | Raw Unified | Return to bug 14655
Collapse All | Expand All

(-)sip/siputils.py.orig (-6 / +7 lines)
Lines 381-392 class Makefile: Link Here
381
            incdir.append(self.config.py_inc_dir)
381
            incdir.append(self.config.py_inc_dir)
382
            incdir.append(self.config.py_conf_inc_dir)
382
            incdir.append(self.config.py_conf_inc_dir)
383
383
384
            if sys.platform == "cygwin":
384
            if sys.platform == "win32":
385
                libdir.append(self.config.py_lib_dir)
386
387
                py_lib = "python%u.%u" % ((self.config.py_version >> 16), ((self.config.py_version >> 8) & 0xff))
388
                libs.append(self.platform_lib(py_lib))
389
            elif sys.platform == "win32":
390
                libdir.append(self.config.py_lib_dir)
385
                libdir.append(self.config.py_lib_dir)
391
386
392
                py_lib = "python%u%u" % ((self.config.py_version >> 16), ((self.config.py_version >> 8) & 0xff))
387
                py_lib = "python%u%u" % ((self.config.py_version >> 16), ((self.config.py_version >> 8) & 0xff))
Lines 409-414 class Makefile: Link Here
409
                        cxxflags.append("/D_DEBUG")
404
                        cxxflags.append("/D_DEBUG")
410
405
411
                libs.append(self.platform_lib(py_lib))
406
                libs.append(self.platform_lib(py_lib))
407
            else:
408
                libdir.append(self.config.py_lib_dir)
409
410
                py_lib = "python%u.%u" % ((self.config.py_version >> 16), ((self.config.py_version >> 8) & 0xff))
411
                libs.append(self.platform_lib(py_lib))
412
412
413
413
        if self.generator in ("MSVC", "MSVC.NET", "BMAKE"):
414
        if self.generator in ("MSVC", "MSVC.NET", "BMAKE"):
414
            if win_exceptions:
415
            if win_exceptions:

Return to bug 14655