From f84577b2443606863c8134b99615664e11071cd9 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@gmail.com>
Date: Sun, 19 Jan 2020 01:14:09 +0100
Subject: [PATCH] HEADS update. Added shared module target builds to the build
 script. Also fixed the editor launch script to launch the editor properly
 with shared modules.

---
 HEADS            |  2 +-
 SConstruct       | 13 ++++++++++++-
 editor.sh        |  1 +
 editor_shared.sh | 10 ----------
 4 files changed, 14 insertions(+), 12 deletions(-)
 delete mode 100755 editor_shared.sh

diff --git a/HEADS b/HEADS
index 672827b7..76d9f85e 100644
--- a/HEADS
+++ b/HEADS
@@ -1 +1 @@
-{"engine": "083f68ebf48ef44599bad864f6ce5c9301bd400b", "world_generator": "e5f5d205f8aea478294ad4796b0f3c771dd7e7cf", "entity_spell_system": "6f3744e2cbd4ba8c0ac7c331876c2d7a28beb4b2", "ui_extensions": "8a81cc53100c5a138fbaf927080410025c64c88e", "voxelman": "2b9f28e5739d5163a27fcf97b404d670b41be4eb", "texture_packer": "8d3b160f02054323a1dc4a9bc8b7e1c44fc57753", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "d60e746b158d3ebf9d2ea306af1dd24bcae49be5", "mesh_data_resource": "7bef6db99e52e2340d5d655c16d27c7bbe999247", "ess_data": "3bd637fdd3304b64a18287a49a6b7387acf2f5de", "prop_tool": "df438053ebc900966f8f842fc65f0264f1271d49"}
\ No newline at end of file
+{"engine": "d4a222cd9d849a63f0535f70cbf78700bc5c815b", "world_generator": "e5f5d205f8aea478294ad4796b0f3c771dd7e7cf", "entity_spell_system": "6f3744e2cbd4ba8c0ac7c331876c2d7a28beb4b2", "ui_extensions": "8a81cc53100c5a138fbaf927080410025c64c88e", "voxelman": "2b9f28e5739d5163a27fcf97b404d670b41be4eb", "texture_packer": "8d3b160f02054323a1dc4a9bc8b7e1c44fc57753", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "d60e746b158d3ebf9d2ea306af1dd24bcae49be5", "mesh_data_resource": "7bef6db99e52e2340d5d655c16d27c7bbe999247", "ess_data": "3bd637fdd3304b64a18287a49a6b7387acf2f5de", "prop_tool": "df438053ebc900966f8f842fc65f0264f1271d49"}
\ No newline at end of file
diff --git a/SConstruct b/SConstruct
index 006f612b..02a5d438 100644
--- a/SConstruct
+++ b/SConstruct
@@ -220,6 +220,17 @@ if len(sys.argv) > 1:
         for i in range(2, len(sys.argv)):
             build_string += ' ' + sys.argv[i] + ' '
 
+        target = " "
+
+        if 'E' in arg:
+            target += 'bin/libess.x11.opt.tools.64.so'
+        elif 'T' in arg:
+            target += 'bin/libtexture_packer.x11.opt.tools.64.so'
+        elif 'V' in arg:
+            target += 'bin/libvoxelman.x11.opt.tools.64.so'
+        elif 'W' in arg:
+            target += 'bin/libworld_generator.x11.opt.tools.64.so'
+
         print('Running command: ' + build_string)
 
         cwd = os.getcwd()
@@ -236,7 +247,7 @@ if len(sys.argv) > 1:
         if 'l' in arg:
             build_string += 'platform=x11'
 
-            subprocess.call(cache_exports_str + build_string, shell=True)
+            subprocess.call(cache_exports_str + build_string + target, shell=True)
         elif 'w' in arg:
             build_string += 'platform=windows'
 
diff --git a/editor.sh b/editor.sh
index 4e8ed2cd..ce9ff0cf 100755
--- a/editor.sh
+++ b/editor.sh
@@ -2,4 +2,5 @@
 
 cp -u ./engine/bin/godot.x11.opt.tools.64 ./engine/bin/run.godot.x11.opt.tools.64
 
+export LD_LIBRARY_PATH=`pwd`/engine/bin/
 ./engine/bin/run.godot.x11.opt.tools.64 -v
diff --git a/editor_shared.sh b/editor_shared.sh
deleted file mode 100755
index 0f184a7f..00000000
--- a/editor_shared.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-cp -u ./engine/bin/godot.x11.opt.tools.64 ./engine/bin/run.godot.x11.opt.tools.64
-
-
-#export LD_LIBRARY_PATH=./engine/bin 
-cd ./engine/bin 
-
-export LD_LIBRARY_PATH=.
-./run.godot.x11.opt.tools.64 -v