From eed80115fde97e6d66e7b4a190bd427d7c6e353a Mon Sep 17 00:00:00 2001 From: Martyn Date: Sun, 20 Sep 2020 12:53:16 +0200 Subject: [PATCH] Export including windows exe files" --- godot/export_presets.cfg | 68 ++++++++++++++++++++++++++++++++++++++++ godot/startup.gd | 8 ++--- 2 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 godot/export_presets.cfg diff --git a/godot/export_presets.cfg b/godot/export_presets.cfg new file mode 100644 index 0000000..90c87a7 --- /dev/null +++ b/godot/export_presets.cfg @@ -0,0 +1,68 @@ +[preset.0] + +name="win64" +platform="Windows Desktop" +runnable=true +custom_features="" +export_filter="all_resources" +include_filter="dlserver.exe,ffmpeg.exe,youtube-dl.exe" +exclude_filter="" +export_path="../dist/win64/asingcrow.exe" +patch_list=PoolStringArray( ) +script_export_mode=1 +script_encryption_key="" + +[preset.0.options] + +texture_format/bptc=false +texture_format/s3tc=true +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_type=0 +codesign/identity="" +codesign/password="" +codesign/timestamp=true +codesign/timestamp_server_url="" +codesign/digest_algorithm=1 +codesign/description="" +codesign/custom_options=PoolStringArray( ) +application/icon="res://icon.ico" +application/file_version="0.0.1" +application/product_version="0.0.1" +application/company_name="Opensource" +application/product_name="ASingCrow" +application/file_description="Asynchronous Duets on the Fediverse" +application/copyright="" +application/trademarks="" + +[preset.1] + +name="Linux/X11" +platform="Linux/X11" +runnable=true +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="../dist/linux/asingcrow.x86_64" +patch_list=PoolStringArray( ) +script_export_mode=1 +script_encryption_key="" + +[preset.1.options] + +texture_format/bptc=false +texture_format/s3tc=true +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="" diff --git a/godot/startup.gd b/godot/startup.gd index 5cc6246..179b6c9 100644 --- a/godot/startup.gd +++ b/godot/startup.gd @@ -24,14 +24,14 @@ func _on_Timer2_timeout(): var dir = Directory.new() if !o.file_exists('user://youtube-dl.exe'): print("Need youtube-dl") - dir.copy("./youtube-dl.exe", "user://youtube-dl.exe") + dir.copy("res://youtube-dl.exe", "user://youtube-dl.exe") if !o.file_exists('user://ffmpeg.exe'): print("Need ffmpeg") - dir.copy("./ffmpeg.exe", "user://ffmpeg.exe") + dir.copy("res://ffmpeg.exe", "user://ffmpeg.exe") if !o.file_exists('user://dlserver.exe'): print("Need dlserver") - dir.copy("./dlserver.exe", "user://dlserver.exe") - Globals.pid_of_dlserver = OS.execute(".\\dlserver.exe", [OS.get_user_data_dir()], false) + dir.copy("res://dlserver.exe", "user://dlserver.exe") + Globals.pid_of_dlserver = OS.execute(OS.get_user_data_dir()+"/dlserver.exe", [OS.get_user_data_dir()], false) print("Started dl-server, pid ", Globals.pid_of_dlserver) $ValidateServerRunningTimer.start()