diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11c4049..335d83c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${C
 
 project(TGFS-ISS VERSION 1.0.0 LANGUAGES CXX)
 
+option(CODEGEN "enable generation of ISS code" ON)
 set(CORE_NAME TGC_C CACHE STRING "The core to build the ISS for" )
 set(WITH_LLVM FALSE CACHE BOOL "Build LLVM based backend")
 
@@ -104,13 +105,15 @@ if (ENABLE_CLANG_TIDY)
     endif()
 endif()
 
-include(CodeGen)
-if(NOT CORE_DSL_INPUT_DIR)
-    set(CORE_DSL_INPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tgfs/gen_input)
+if(CODEGEN)
+	include(CodeGen)
+	if(NOT CORE_DSL_INPUT_DIR)
+	    set(CORE_DSL_INPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tgfs/gen_input)
+	endif()
+	
+	gen_coredsl(${CORE_NAME} ${CORE_DSL_INPUT_DIR}/${CORE_NAME}.core_desc interp)
 endif()
 
-gen_coredsl(${CORE_NAME} ${CORE_DSL_INPUT_DIR}/${CORE_NAME}.core_desc interp)
-
 add_subdirectory(dbt-rise-core)
 add_subdirectory(scc)
 add_subdirectory(dbt-rise-tgc)
diff --git a/dbt-rise-tgc b/dbt-rise-tgc
index 6ba7c82..b20daa1 160000
--- a/dbt-rise-tgc
+++ b/dbt-rise-tgc
@@ -1 +1 @@
-Subproject commit 6ba7c82f803c853e6b6956bb329139b52963871b
+Subproject commit b20daa1ac2d60b2ce61c1b13d16e0dbcacac2682