Merge pull request #1660 from nlandry/upstream

Don't compile the tools by default

CMakeLists.txt

@@ -26,5 +26,5 @@ add_subdirectory(samples)
 
 # gameplay encoder
 # A pre-compiled executable can be found in 'gameplay/bin'. Uncomment to build yourself.
-add_subdirectory(tools/encoder)
-add_subdirectory(tools/luagen)
+#add_subdirectory(tools/encoder)
+#add_subdirectory(tools/luagen)