merge master

1 files changed, 10 insertions, 3 deletions

diff --git a/tests/csgtexttest.cc b/tests/csgtexttest.cc
index 3c4451d..21ebf6a 100644
--- a/tests/csgtexttest.cc
+++ b/tests/csgtexttest.cc
@@ -39,10 +39,13 @@
 #include <QFile>
 #include <QDir>
 #include <QSet>
+#ifndef _MSC_VER
 #include <getopt.h>
+#endif
 #include <assert.h>
 #include <iostream>
 #include <sstream>
+#include <fstream>
 
 std::string commandline_commands;
 QString currentdir;
@@ -58,12 +61,13 @@ void csgTree(CSGTextCache &cache, const AbstractNode &root)
 
 int main(int argc, char **argv)
 {
-	if (argc != 2) {
-		fprintf(stderr, "Usage: %s <file.scad>\n", argv[0]);
+	if (argc != 3) {
+		fprintf(stderr, "Usage: %s <file.scad> <output.txt>\n", argv[0]);
 		exit(1);
 	}
 
 	const char *filename = argv[1];
+	const char *outfilename = argv[2];
 
 	int rc = 0;
 
@@ -149,7 +153,10 @@ int main(int argc, char **argv)
 	csgTree(csgcache, *root_node);
 // 	std::cout << tree.getString(*root_node) << "\n";
 
-	std::cout << csgcache[*root_node] << "\n";
+	std::ofstream outfile;
+	outfile.open(outfilename);
+	outfile << csgcache[*root_node] << "\n";
+	outfile.close();
 
 	destroy_builtin_functions();
 	destroy_builtin_modules();