successfully builds on win32 w/ mbuild

Raptura · Sep 24, 2014 · a70fdfa · a70fdfa
1 parent d798e0d
commit a70fdfa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -25,7 +25,7 @@ endif
 
 
 all: pod-build/Makefile
-	cmake --build pod-build --target install
+	cmake --build pod-build --config $(BUILD_TYPE) --target install
 
 pod-build/Makefile:
 	$(MAKE) configure
@@ -82,7 +82,7 @@ clean:
 
 # other (custom) targets are passed through to the cmake-generated Makefile
 %::
-	cmake --build pod-build --target $@
+	cmake --build pod-build --config $(BUILD_TYPE) --target $@
 
 # Default to a less-verbose build.  If you want all the gory compiler output,
 # run "make VERBOSE=1"

diff --git a/cmake b/cmake
diff --git a/systems/plants/constructModelmex.cpp b/systems/plants/constructModelmex.cpp
@@ -332,7 +332,7 @@ void mexFunction( int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[] )
     model->frames[i].body_ind = (int) mxGetScalar(pm)-1;
 
     pm = mxGetProperty(pFrames,i,"T");
-    memcpy(model->frames[i].T.data(),mxGetPr(pm),sizeof(double)*4*4);
+    memcpy(model->frames[i].Ttree.data(),mxGetPr(pm),sizeof(double)*4*4);
   }