17 files changed, 26 insertions, 36 deletions
diff --git a/modules/gdscript/SCsub b/modules/gdscript/SCsub
new file mode 100644
index 000000000..d20da72b7
--- /dev/null
+++ b/modules/gdscript/SCsub
@@ -0,0 +1,7 @@
+Import('env')
+
+env.add_source_files(env.modules_sources,"*.cpp")
+
+Export('env')
+
+
diff --git a/modules/gdscript/config.py b/modules/gdscript/config.py
new file mode 100644
index 000000000..f9bd7da08
--- /dev/null
+++ b/modules/gdscript/config.py
@@ -0,0 +1,11 @@
+
+
+def can_build(platform):
+  return True
+  
+  
+def configure(env):
+	pass
+  
+  
+  
diff --git a/script/gdscript/gd_compiler.cpp b/modules/gdscript/gd_compiler.cpp
index dd2834bf3..dd2834bf3 100644
--- a/script/gdscript/gd_compiler.cpp
+++ b/modules/gdscript/gd_compiler.cpp
diff --git a/script/gdscript/gd_compiler.h b/modules/gdscript/gd_compiler.h
index cda221dab..cda221dab 100644
--- a/script/gdscript/gd_compiler.h
+++ b/modules/gdscript/gd_compiler.h
diff --git a/script/gdscript/gd_editor.cpp b/modules/gdscript/gd_editor.cpp
index c10cadf83..c10cadf83 100644
--- a/script/gdscript/gd_editor.cpp
+++ b/modules/gdscript/gd_editor.cpp
diff --git a/script/gdscript/gd_functions.cpp b/modules/gdscript/gd_functions.cpp
index 2930d9322..2930d9322 100644
--- a/script/gdscript/gd_functions.cpp
+++ b/modules/gdscript/gd_functions.cpp
diff --git a/script/gdscript/gd_functions.h b/modules/gdscript/gd_functions.h
index 2ab397d18..2ab397d18 100644
--- a/script/gdscript/gd_functions.h
+++ b/modules/gdscript/gd_functions.h
diff --git a/script/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp
index e558ceb41..e558ceb41 100644
--- a/script/gdscript/gd_parser.cpp
+++ b/modules/gdscript/gd_parser.cpp
diff --git a/script/gdscript/gd_parser.h b/modules/gdscript/gd_parser.h
index 801149534..801149534 100644
--- a/script/gdscript/gd_parser.h
+++ b/modules/gdscript/gd_parser.h
diff --git a/script/gdscript/gd_pretty_print.cpp b/modules/gdscript/gd_pretty_print.cpp
index a5a993bb3..a5a993bb3 100644
--- a/script/gdscript/gd_pretty_print.cpp
+++ b/modules/gdscript/gd_pretty_print.cpp
diff --git a/script/gdscript/gd_pretty_print.h b/modules/gdscript/gd_pretty_print.h
index fbf002295..fbf002295 100644
--- a/script/gdscript/gd_pretty_print.h
+++ b/modules/gdscript/gd_pretty_print.h
diff --git a/script/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp
index 5679e1e06..5679e1e06 100644
--- a/script/gdscript/gd_script.cpp
+++ b/modules/gdscript/gd_script.cpp
diff --git a/script/gdscript/gd_script.h b/modules/gdscript/gd_script.h
index 70dec4e8e..70dec4e8e 100644
--- a/script/gdscript/gd_script.h
+++ b/modules/gdscript/gd_script.h
diff --git a/script/gdscript/gd_tokenizer.cpp b/modules/gdscript/gd_tokenizer.cpp
index f7320799a..f7320799a 100644
--- a/script/gdscript/gd_tokenizer.cpp
+++ b/modules/gdscript/gd_tokenizer.cpp
diff --git a/script/gdscript/gd_tokenizer.h b/modules/gdscript/gd_tokenizer.h
index 24ee2be7a..24ee2be7a 100644
--- a/script/gdscript/gd_tokenizer.h
+++ b/modules/gdscript/gd_tokenizer.h
diff --git a/script/register_script_types.cpp b/modules/gdscript/register_types.cpp
index 1927cd5c1..d2d7bf426 100644
--- a/script/register_script_types.cpp
+++ b/modules/gdscript/register_types.cpp
@@ -9,25 +9,17 @@
 /*             All Rights Reserved.              */
 /*************************************************/
 
-#include "register_script_types.h"
+#include "register_types.h"
 
-#include "script/gdscript/gd_script.h"
-#include "script/multiscript/multi_script.h"
+#include "gd_script.h"
 #include "io/resource_loader.h"
 
-
-
-#ifdef GDSCRIPT_ENABLED
 GDScriptLanguage *script_language_gd=NULL;
 ResourceFormatLoaderGDScript *resource_loader_gd=NULL;
 ResourceFormatSaverGDScript *resource_saver_gd=NULL;
-#endif
 
-static MultiScriptLanguage *script_multi_script=NULL;
+void register_gdscript_types() {
 
-void register_script_types() {
-
-#ifdef GDSCRIPT_ENABLED
 
 	script_language_gd=memnew( GDScriptLanguage );
 	script_language_gd->init();
@@ -37,21 +29,13 @@ void register_script_types() {
 	ResourceLoader::add_resource_format_loader(resource_loader_gd);
 	resource_saver_gd=memnew( ResourceFormatSaverGDScript );
 	ResourceSaver::add_resource_format_saver(resource_saver_gd);
-#endif
-
-
-	script_multi_script = memnew( MultiScriptLanguage );
-	ScriptServer::register_language(script_multi_script);
-	ObjectTypeDB::register_type<MultiScript>();
-
 
 }
-void unregister_script_types() {
+void unregister_gdscript_types() {
 
 
 
 
-#ifdef GDSCRIPT_ENABLED
 	if (script_language_gd)
 		memdelete( script_language_gd );
 	if (resource_loader_gd)
@@ -59,8 +43,4 @@ void unregister_script_types() {
 	if (resource_saver_gd)
 		memdelete( resource_saver_gd );
 
-#endif
-
-	if (script_multi_script);
-		memdelete(script_multi_script);
-}
+}
+\ No newline at end of file
diff --git a/script/register_script_types.h b/modules/gdscript/register_types.h
index eec0cfe53..ff7c2734d 100644
--- a/script/register_script_types.h
+++ b/modules/gdscript/register_types.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  register_script_types.h                                              */
+/*  register_types.h                                                     */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -26,13 +26,5 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#ifndef REGISTER_SCRIPT_TYPES_H
-#define REGISTER_SCRIPT_TYPES_H
-
-/**
-	@author Juan Linietsky <reduzio@gmail.com>
-*/
-void register_script_types();
-void unregister_script_types();
-
-#endif
+void register_gdscript_types();
+void unregister_gdscript_types();