zeroMQrr for Matlab now running on windows

Author: jonaskn

Resources/Matlab/compile_matlab_zeroMQrr.m

@@ -3,14 +3,14 @@
 % 1. find the correct locations of zermoMQ librearies and heaers
 if strfind(computer,'PCWIN')
     Codefolder=mfilename('fullpath');
-    Codefolder=Codefolder(1:(end-length(mfilename()-1)));
-    libraryName = 'libzmq-v110-mt-3_2_2';
+    Codefolder=Codefolder(1:(end-length(mfilename()-1)-length('Matlab')-1-1));
+    libraryName = 'libzmq-v120-mt-4_0_4';
     if strcmp(computer,'PCWIN64')
-        libFolder = [Codefolder, '/Resources/windows-libs/ZeroMQ/lib_x64'];
+        libFolder = [Codefolder, '\windows-libs\ZeroMQ\lib_x64'];
     else
-        libFolder = [Codefolder, '/Resources/windows-libs/ZeroMQ/lib_x86'];
+        libFolder = [Codefolder, '\windows-libs\ZeroMQ\lib_x86'];
     end
-     headerFolder = [Codefolder, '/Resources/windows-libs/ZeroMQ/include'];
+     headerFolder = [Codefolder, '\windows-libs\ZeroMQ\include'];
 elseif strcmp(computer,'GLNX86') || strcmp(computer,'GLNXA64')
     libraryName = 'zmq';
     if ~isempty(dir(['/usr/local/lib/lib' libraryName '*']))

Resources/Matlab/libzmq-v120-mt-4_0_4.dll

@@ -30,6 +30,9 @@
 typedef struct {
     bool thread_running;
     int threadIdleTime;
+#ifdef _WIN32
+    DWORD dwThread;
+#endif
 } ThreadData;
 
 typedef struct {
@@ -403,12 +406,14 @@ void mexFunction( int nlhs, mxArray* plhs[],
                wairForEmptyQueue=false;
           }
           OutDialogues_mutex.unlock();     
-          do_sleep(ms1);
+          do_sleep(ms10);
        }
 
        //now we build a struct with all replies
        OutDialogues_mutex.lock();
-       lastDialogueFetched=OutDialogues.back().timeRequestAdded;
+       if(!OutDialogues.empty()){
+        lastDialogueFetched=OutDialogues.back().timeRequestAdded;
+       }
 
        mxArray * mxOutStruct = mxCreateStructMatrix(1,OutDialogues.size(),5,dialogueFieldnames);		
 
@@ -434,5 +439,5 @@ void mexFunction( int nlhs, mxArray* plhs[],
        OutDialogues_mutex.unlock();
 
        plhs[0] = mxOutStruct;
-	}
+   }
 }