Merge pull request #7 from rbp28668/Mach3_Output

Build for release 6.1
rbp28668 · May 13, 2020 · 534dfee · 534dfee
2 parents d321743 + 20a5e69
commit 534dfee
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 # Gitignore file for generated object files etc.
 
 # Output files fromm build.
-*.exe
 *.obj
 *.res
 *.idb
@@ -11,7 +10,8 @@ Plots/*
 
 # Output folders
 **/ipch/*
-**/x64/*
+AEROFOIL/x64/*
+AEROFOIL/x86/*
 **/Debug/*
 **/Release/*
 

diff --git a/CutterGeometryDialog.cpp b/CutterGeometryDialog.cpp
@@ -2,6 +2,7 @@
 //
 
 #include "stdafx.h"
+#include <assert.h>
 #include "Aerofoil.h"
 #include "CutterGeometryDialog.h"
 #include "afxdialogex.h"

diff --git a/CutterPreviewWindow.cpp b/CutterPreviewWindow.cpp
@@ -2,6 +2,7 @@
 //
 
 #include "stdafx.h"
+#include <assert.h>
 #include <string>
 #include <sstream>
 #include "Aerofoil.h"

diff --git a/Releases/6.1/x64/Aerofoil.exe b/Releases/6.1/x64/Aerofoil.exe
diff --git a/Releases/6.1/x64/Cutter.exe b/Releases/6.1/x64/Cutter.exe
diff --git a/Releases/6.1/x86/Aerofoil.exe b/Releases/6.1/x86/Aerofoil.exe
diff --git a/Releases/6.1/x86/Cutter.exe b/Releases/6.1/x86/Cutter.exe