merge dev into master

1 files changed, 8 insertions, 1 deletions

diff --git a/robot/main.c b/robot/main.c
index fbfd38b..d76dbaf 100644
--- a/robot/main.c
+++ b/robot/main.c
@@ -1,8 +1,15 @@
 #include "main.h"
 #include "hypervisor.h"
 #include "setup.h"
+#ifdef W2_SIM
+#include "sim.h"
+#endif
+
+int main(int argc, char **argv) {
+#ifdef W2_SIM
+	w2_sim_setup(argc, argv);
+#endif
 
-int main() {
 	w2_setup_main();
 
 	for (;;) w2_hypervisor_main();