Merge pull request #56 from OmniTroid/master
Small fixes, decluttering + better build scripts
@ -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
BIN
resource/logo.iconset/icon_1024x1024.png
Normal file
After Width: | Height: | Size: 382 KiB |
BIN
resource/logo.iconset/icon_128x128.png
Normal file
After Width: | Height: | Size: 29 KiB |
BIN
resource/logo.iconset/icon_128x128@2x.png
Normal file
After Width: | Height: | Size: 73 KiB |
BIN
resource/logo.iconset/icon_16x16.png
Normal file
After Width: | Height: | Size: 3.6 KiB |
BIN
resource/logo.iconset/icon_16x16@2x.png
Normal file
After Width: | Height: | Size: 5.5 KiB |
BIN
resource/logo.iconset/icon_256x256.png
Normal file
After Width: | Height: | Size: 73 KiB |
BIN
resource/logo.iconset/icon_256x256@2x.png
Normal file
After Width: | Height: | Size: 169 KiB |
BIN
resource/logo.iconset/icon_32x32.png
Normal file
After Width: | Height: | Size: 5.5 KiB |
BIN
resource/logo.iconset/icon_32x32@2x.png
Normal file
After Width: | Height: | Size: 12 KiB |
BIN
resource/logo.iconset/icon_512x512.png
Normal file
After Width: | Height: | Size: 169 KiB |
BIN
resource/logo.iconset/icon_512x512@2x.png
Normal file
After Width: | Height: | Size: 382 KiB |
BIN
resource/logo.iconset/icon_64x64.png
Normal file
After Width: | Height: | Size: 12 KiB |
BIN
resource/logo.iconset/icon_64x64@2x.png
Normal file
After Width: | Height: | Size: 29 KiB |
@ -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
|
||||
|
16
scripts/macos_post_build.sh
Normal 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
|
@ -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.
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|