adds zipping to build_all.sh, fixes libraries for Linux by switching …

…to static linking
fahrstuhl · Sep 22, 2020 · 479388a · 479388a
1 parent ba9664a
commit 479388a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/SConstruct b/SConstruct
@@ -160,7 +160,7 @@ if env['build_libcmark_gfm']:
     if platform == 'windows':
         ext = "dll"
     else:
-        ext = "so"
+        ext = "a"
     shutil.copy2("extensions/libcmark-gfm-extensions.{}".format(ext), lib_target_path)
     shutil.copy2("src/libcmark-gfm.{}".format(ext), lib_target_path)
     os.chdir(cwd)

diff --git a/build_all.sh b/build_all.sh
@@ -6,4 +6,7 @@ env -i HOME="$HOME" bash -l -c "scons platform=android target=release arch=armv7
 env -i HOME="$HOME" bash -l -c "scons platform=android target=release arch=armv8a build_libcmark_gfm=yes"
 env -i HOME="$HOME" bash -l -c "scons platform=android target=release arch=x86_64 build_libcmark_gfm=yes"
 
+cd demo
+rm release.zip
+zip -r release.zip fonts bin
 # TODO: osx and 32bit platforms
diff --git a/demo/bin/libmarkdown.gdnlib b/demo/bin/libmarkdown.gdnlib
@@ -15,8 +15,8 @@ X11.64="res://bin/x11/x86_64/release/libmarkdown.so"
 
 [dependencies]
 
-Android.armeabi-v7a=[ "res://bin/android/armv7a/release/libcmark-gfm-extensions.so", "res://bin/android/armv7a/release/libcmark-gfm.so" ]
-Android.arm64-v8a=[ "res://bin/android/armv8a/release/libcmark-gfm-extensions.so", "res://bin/android/armv8a/release/libcmark-gfm.so" ]
-Android.x86_64=[ "res://bin/android/x86_64/release/libcmark-gfm-extensions.so", "res://bin/android/x86_64/release/libcmark-gfm.so" ]
+Android.armeabi-v7a=[ "res://bin/android/armv7a/release/libcmark-gfm-extensions.a", "res://bin/android/armv7a/release/libcmark-gfm.a" ]
+Android.arm64-v8a=[ "res://bin/android/armv8a/release/libcmark-gfm-extensions.a", "res://bin/android/armv8a/release/libcmark-gfm.a" ]
+Android.x86_64=[ "res://bin/android/x86_64/release/libcmark-gfm-extensions.a", "res://bin/android/x86_64/release/libcmark-gfm.a" ]
 Windows.64=[ "res://bin/windows/x86_64/release/libcmark-gfm-extensions.dll", "res://bin/windows/x86_64/release/libcmark-gfm.dll" ]
-X11.64=[ "res://bin/x11/x86_64/release/libcmark-gfm-extensions.so", "res://bin/x11/x86_64/release/libcmark-gfm.so" ]
+X11.64=[ "res://bin/x11/x86_64/release/libcmark-gfm-extensions.a", "res://bin/x11/x86_64/release/libcmark-gfm.a" ]