From 054dc382eab73daa076890c171f7738fab89f830 Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 31 Jan 2020 16:38:33 +0100 Subject: [PATCH] Moved the mesh simplifier into an another repository from voxelman, added that as a dependency, and updated HEADS. --- HEADS | 2 +- SConstruct | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/HEADS b/HEADS index 336141b1..2f99565a 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": "6fcb58f40dae8228074591e3262d5db97db3e2d7", "world_generator": "e5f5d205f8aea478294ad4796b0f3c771dd7e7cf", "entity_spell_system": "6f3744e2cbd4ba8c0ac7c331876c2d7a28beb4b2", "ui_extensions": "8a81cc53100c5a138fbaf927080410025c64c88e", "voxelman": "6e8d135f0d6def6c3feec609a1e6caf96ea46917", "texture_packer": "8d3b160f02054323a1dc4a9bc8b7e1c44fc57753", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "d60e746b158d3ebf9d2ea306af1dd24bcae49be5", "mesh_data_resource": "7bef6db99e52e2340d5d655c16d27c7bbe999247", "ess_data": "3bd637fdd3304b64a18287a49a6b7387acf2f5de", "prop_tool": "df438053ebc900966f8f842fc65f0264f1271d49", "procedural_animations": "39622521967d6de6e0107b93298ece855ee5218c"} \ No newline at end of file +{"engine": "8c3b14bed79404eb32a9e6efbb2007807109eaa7", "world_generator": "e5f5d205f8aea478294ad4796b0f3c771dd7e7cf", "entity_spell_system": "6f3744e2cbd4ba8c0ac7c331876c2d7a28beb4b2", "ui_extensions": "8a81cc53100c5a138fbaf927080410025c64c88e", "voxelman": "ba46eafc19a6c425b1cfc9b4f335b7c3f1ef63c0", "texture_packer": "8d3b160f02054323a1dc4a9bc8b7e1c44fc57753", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "d60e746b158d3ebf9d2ea306af1dd24bcae49be5", "mesh_data_resource": "7bef6db99e52e2340d5d655c16d27c7bbe999247", "ess_data": "3bd637fdd3304b64a18287a49a6b7387acf2f5de", "prop_tool": "df438053ebc900966f8f842fc65f0264f1271d49", "procedural_animations": "39622521967d6de6e0107b93298ece855ee5218c", "fast_quadratic_mesh_simplifier": "63d55b154967321212a6426e9b327c95e007785d"} \ No newline at end of file diff --git a/SConstruct b/SConstruct index 2a4ca34f..90dd1e19 100644 --- a/SConstruct +++ b/SConstruct @@ -43,6 +43,7 @@ module_repositories = [ [ ['https://github.com/Relintai/godot_fastnoise.git', 'git@github.com:Relintai/godot_fastnoise.git'], 'fastnoise', '' ], [ ['https://github.com/Relintai/mesh_data_resource.git', 'git@github.com:Relintai/mesh_data_resource.git'], 'mesh_data_resource', '' ], [ ['https://github.com/Relintai/procedural_animations.git', 'git@github.com:Relintai/procedural_animations.git'], 'procedural_animations', '' ], + [ ['https://github.com/Relintai/fast_quadratic_mesh_simplifier.git', 'git@github.com:Relintai/fast_quadratic_mesh_simplifier.git'], 'fast_quadratic_mesh_simplifier', '' ], ] addon_repositories = [ @@ -233,6 +234,8 @@ if len(sys.argv) > 1: target += 'bin/libworld_generator.x11.opt.tools.64.so' elif 'P' in arg: target += 'bin/libprocedural_animations.x11.opt.tools.64.so' + elif 'M' in arg: + target += 'bin/libfqms.x11.opt.tools.64.so' print('Running command: ' + build_string)