mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2026-10-23 10:43:05 +00:00
Merge branch 'master' into badge-in-app-checkout
# Conflicts: # simplex-chat.cabal # src/Simplex/Chat/Store/Postgres/Migrations.hs # src/Simplex/Chat/Store/SQLite/Migrations.hs # src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt # src/Simplex/Chat/Store/SQLite/Migrations/chat_schema.sql
This commit is contained in:
commit
e3324c6828
287 files changed
+11236
-2113
No files matched your search
@@ -53,7 +53,7 @@ rm -rf apps/multiplatform/desktop/build/cmake
|
||||
mkdir -p apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/
|
||||
cp -r $BUILD_DIR/build/deps/* apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/
|
||||
cp $BUILD_DIR/build/libsimplex.so apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/
|
||||
scripts/desktop/prepare-vlc-linux.sh
|
||||
[ -n "$SKIP_VLC" ] || scripts/desktop/prepare-vlc-linux.sh
|
||||
|
||||
links_dir=apps/multiplatform/build/links
|
||||
mkdir -p $links_dir
|
||||
|
||||
@@ -151,7 +151,7 @@ if [ -n "$LOCAL_DIRS" ]; then
|
||||
fi
|
||||
|
||||
cd -
|
||||
scripts/desktop/prepare-vlc-mac.sh
|
||||
[ -n "$SKIP_VLC" ] || scripts/desktop/prepare-vlc-mac.sh
|
||||
|
||||
links_dir=apps/multiplatform/build/links
|
||||
mkdir -p $links_dir
|
||||
|
||||
@@ -61,7 +61,7 @@ mkdir -p apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/
|
||||
cp dist-newstyle/openssl-3.0.15/libcrypto-3-x64.dll apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/
|
||||
cp libsimplex.dll apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/
|
||||
|
||||
scripts/desktop/prepare-vlc-windows.sh
|
||||
[ -n "$SKIP_VLC" ] || scripts/desktop/prepare-vlc-windows.sh
|
||||
|
||||
links_dir=apps/multiplatform/build/links
|
||||
mkdir -p $links_dir
|
||||
|
||||
Reference in new issue
Block a user