diff --git a/CMakeLists.txt b/CMakeLists.txt
index cea38a6..7bc799a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,5 +20,15 @@ use_cm_module(AssetsManage)
 
 CMUtilSetup(${CMAKE_CURRENT_SOURCE_DIR}/CMUtil)
 
-add_subdirectory(TexConv)
-add_subdirectory(ShaderMaker)
+OPTION(CM_BUILD_TOOLS       OFF)
+
+if(CM_BUILD_TOOLS)
+    add_subdirectory(TexConv)
+    add_subdirectory(ShaderMaker)
+endif(CM_BUILD_TOOLS)
+
+OPTION(CM_BUILD_EXAMPLES    OFF)
+
+if(CM_BUILD_EXAMPLES)
+    add_subdirectory(Examples)
+endif(CM_BUILD_EXAMPLES)
diff --git a/ShaderMaker b/ShaderMaker
index 93f513d..ba88a20 160000
--- a/ShaderMaker
+++ b/ShaderMaker
@@ -1 +1 @@
-Subproject commit 93f513da46d020958c992754228eefd2db8d8675
+Subproject commit ba88a205803a716771bdc9ff0acc25333cfe4e1f