CustomizedMechanisms: r36_mine_loadingmechanisms.diff

File r36_mine_loadingmechanisms.diff, 1.9 kB (added by eacheon, 1 year ago)
  • pygetsetcall/src/nrnpython/neuron/__init__.py

    old new  
    66$Id: neuron.py 18 2007-05-18 09:08:00Z apdavison $ 
    77""" 
    88 
    9 import hoc 
     9from neuron import hoc 
    1010from hoc import HocObject 
    1111 
    1212h = hoc.HocObject() 
  • pygetsetcall/src/nrnpython/inithoc.cpp

    old new  
    99 
    1010extern int nrn_is_python_extension; 
    1111extern int ivocmain(int, char**, char**); 
    12 static char* argv[] = {"NEURON", 0}; 
     12static char* argv[] = {"NEURON", "-dll", "./i686/.libs/libnrnmech.so"}; 
    1313static char* env[] = {0}; 
    1414void inithoc() { 
    1515        nrn_is_python_extension = 1; 
    16         ivocmain(1, argv, env); 
     16        ivocmain(3, argv, env); 
    1717        nrnpy_hoc(); 
    1818} 
    1919 
  • pygetsetcall/bin/nrnmech_makefile.in

    old new  
    4040        $(AM_LDFLAGS) $(LDFLAGS) -o $@ 
    4141 
    4242NRNOCLIBS = -L"$(libdir)" -lnrnoc -loc @MEMACSLIB@ \ 
    43         -lscopmath -lsparse13 @READLINE_LIBS@ 
     43        -lnrnmpi -lscopmath -lsparse13 @READLINE_LIBS@ 
    4444NRNIVLIBS = -L"$(libdir)" "$(libdir)/libnrniv.la" -livoc \ 
    4545        -lneuron_gnu -lmeschach -lsundials \ 
    4646        $(IVOS_LIB) $(IV_LIBS) $(NJ_LIBS) $(PY_LIBS) $(NRNNI_LIBS) $(PVM_LIBS) 
     
    8383        $(LTCOMPILE) -c -o $@ $*.c 
    8484 
    8585libnrnmech_la_OBJECTS = $(MODOBJFILES) mod_func.lo $(COBJFILES) 
    86 libnrnmech_la_LIBADD = $(NRNOCLIBS) 
     86libnrnmech_la_LIBADD = $(NRNOCLIBS) $(NRNIVLIBS) 
    8787 
    8888libnrnmech.la: $(libnrnmech_la_OBJECTS) $(libnrnmech_la_DEPENDENCIES) 
    8989        $(LINK) -rpath "$(libdir)" $(libnrnmech_la_LDFLAGS) $(libnrnmech_la_OBJECTS) $(libnrnmech_la_LIBADD) $(LIBS)