BochsController.cc is back

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1013 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
2012-03-30 15:35:41 +00:00
parent 70a5084759
commit 8663f008a3
3 changed files with 33 additions and 31 deletions
--- a/core/SAL/CMakeLists.txt
+++ b/core/SAL/CMakeLists.txt
@ -1,10 +1,18 @@
-set(SRCS
-	Memory.cc
-	Register.cc
-	SimulatorController.cc
-	${VARIANT}/Controller.cc
-)
+if(BUILD_BOCHS)
+	set(SRCS
+		Memory.cc
+		Register.cc
+		SimulatorController.cc
+		bochs/BochsController.cc
+	)
+else()
+	set(SRCS
+		Memory.cc
+		Register.cc
+		SimulatorController.cc
+		${VARIANT}/Controller.cc
+	)
+endif(BUILD_BOCHS)


 add_library(SAL ${SRCS})
-
--- a/core/SAL/bochs/BochsController.cc
+++ b/core/SAL/bochs/BochsController.cc