Skip to content

Changes required to build Sibernetic on macOS 10.15.5 (Catalina). #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Changes required to build Sibernetic on macOS 10.15.5 (Catalina). #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@ simulations
.vscode/*
.settings/*
.idea/*

# Jupyter
/notebooks
9 changes: 5 additions & 4 deletions makefile.OSX
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
3 changes: 2 additions & 1 deletion src/owSignalSimulator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down