Merge pull request #56 from OmniTroid/master

Small fixes, decluttering + better build scripts
This commit is contained in:
oldmud0 2019-01-07 10:17:26 -06:00 committed by GitHub
commit 33dd06e9aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 27 additions and 28 deletions

View File

@ -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

BIN
resource/logo.icns Normal file

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 382 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 169 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 169 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 382 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

View File

@ -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

View File

@ -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

View File

@ -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.

View File

@ -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;
}