From 8e70be0b93f620712f03536fbaacf8205712b727 Mon Sep 17 00:00:00 2001 From: Sebastian Morr Date: Fri, 4 Sep 2020 01:32:05 +0200 Subject: [PATCH] Attempt to fix the Linux export The exported version still doesn't run for some reason? --- export_presets.cfg | 24 ++++++++++++++++++------ game.gd | 1 + main.gd | 3 ++- project.godot | 2 +- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/export_presets.cfg b/export_presets.cfg index 6d703e5..7d17696 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -5,7 +5,7 @@ platform="Linux/X11" runnable=true custom_features="" export_filter="all_resources" -include_filter="" +include_filter="levels/*, scripts/*" exclude_filter="" export_path="" patch_list=PoolStringArray( ) @@ -20,6 +20,7 @@ texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true binary_format/64_bits=true +binary_format/embed_pck=false custom_template/release="" custom_template/debug="" @@ -30,7 +31,7 @@ platform="Mac OSX" runnable=true custom_features="" export_filter="all_resources" -include_filter="" +include_filter="levels/*, scripts/*" exclude_filter="" export_path="" patch_list=PoolStringArray( ) @@ -39,8 +40,8 @@ script_encryption_key="" [preset.1.options] -custom_package/debug="" -custom_package/release="" +custom_template/debug="" +custom_template/release="" application/name="Untitled Game" application/info="" application/icon="" @@ -50,6 +51,8 @@ application/short_version="1.0" application/version="1.0" application/copyright="" display/high_res=false +privacy/camera_usage_description="" +privacy/microphone_usage_description="" texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false @@ -61,7 +64,7 @@ platform="Windows Desktop" runnable=true custom_features="" export_filter="all_resources" -include_filter="" +include_filter="levels/*, scripts/*" exclude_filter="" export_path="" patch_list=PoolStringArray( ) @@ -76,8 +79,17 @@ texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true binary_format/64_bits=true +binary_format/embed_pck=false custom_template/release="" custom_template/debug="" +codesign/enable=false +codesign/identity="" +codesign/password="" +codesign/timestamp=true +codesign/timestamp_server_url="" +codesign/digest_algorithm=1 +codesign/description="" +codesign/custom_options=PoolStringArray( ) application/icon="" application/file_version="" application/product_version="" @@ -94,7 +106,7 @@ platform="HTML5" runnable=true custom_features="" export_filter="all_resources" -include_filter="" +include_filter="levels/*, scripts/*" exclude_filter="" export_path="" patch_list=PoolStringArray( ) diff --git a/game.gd b/game.gd index 770307b..c9d4747 100644 --- a/game.gd +++ b/game.gd @@ -52,6 +52,7 @@ func sh(command, wd="/tmp/"): return output[0] func read_file(path): + print("read "+path) var file = File.new() file.open(path, File.READ) var content = file.get_as_text() diff --git a/main.gd b/main.gd index 56d569c..ae90971 100644 --- a/main.gd +++ b/main.gd @@ -26,6 +26,7 @@ func _ready(): input.grab_focus() func list_levels(): + return ["01-blob", "02-tree", "03-commit", "04-parents"] var levels = [] var dir = Directory.new() dir.open("levels") @@ -48,7 +49,7 @@ func load_level(id): var level = levels[id] var cwd = game.run("pwd") var tmp_prefix = "/tmp/" - var level_prefix = cwd+"/levels/" + var level_prefix = "res://levels/" var goal_repository_path = tmp_prefix+"goal/" var active_repository_path = tmp_prefix+"active/" diff --git a/project.godot b/project.godot index 3728b15..130fd77 100644 --- a/project.godot +++ b/project.godot @@ -15,7 +15,7 @@ _global_script_class_icons={ [application] -config/name="Untitled Game" +config/name="git-hydra" run/main_scene="res://main.tscn" [autoload]