From 47291eca66d0646839a195ca7c692076872b7119 Mon Sep 17 00:00:00 2001
From: "Cesar A. Rodriguez" <cesarr@icloud.com>
Date: Mon, 13 Jul 2020 23:03:02 -0400
Subject: [PATCH] Changes required to compile Sibernetic on macOS 10.15.5
 (Catalina).

---
 .gitignore                | 3 +++
 makefile.OSX              | 9 +++++----
 src/owSignalSimulator.cpp | 3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index c7d0dbf4..80f4edac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,6 @@ simulations
 .vscode/*
 .settings/*
 .idea/*
+
+# Jupyter
+/notebooks
diff --git a/makefile.OSX b/makefile.OSX
index 2025d0d8..92f45292 100644
--- a/makefile.OSX
+++ b/makefile.OSX
@@ -9,7 +9,8 @@ src/owHelper.cpp \
 src/owOpenCLSolver.cpp \
 src/owPhysicsFluidSimulator.cpp \
 src/owWorldSimulation.cpp \
-src/owNeuronSimulator.cpp
+src/owNeuronSimulator.cpp \
+src/owConfigProperty.cpp
 
 TEST_SOURCES = src/test/owPhysicTest.cpp
 
@@ -25,9 +26,9 @@ OBJECTS += $(BINARYTESTDIR)/owPhysicTest.o
 CPP_DEPS = $(OBJECTS:.o=.d)
 
 # Change these to set the different python directories
-PYTHONHEADERDIR = /opt/local/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7/
-PYTHONLIBDIR = /opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/
-PYTHONFRAMEWORKDIR = /Library/Frameworks/
+PYTHONHEADERDIR = /System/Library/Frameworks/Python.framework/Versions/2.7/Headers/
+PYTHONLIBDIR = /System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/
+PYTHONFRAMEWORKDIR = /System/Library/Frameworks/
 
 LIBS := -framework Python -framework OpenGL -framework GLUT -framework OpenCL
 
diff --git a/src/owSignalSimulator.cpp b/src/owSignalSimulator.cpp
index d76529b0..0ab6eb43 100644
--- a/src/owSignalSimulator.cpp
+++ b/src/owSignalSimulator.cpp
@@ -85,7 +85,8 @@ SignalSimulator::SignalSimulator(const std::string &simFileName,
     PyObject *dt = Py_BuildValue("f", timeStep); // Create tuple of arguments for initialization
     PyObject *pFuncName = Py_BuildValue("s", "set_timestep");
     //pInstance = PyObject_CallMethod(pInstance, "set_timestep", "(f)", timeStep);
-    PyObject_CallMethodObjArgs(pInstance, pFuncName, dt, nullptr);
+    // PyObject_CallMethodObjArgs(pInstance, pFuncName, dt, nullptr);
+    PyObject_CallMethodObjArgs(pInstance, pFuncName, dt, NULL);
     if (PyErr_Occurred())
       PyErr_Print();
     Py_DECREF(dt);