diff --git a/.gitignore b/.gitignore
index abe1a234f52..dc7b118c799 100644
--- a/.gitignore
+++ b/.gitignore
@@ -116,6 +116,11 @@ ipch/
 *.vsp
 *.vspx
 
+# CodeLite project files
+*.project
+*.workspace
+.codelite/
+
 # TFS 2012 Local Workspace
 $tf/
 
@@ -198,6 +203,9 @@ ClientBin/
 *.publishsettings
 node_modules/
 
+# KDE
+.directory
+
 # RIA/Silverlight projects
 Generated_Code/
 
diff --git a/SConstruct b/SConstruct
index ed65f2b89fe..a9739ca604c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -6,6 +6,16 @@ import os.path
 import glob
 import sys
 import methods
+import multiprocessing
+
+# Enable aggresive compile mode if building on a multi core box
+# only is we have not set the number of jobs already or we do
+# not want it
+if ARGUMENTS.get('spawn_jobs', 'yes') == 'yes' and \
+	int(GetOption('num_jobs')) <= 1:
+	NUM_JOBS = multiprocessing.cpu_count()
+	if NUM_JOBS > 1:
+		SetOption('num_jobs', NUM_JOBS+1)
 
 methods.update_version()
 
diff --git a/makefile b/makefile
new file mode 100644
index 00000000000..d24bd0cd321
--- /dev/null
+++ b/makefile
@@ -0,0 +1,30 @@
+#*************************************************************************/
+#*                       This file is part of:                           */
+#*                           GODOT ENGINE                                */
+#*                    http://www.godotengine.org                         */
+#*************************************************************************/
+# Simple makefile to give support for external C/C++ IDEs                */
+#*************************************************************************/
+
+# Default build
+all: debug
+
+# Release Build
+release:
+	scons target="release" bin/godot
+
+# Profile Build
+profile:
+	scons target="profile" bin/godot
+
+# Debug Build
+debug:
+	# Debug information (code size gets severely affected):
+	# g: Default (same as g2)
+	# g0: no debug info
+	# g1: minimal info
+	# g3: maximal info
+	scons target="debug" CCFLAGS="-g" bin/godot
+
+clean:
+	scons -c bin/godot