diff --git a/libraries/wasm-jit/.gitignore b/libraries/wasm-jit/.gitignore
deleted file mode 100644
index b45a037cb8ff4a41e7175423eca4b46878b610ab..0000000000000000000000000000000000000000
--- a/libraries/wasm-jit/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Build
diff --git a/libraries/wasm-jit/CMakeLists.txt b/libraries/wasm-jit/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..97ddd6a81ba33bea28ef7870b7c55362c5711b2e
--- /dev/null
+++ b/libraries/wasm-jit/CMakeLists.txt
@@ -0,0 +1,78 @@
+#cmake_minimum_required(VERSION 2.7.0)
+#project (WAVM)
+#
+#enable_testing()
+#
+#set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+#
+## Put executables in the bin dir, and libraries in the lib dir.
+#SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
+#SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
+#
+## Allow includes relative to the source path.
+set(WAVM_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/Include)
+include_directories(${WAVM_INCLUDE_DIR})
+#
+	# Use C++11
+#	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+
+	# Compile with all warnings and fatal warnings
+#	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror")
+
+	# Disable RTTI
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
+	
+	# Ensure that even static libraries are relocatable so they can be linked into a .so
+#	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+
+	# Enable asan in debug builds.
+#	if(CMAKE_BUILD_TYPE MATCHES "Debug")
+#		option(ENABLE_ASAN "enable ASAN" ON)
+#		add_definitions("-D_DEBUG")
+#	else()
+#		option(ENABLE_ASAN "enable ASAN" OFF)
+#	endif()
+#	if(ENABLE_ASAN)
+#		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
+#	endif()
+
+option(WAVM_METRICS_OUTPUT "controls printing the timings of some operations to stdout" OFF)
+if(WAVM_METRICS_OUTPUT)
+	add_definitions("-DWAVM_METRICS_OUTPUT=1")
+else()
+	add_definitions("-DWAVM_METRICS_OUTPUT=0")
+endif()
+
+option(PRETEND_32BIT_ADDRESS_SPACE "forces 64-bit WAVM to reserve address-space as it would in a 32-bit process" OFF)
+if(PRETEND_32BIT_ADDRESS_SPACE)
+	add_definitions("-DPRETEND_32BIT_ADDRESS_SPACE=1")
+else()
+	add_definitions("-DPRETEND_32BIT_ADDRESS_SPACE=0")
+endif()
+
+option(ENABLE_SIMD_PROTOTYPE "enables the prototype implementation of the proposed WebAssembly SIMD extension" OFF)
+if(ENABLE_SIMD_PROTOTYPE)
+	add_definitions("-DENABLE_SIMD_PROTOTYPE=1")
+else()
+	add_definitions("-DENABLE_SIMD_PROTOTYPE=0")
+endif()
+
+option(ENABLE_THREADING_PROTOTYPE "enables the prototype implementation of the proposed WebAssembly threading extension" OFF)
+if(ENABLE_THREADING_PROTOTYPE)
+	add_definitions("-DENABLE_THREADING_PROTOTYPE=1")
+else()
+	add_definitions("-DENABLE_THREADING_PROTOTYPE=0")
+endif()
+
+add_subdirectory(Include/Inline)
+
+add_subdirectory(Source/Emscripten)
+add_subdirectory(Source/IR)
+add_subdirectory(Source/Logging)
+add_subdirectory(Source/Platform)
+add_subdirectory(Source/Programs)
+add_subdirectory(Source/Runtime)
+add_subdirectory(Source/WASM)
+add_subdirectory(Source/WAST)
+
+#add_subdirectory(Test/spec)