From 065e1de739b5e70d04b13032aa2c99d820d0ca52 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Sat, 27 Aug 2011 21:41:54 +0200
Subject: compile fixes after last batch of changes


diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6e25fea..fb86448 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -139,7 +139,7 @@ include_directories(${CGAL_INCLUDE_DIRS})
 #
 # cgaltest
 #
-add_executable(cgaltest cgaltest.cc ../src/CSGTermEvaluator.cc ../src/CGALEvaluator.cc
+add_executable(cgaltest cgaltest.cc ../src/cgal.cc ../src/CSGTermEvaluator.cc ../src/CGALEvaluator.cc
                         ../src/PolySetCGALEvaluator.cc ../src/qhash.cc ../src/nef2dxf.cc
                         ../src/cgaladv_minkowski2.cc ../src/cgaladv_minkowski3.cc ${COMMON_SOURCES})
 set_target_properties(cgaltest PROPERTIES COMPILE_FLAGS "-DENABLE_CGAL ${CGAL_CXX_FLAGS_INIT}")
@@ -149,7 +149,7 @@ target_link_libraries(cgaltest ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} ${QT_
 # opencsgtest
 #
 add_executable(opencsgtest opencsgtest.cc OffscreenView.cc OffscreenContext.mm
-                           ../src/opencsgrenderer.cc ../src/throwntogetherrenderer.cc ../src/CSGTermEvaluator.cc ../src/CGALEvaluator.cc
+                           ../src/opencsgrenderer.cc ../src/throwntogetherrenderer.cc ../src/CSGTermEvaluator.cc ../src/cgal.cc ../src/CGALEvaluator.cc
                            ../src/PolySetCGALEvaluator.cc ../src/qhash.cc ../src/nef2dxf.cc
                            ../src/cgaladv_minkowski2.cc ../src/cgaladv_minkowski3.cc
                            ${COMMON_SOURCES})
diff --git a/tests/csgtermtest.cc b/tests/csgtermtest.cc
index 1c2eb22..42d22a0 100644
--- a/tests/csgtermtest.cc
+++ b/tests/csgtermtest.cc
@@ -154,8 +154,10 @@ int main(int argc, char **argv)
 
 //	cout << tree.getString(*root_node) << "\n";
 
+	vector<CSGTerm*> highlights;
+	vector<CSGTerm*> background;
 	CSGTermEvaluator evaluator(tree);
-	CSGTerm *root_term = evaluator.evaluateCSGTerm(*root_node, NULL, NULL);
+	CSGTerm *root_term = evaluator.evaluateCSGTerm(*root_node, highlights, background);
 	
 	// cout << "Stored terms: " << evaluator.stored_term.size() << "\n";
 	// for (map<int, class CSGTerm*>::iterator iter = evaluator.stored_term.begin();
-- 
cgit v0.10.1