From 6261be1dc82e3f113a0392c2cf93449d784cfb08 Mon Sep 17 00:00:00 2001
From: oldmud0 <3421260-oldmud0@users.noreply.gitlab.com>
Date: Sun, 10 Feb 2019 01:04:28 +0000
Subject: Add Travis script for Mac builds

---
 scripts/macos_post_build.sh | 2 --
 1 file changed, 2 deletions(-)

(limited to 'scripts/macos_post_build.sh')

diff --git a/scripts/macos_post_build.sh b/scripts/macos_post_build.sh
index d69da0b4..700361ef 100644
--- a/scripts/macos_post_build.sh
+++ b/scripts/macos_post_build.sh
@@ -2,8 +2,6 @@
 
 DST_FOLDER="./bin/Attorney_Online.app/Contents/Frameworks"
 
-cd ..
-
 mkdir $DST_FOLDER
 
 cp ./lib/libbass.dylib $DST_FOLDER
-- 
cgit 


From 5d0044b93cfd5ada490c7c1b296bdd0f1602a8f2 Mon Sep 17 00:00:00 2001
From: oldmud0 <oldmud0@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:03:43 -0500
Subject: Add a bunch of scripts

---
 scripts/macos_post_build.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 scripts/macos_post_build.sh

(limited to 'scripts/macos_post_build.sh')

diff --git a/scripts/macos_post_build.sh b/scripts/macos_post_build.sh
old mode 100644
new mode 100755
-- 
cgit 


From 744cf727f0102fc51dde5a2f0269433138270448 Mon Sep 17 00:00:00 2001
From: nnoodle <nnoodle@chiru.no>
Date: Thu, 11 Apr 2019 22:25:40 +0700
Subject: Use /bin/sh and exit immediately if a command fails.

---
 scripts/macos_post_build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 scripts/macos_post_build.sh

(limited to 'scripts/macos_post_build.sh')

diff --git a/scripts/macos_post_build.sh b/scripts/macos_post_build.sh
old mode 100644
new mode 100755
index d69da0b4..1db8c034
--- a/scripts/macos_post_build.sh
+++ b/scripts/macos_post_build.sh
@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/bin/sh
+set -e
 
 DST_FOLDER="./bin/Attorney_Online.app/Contents/Frameworks"
 
-- 
cgit 


From f2a4ac013dd0cd1b054a8fa604bc75a659cff3ff Mon Sep 17 00:00:00 2001
From: David Skoland <davidskoland@gmail.com>
Date: Sat, 29 Jun 2019 00:27:31 +0000
Subject: Mac improvements

Just modifying build scripts to make it less painful to build and release on Mac

See merge request AttorneyOnline/AO2-Client!64
---
 scripts/macos_post_build.sh | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100755 scripts/macos_post_build.sh

(limited to 'scripts/macos_post_build.sh')

diff --git a/scripts/macos_post_build.sh b/scripts/macos_post_build.sh
deleted file mode 100755
index 1db8c034..00000000
--- a/scripts/macos_post_build.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-set -e
-
-DST_FOLDER="./bin/Attorney_Online.app/Contents/Frameworks"
-
-cd ..
-
-mkdir $DST_FOLDER
-
-cp ./lib/libbass.dylib $DST_FOLDER
-cp ./lib/libbassopus.dylib $DST_FOLDER
-
-install_name_tool -id @executable_path/../Frameworks/libbass.dylib $DST_FOLDER/libbass.dylib
-
-install_name_tool -id @executable_path/../Frameworks/libbassopus.dylib $DST_FOLDER/libbassopus.dylib
-
-install_name_tool -change @loader_path/libbass.dylib @executable_path/../Frameworks/libbass.dylib ./bin/Attorney_Online.app/Contents/MacOS/Attorney_Online
-- 
cgit 


From 172406efa219c2d3948e078c811e8cb35d7668a7 Mon Sep 17 00:00:00 2001
From: mac builder <mac at github.com>
Date: Tue, 13 Aug 2019 18:59:43 +0200
Subject: post build executable

---
 scripts/macos_post_build.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 scripts/macos_post_build.sh

(limited to 'scripts/macos_post_build.sh')

diff --git a/scripts/macos_post_build.sh b/scripts/macos_post_build.sh
old mode 100644
new mode 100755
-- 
cgit 


From 5bdb57a8ba789f0a716360d775eedfbc29096c78 Mon Sep 17 00:00:00 2001
From: mac builder <mac at github.com>
Date: Tue, 13 Aug 2019 19:13:01 +0200
Subject: forgot macdeployqt

---
 scripts/macos_post_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/macos_post_build.sh')

diff --git a/scripts/macos_post_build.sh b/scripts/macos_post_build.sh
index 50acb408..25400bf5 100755
--- a/scripts/macos_post_build.sh
+++ b/scripts/macos_post_build.sh
@@ -13,7 +13,7 @@ ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/"
 cd ${ROOT_DIR}
 
 # This thing basically does all the work
-macdeployqt ../bin/Attorney_Online.app
+/usr/local/opt/qt/bin/macdeployqt ../bin/Attorney_Online.app
 
 # Need to add the dependencies
 cp ../lib/* ../bin/Attorney_Online.app/Contents/Frameworks
-- 
cgit