From 02e1a7a62b8ee9e3fc2faad458f1f508a74430c1 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 22 Jul 2019 13:44:55 +0100 Subject: [PATCH] Update swig to renderdoc-modified-7 tag. Closes #1455 --- qrenderdoc/3rdparty/swig/Lib/python/builtin.swg | 2 +- qrenderdoc/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qrenderdoc/3rdparty/swig/Lib/python/builtin.swg b/qrenderdoc/3rdparty/swig/Lib/python/builtin.swg index 9597653b7..6af45a9d1 100644 --- a/qrenderdoc/3rdparty/swig/Lib/python/builtin.swg +++ b/qrenderdoc/3rdparty/swig/Lib/python/builtin.swg @@ -120,7 +120,7 @@ SwigPyBuiltin_FunpackSetterClosure (PyObject *obj, PyObject *val, void *closure) SWIGINTERN void SwigPyStaticVar_dealloc(PyDescrObject *descr) { - _PyObject_GC_UNTRACK(descr); + PyObject_GC_UnTrack(descr); Py_XDECREF(PyDescr_TYPE(descr)); Py_XDECREF(PyDescr_NAME(descr)); PyObject_GC_Del(descr); diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt index 9d27bfffe..ff2dbabad 100644 --- a/qrenderdoc/CMakeLists.txt +++ b/qrenderdoc/CMakeLists.txt @@ -6,7 +6,7 @@ if( NOT DEFINED QT_QMAKE_EXECUTABLE ) endif() set(QMAKE_QT5_COMMAND ${QT_QMAKE_EXECUTABLE} CACHE STRING "Command to run to invoke Qt5's qmake. Normally this is qmake, possibly with qtchooser, but might be qmake-qt5") -set(RENDERDOC_SWIG_PACKAGE https://github.com/baldurk/swig/archive/renderdoc-modified-6.zip CACHE STRING "The location where RenderDoc's swig fork source can be found. By default points to the URL on github but can be pointed to a local file.") +set(RENDERDOC_SWIG_PACKAGE https://github.com/baldurk/swig/archive/renderdoc-modified-7.zip CACHE STRING "The location where RenderDoc's swig fork source can be found. By default points to the URL on github but can be pointed to a local file.") set(QMAKE_CONFIG "debug") set(QMAKE_LDFLAGS "")