From b781036c4a6d9b65c94e6cec2c080b573d3cf015 Mon Sep 17 00:00:00 2001
From: Qianqian Fang <fangqq@gmail.com>
Date: Sat, 5 Aug 2023 16:02:35 -0400
Subject: [PATCH] add the missing MEXLINKLIBS variable

---
 .travis.yml  | 14 +++++++-------
 pymcx        |  2 +-
 src/Makefile |  5 ++++-
 src/pybind11 |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dc851923..719425e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,10 +49,10 @@ script:
   - chmod +x .github/check-pypi-upload.sh
   - GITHUB_OUTPUT=./pypi_upload .github/check-pypi-upload.sh
 
-deploy:
-  provider: pypi
-  username: "__token__"
-  distributions: "bdist_wheel"
-  password:
-    secure: cY74UjxKDiP3tTgQoYlAt06MlD8A1t2HPDDWqv+8UN9O0npoBZvyheXkaGRxd5Qx8CmapI12KfLCZl4wC3xEh9zUtPn20JwglKOYi6myOtnzn1QtUU9cNsP3IOFdZmDUNivaa02vyCONwg98d7nRUKaG9OoIJ7dN1zO26gT8G0cY5xnwmqw9ycwqQWb5waRFxS9Pel4QA3jm8gRC7FYezXWkvwLSCsMHPvf4ddYiMk5aTKmASAJ2gvieHzefuoswB+ujHUDt+UMwlr9iL9QgIwJtV6jO0z5aW7ruOSQa6ZvbN62Vtrd/ocY7ADx5MeOOb3S8hDsI7a1osJHGQKePzE22+dcBU92UOWfkEgefzdd2L26kyst3Qjlqh3eR4frPUTQUipeK/XIQ4o0sL4gMd4zXpXskyUXQr6Y0EsdRT5buDure2qiLBVA+3USTKCv8Gu2WJIwHwrNab0LThtAtKkgiwvebQBEbRYR2mkJicjZYJSsvEbL7aKounBxNv2lqOl+wul9sH5BEWcnBrbZ5h15BbNGJoTjmNQINTbkNSvsITHA2u3CT7aRL+WJ6XuoRSX8WNOn8+OLaOJoHSCpoDo6MR4Z+B4Q0IGvjdbOmzH3KVYopGjQb1YCu+a5m+QqRKO7SXAX6aJd9KLav9mLUIWVZCvFodvEhJwuW34RqeG8=
-  edge: true
+#deploy:
+#  provider: pypi
+#  username: "__token__"
+#  distributions: "bdist_wheel"
+#  password:
+#    secure: cY74UjxKDiP3tTgQoYlAt06MlD8A1t2HPDDWqv+8UN9O0npoBZvyheXkaGRxd5Qx8CmapI12KfLCZl4wC3xEh9zUtPn20JwglKOYi6myOtnzn1QtUU9cNsP3IOFdZmDUNivaa02vyCONwg98d7nRUKaG9OoIJ7dN1zO26gT8G0cY5xnwmqw9ycwqQWb5waRFxS9Pel4QA3jm8gRC7FYezXWkvwLSCsMHPvf4ddYiMk5aTKmASAJ2gvieHzefuoswB+ujHUDt+UMwlr9iL9QgIwJtV6jO0z5aW7ruOSQa6ZvbN62Vtrd/ocY7ADx5MeOOb3S8hDsI7a1osJHGQKePzE22+dcBU92UOWfkEgefzdd2L26kyst3Qjlqh3eR4frPUTQUipeK/XIQ4o0sL4gMd4zXpXskyUXQr6Y0EsdRT5buDure2qiLBVA+3USTKCv8Gu2WJIwHwrNab0LThtAtKkgiwvebQBEbRYR2mkJicjZYJSsvEbL7aKounBxNv2lqOl+wul9sH5BEWcnBrbZ5h15BbNGJoTjmNQINTbkNSvsITHA2u3CT7aRL+WJ6XuoRSX8WNOn8+OLaOJoHSCpoDo6MR4Z+B4Q0IGvjdbOmzH3KVYopGjQb1YCu+a5m+QqRKO7SXAX6aJd9KLav9mLUIWVZCvFodvEhJwuW34RqeG8=
+#  edge: true
diff --git a/pymcx b/pymcx
index e957869b..c5c841d0 160000
--- a/pymcx
+++ b/pymcx
@@ -1 +1 @@
-Subproject commit e957869b5761d76e12a8e7e665171946828c2469
+Subproject commit c5c841d02e1252c83f88c73337d6c870bb8b668c
diff --git a/src/Makefile b/src/Makefile
index 4c9fbac8..48f311bd 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -33,7 +33,7 @@ ZMATLIB    :=lib/libzmat.a
 ZLIBFLAG   :=
 USERLINKOPT?=$(ZMATLIB) $(ZLIBFLAG)
 
-CUDART=-lcudart
+CUDART=-lcudart_static
 CUOMPLINK=
 
 ARCH = $(shell uname -m)
@@ -69,6 +69,8 @@ CPPFLAGS+=-g -Wall #-DNO_LZMA # -DUSE_OS_TIMER
 OBJSUFFIX=.o
 EXESUFFIX=
 
+MEXLINKLIBS=-L"\$$TMW_ROOT\$$MATLABROOT/extern/lib/\$$ARCH" -L"\$$TMW_ROOT\$$MATLABROOT/bin/\$$ARCH" -lmx -lmex -L$(CUDA_HOME)/lib $(CUDART)
+
 FILES=mcx_core mcx_utils mcx_shapes mcx_tictoc mcx mcx_bench mcx_mie cjson/cJSON ubj/ubjw
 
 ifeq ($(findstring _NT-,$(PLATFORM)), _NT-)
@@ -97,6 +99,7 @@ ifeq ($(findstring _NT-,$(PLATFORM)), _NT-)
   ZLIBFLAG?=
   ZMATLIB    :=zmat/zmatlib.obj zmat/lz4/lz4.obj zmat/lz4/lz4hc.obj zmat/easylzma/*.obj zmat/easylzma/pavlov/*.obj
   USERLINKOPT:=${LIBRARIES} $(ZMATLIB) $(ZLIBFLAG)
+  MEXLINKLIBS="\$$LINKLIBS"
 else ifeq ($(findstring Darwin,$(PLATFORM)), Darwin)
   CUDA_STATIC=--cudart static
   CPPOPT+=$(OMP)
diff --git a/src/pybind11 b/src/pybind11
index 2d59b43c..a8b3ff30 160000
--- a/src/pybind11
+++ b/src/pybind11
@@ -1 +1 @@
-Subproject commit 2d59b43cbf8793119fb92726ce8eb33441469e3e
+Subproject commit a8b3ff30f9649459021adc80f98a945d3ac675a5