diff --git a/evmjit/.gitignore b/evmjit/.gitignore
new file mode 100644
index 0000000000..84c048a73c
--- /dev/null
+++ b/evmjit/.gitignore
@@ -0,0 +1 @@
+/build/
diff --git a/evmjit/CMakeLists.txt b/evmjit/CMakeLists.txt
index 18601b921f..856cb56c26 100644
--- a/evmjit/CMakeLists.txt
+++ b/evmjit/CMakeLists.txt
@@ -4,6 +4,11 @@ project(evmjit)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+else ()
+	set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wno-unknown-pragmas -Wextra -DSHAREDLIB -fPIC")
+endif()
+
 # LLVM
 if(LLVM_DIR)	# local LLVM build
 	find_package(LLVM REQUIRED CONFIG)
@@ -18,11 +23,18 @@ else()
 	execute_process(COMMAND llvm-config-3.5 --includedir OUTPUT_VARIABLE LLVM_INCLUDE_DIRS)
 	message(STATUS "LLVM include dirs: ${LLVM_INCLUDE_DIRS}")
 	set(LLVM_LIBS "-lLLVMBitWriter -lLLVMX86CodeGen -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMCodeGen -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMX86AsmParser -lLLVMX86Desc -lLLVMX86Info -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMMCJIT -lLLVMTarget -lLLVMRuntimeDyld -lLLVMObject -lLLVMMCParser -lLLVMBitReader -lLLVMExecutionEngine -lLLVMMC -lLLVMCore -lLLVMSupport -lz -lpthread -lffi -ltinfo -ldl -lm")
+	add_definitions(-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS)
 endif()
 
 # Boost
 find_package(Boost REQUIRED)
 
 add_subdirectory(libevmjit)
-add_subdirectory(libevmjit-cpp)
-add_subdirectory(evmcc)
+
+if(EVMJIT_CPP)
+	add_subdirectory(libevmjit-cpp)
+endif()
+
+if(EVMJIT_TOOLS)
+	add_subdirectory(evmcc)
+endif()