Merge pull request #56 from OmniTroid/master

Small fixes, decluttering + better build scripts

19 files changed, 27 insertions, 28 deletions

diff --git a/Attorney_Online.pro b/Attorney_Online.pro
index c7bf3d80..39366c04 100644
--- a/Attorney_Online.pro
+++ b/Attorney_Online.pro
@@ -1,16 +1,9 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2016-12-29T01:14:46
-#
-#-------------------------------------------------
-
-QT       += core gui multimedia network
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT += core gui widgets multimedia network
 
 TARGET = Attorney_Online
 TEMPLATE = app
 
-VERSION = 2.6.0.0
+VERSION = 2.6.1.0
 
 INCLUDEPATH += $$PWD/include
 DESTDIR = $$PWD/bin
@@ -26,5 +19,4 @@ CONFIG += c++11
 RESOURCES += resources.qrc
 
 win32:RC_ICONS = resource/logo.ico
-
-QTPLUGIN += qapng
+macx:ICON = resource/logo.icns
diff --git a/resource/logo.icns b/resource/logo.icns
new file mode 100644
index 00000000..fb2456c8
--- /dev/null
+++ b/resource/logo.icns
diff --git a/resource/logo.iconset/icon_1024x1024.png b/resource/logo.iconset/icon_1024x1024.png
new file mode 100644
index 00000000..97c96a4a
--- /dev/null
+++ b/resource/logo.iconset/icon_1024x1024.png
diff --git a/resource/logo.iconset/icon_128x128.png b/resource/logo.iconset/icon_128x128.png
new file mode 100644
index 00000000..b08cc076
--- /dev/null
+++ b/resource/logo.iconset/icon_128x128.png
diff --git a/resource/logo.iconset/icon_128x128@2x.png b/resource/logo.iconset/icon_128x128@2x.png
new file mode 100644
index 00000000..355253d3
--- /dev/null
+++ b/resource/logo.iconset/icon_128x128@2x.png
diff --git a/resource/logo.iconset/icon_16x16.png b/resource/logo.iconset/icon_16x16.png
new file mode 100644
index 00000000..e0e088dc
--- /dev/null
+++ b/resource/logo.iconset/icon_16x16.png
diff --git a/resource/logo.iconset/icon_16x16@2x.png b/resource/logo.iconset/icon_16x16@2x.png
new file mode 100644
index 00000000..01bab863
--- /dev/null
+++ b/resource/logo.iconset/icon_16x16@2x.png
diff --git a/resource/logo.iconset/icon_256x256.png b/resource/logo.iconset/icon_256x256.png
new file mode 100644
index 00000000..355253d3
--- /dev/null
+++ b/resource/logo.iconset/icon_256x256.png
diff --git a/resource/logo.iconset/icon_256x256@2x.png b/resource/logo.iconset/icon_256x256@2x.png
new file mode 100644
index 00000000..4191c2f8
--- /dev/null
+++ b/resource/logo.iconset/icon_256x256@2x.png
diff --git a/resource/logo.iconset/icon_32x32.png b/resource/logo.iconset/icon_32x32.png
new file mode 100644
index 00000000..01bab863
--- /dev/null
+++ b/resource/logo.iconset/icon_32x32.png
diff --git a/resource/logo.iconset/icon_32x32@2x.png b/resource/logo.iconset/icon_32x32@2x.png
new file mode 100644
index 00000000..c4e28ad2
--- /dev/null
+++ b/resource/logo.iconset/icon_32x32@2x.png
diff --git a/resource/logo.iconset/icon_512x512.png b/resource/logo.iconset/icon_512x512.png
new file mode 100644
index 00000000..4191c2f8
--- /dev/null
+++ b/resource/logo.iconset/icon_512x512.png
diff --git a/resource/logo.iconset/icon_512x512@2x.png b/resource/logo.iconset/icon_512x512@2x.png
new file mode 100644
index 00000000..97c96a4a
--- /dev/null
+++ b/resource/logo.iconset/icon_512x512@2x.png
diff --git a/resource/logo.iconset/icon_64x64.png b/resource/logo.iconset/icon_64x64.png
new file mode 100644
index 00000000..c4e28ad2
--- /dev/null
+++ b/resource/logo.iconset/icon_64x64.png
diff --git a/resource/logo.iconset/icon_64x64@2x.png b/resource/logo.iconset/icon_64x64@2x.png
new file mode 100644
index 00000000..b08cc076
--- /dev/null
+++ b/resource/logo.iconset/icon_64x64@2x.png
diff --git a/scripts/fix_dynamic_linking_macos.sh b/scripts/fix_dynamic_linking_macos.sh
deleted file mode 100644
index a786a55a..00000000
--- a/scripts/fix_dynamic_linking_macos.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-#this script relinks dynamic libraries so the .app file can be distributed as standalone
-
-install_name_tool -id @executable_path/../Frameworks/libbass.dylib ../bin/Attorney_Online.app/Contents/Frameworks/libbass.dylib
-
-install_name_tool -id @executable_path/../Frameworks/libbassopus.dylib ../bin/Attorney_Online.app/Contents/Frameworks/libbassopus.dylib
-
-install_name_tool -id @executable_path/../Frameworks/libdiscord-rpc.dylib ../bin/Attorney_Online.app/Contents/Frameworks/libdiscord-rpc.dylib
-
-install_name_tool -id @executable_path/../Frameworks/libqapng.dylib ../bin/Attorney_Online.app/Contents/Frameworks/libqapng.dylib
-
-install_name_tool -change @loader_path/libbass.dylib @executable_path/../Frameworks/libbass.dylib ../bin/Attorney_Online.app/Contents/MacOS/Attorney_Online
-
-install_name_tool -change @rpath/libdiscord-rpc.dylib @executable_path/../Frameworks/libdiscord-rpc.dylib ../bin/Attorney_Online.app/Contents/MacOS/Attorney_Online
-
diff --git a/scripts/macos_post_build.sh b/scripts/macos_post_build.sh
new file mode 100644
index 00000000..d69da0b4
--- /dev/null
+++ b/scripts/macos_post_build.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+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
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index f4b484b7..598747c4 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -3511,7 +3511,10 @@ void Courtroom::load_bass_opus_plugin()
 #elif defined __APPLE__
 void Courtroom::load_bass_opus_plugin()
 {
-  BASS_PluginLoad("libbassopus.dylib", 0);
+  QString libpath = ao_app->get_base_path() + "../../Frameworks/libbassopus.dylib";
+  QByteArray ba = libpath.toLocal8Bit();
+
+  BASS_PluginLoad(ba.data(), 0);
 }
 #else
 #error This operating system is unsupported for bass plugins.
diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp
index 0af96f18..1e920d73 100644
--- a/src/text_file_functions.cpp
+++ b/src/text_file_functions.cpp
@@ -9,6 +9,10 @@ QString AOApplication::read_theme()
 int AOApplication::read_blip_rate()
 {
   int result = configini->value("blip_rate", 1).toInt();
+
+  if (result < 1)
+    return 1;
+
   return result;
 }