diff --git a/CMakeLists.txt b/CMakeLists.txt index 3277d7027..8b5b84b7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8.11) -set(TTK_MAJOR_VERSION "2.15.12") +set(TTK_MAJOR_VERSION "3.0.0") set(TTK_VERSION ${TTK_MAJOR_VERSION}.0) # Find includes in the build directories diff --git a/Doxyfile b/Doxyfile index 957fbab88..46423fba6 100644 --- a/Doxyfile +++ b/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = TTKMusicPlayer -PROJECT_NUMBER = 2.15.12.0 +PROJECT_NUMBER = 3.0.0.0 PROJECT_BRIEF = "TTKMusicPlayer that imitation Kugou music, the music player use of qmmp core library based on Qt for windows and linux" PROJECT_LOGO = TTKResource/lb_app_logo.png OUTPUT_DIRECTORY = TTKDocs diff --git a/README.md b/README.md index 9e2230975..a9af634a6 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [简体中文 Chinese](./README_cn.md) | [繁体中文 Chinese](./README_tc.md) ![TTKMusicPlayer](https://img.shields.io/badge/Greedysky-TTKMusicPlayer-green.svg?style=flat-square) -![Version](https://img.shields.io/badge/Version-2.15.12.0-blue.svg?style=flat-square) +![Version](https://img.shields.io/badge/Version-3.0.0.0-blue.svg?style=flat-square) ![License](https://img.shields.io/badge/License-GPL%20V3-yellowgreen.svg?style=flat-square) ![LOGO](https://github.com/Greedysky/Resource/blob/master/Screen/logo_pic.png?raw=true) diff --git a/README_cn.md b/README_cn.md index 41d16d24a..840597890 100644 --- a/README_cn.md +++ b/README_cn.md @@ -2,7 +2,7 @@ [英文 English](./README.md) | [繁体中文 Chinese](./README_tc.md) ![TTKMusicPlayer](https://img.shields.io/badge/Greedysky-TTKMusicPlayer-green.svg?style=flat-square) -![版本](https://img.shields.io/badge/Version-2.15.12.0-blue.svg?style=flat-square) +![版本](https://img.shields.io/badge/Version-3.0.0.0-blue.svg?style=flat-square) ![许可](https://img.shields.io/badge/License-GPL%20V3-yellowgreen.svg?style=flat-square) ![徽标](https://github.com/Greedysky/Resource/blob/master/Screen/logo_pic.png?raw=true) diff --git a/README_tc.md b/README_tc.md index c5707b93a..5c0d92412 100644 --- a/README_tc.md +++ b/README_tc.md @@ -2,7 +2,7 @@ [简体中文 Chinese](./README_cn.md) | [英文 English](./README.md) ![TTKMusicPlayer](https://img.shields.io/badge/Greedysky-TTKMusicPlayer-green.svg?style=flat-square) -![版本](https://img.shields.io/badge/Version-2.15.12.0-blue.svg?style=flat-square) +![版本](https://img.shields.io/badge/Version-3.0.0.0-blue.svg?style=flat-square) ![許可](https://img.shields.io/badge/License-GPL%20V3-yellowgreen.svg?style=flat-square) ![徽標](https://github.com/Greedysky/Resource/blob/master/Screen/logo_pic.png?raw=true) diff --git a/TTKCommon/TTKLibrary/CMakeLists.txt b/TTKCommon/TTKLibrary/CMakeLists.txt index d338f71aa..054cee603 100644 --- a/TTKCommon/TTKLibrary/CMakeLists.txt +++ b/TTKCommon/TTKLibrary/CMakeLists.txt @@ -66,7 +66,7 @@ if(TTK_QT_VERSION VERSION_GREATER "4") add_library(${PROJECT_NAME} STATIC ${MUSIC_SOURCES} ${MUSIC_MOC_H} ${MUSIC_HEADERS}) endif() - set(QT5_LIBS Qt5::Core Qt5::Gui Qt5::Widgets) + set(QT5_LIBS Qt5::Core Qt5::Xml Qt5::Gui Qt5::Widgets) target_link_libraries(${PROJECT_NAME} ${QT5_LIBS}) else() QT4_WRAP_CPP(MUSIC_MOC_H ${MUSIC_HEADERS}) diff --git a/TTKCommon/ttkversion.h b/TTKCommon/ttkversion.h index ca0a6cdec..2c6fed182 100644 --- a/TTKCommon/ttkversion.h +++ b/TTKCommon/ttkversion.h @@ -158,19 +158,19 @@ * with this program; If not, see . ***************************************************************************/ -//update time 2022.09.15 -#define TTK_VERSION 0x02FC0 -#define TTK_VERSION_STR "2.15.12.0" -#define TTK_VERSION_TIME_STR "(2022/09/15)" +//update time 2022.11.11 +#define TTK_VERSION 0x03000 +#define TTK_VERSION_STR "3.0.0.0" +#define TTK_VERSION_TIME_STR "(2022/11/11)" -#define TTK_MAJOR_VERSION 2 -#define TTK_MIDLE_VERSION 15 -#define TTK_MINOR_VERSION 12 +#define TTK_MAJOR_VERSION 3 +#define TTK_MIDLE_VERSION 0 +#define TTK_MINOR_VERSION 0 #define TTK_PATCH_VERSION 0 #define TTK_CONFIG_VERSION_STR "1.0.1" -#define TTK_RC_FILEVERSION 2,15,12,0 +#define TTK_RC_FILEVERSION 3,0,0,0 #define TTK_RC_PRODUCTVERSION TTK_VERSION_STR #define TTK_RC_COMPANY "Greedysky Studio, Ltd." #define TTK_RC_COPYRIGHT "Copyright (C) 2022 Greedysky Studio" diff --git a/TTKResource/_extras/TTKRoutine.sh b/TTKResource/_extras/TTKRoutine.sh index 3fa0348d4..7a437cc45 100644 --- a/TTKResource/_extras/TTKRoutine.sh +++ b/TTKResource/_extras/TTKRoutine.sh @@ -15,7 +15,7 @@ if [ "${dirpath%$tmp}" != "/" ]; then fi LD_LIBRARY_PATH=$dirpath -export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.15.12.0:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/3.0.0.0:$LD_LIBRARY_PATH export QT_PLUGIN_PATH=$dirpath/plugins:$QT_PLUGIN_PATH $appname "$@" diff --git a/TTKScript/auc/make_auc.bat b/TTKScript/auc/make_auc.bat index 724befc93..f7e652089 100644 --- a/TTKScript/auc/make_auc.bat +++ b/TTKScript/auc/make_auc.bat @@ -1,4 +1,4 @@ "C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"TTKInit.exe" "C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"TTKMusicPlayer.exe" "C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"TKConsole.exe" -"C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"2.15.12.0/TTKService.exe" \ No newline at end of file +"C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"3.0.0.0/TTKService.exe" \ No newline at end of file diff --git a/TTKScript/deploy/make_desktop.sh b/TTKScript/deploy/make_desktop.sh index 4a31a34ea..27095a3f7 100755 --- a/TTKScript/deploy/make_desktop.sh +++ b/TTKScript/deploy/make_desktop.sh @@ -11,7 +11,7 @@ execpath="$PWD/../TTKMusicPlayer" echo -n "[Desktop Entry] Type=Application -Version=2.15.12.0 +Version=3.0.0.0 Name=TTKMusicPlayer Comment=天天酷音 Icon=$iconpath diff --git a/TTKScript/deploy/share/appdata/ttkmusicplayer.appdata.xml b/TTKScript/deploy/share/appdata/ttkmusicplayer.appdata.xml index 6ca64d3ab..ea2676b99 100644 --- a/TTKScript/deploy/share/appdata/ttkmusicplayer.appdata.xml +++ b/TTKScript/deploy/share/appdata/ttkmusicplayer.appdata.xml @@ -24,6 +24,7 @@ https://github.com/Greedysky/TTKMusicPlayer Greedysky Studio + diff --git a/TTKScript/linux_time.sh b/TTKScript/linux_time.sh index 2b2da4471..13772cfab 100755 --- a/TTKScript/linux_time.sh +++ b/TTKScript/linux_time.sh @@ -1,2 +1,2 @@ #!/bin/sh -find . -exec touch -c -m -d "2022-09-15 12:00" {} \; +find . -exec touch -c -m -d "2022-11-11 12:00" {} \; diff --git a/TTKScript/ttk.iss b/TTKScript/ttk.iss index d67081bcb..776ab0b12 100755 --- a/TTKScript/ttk.iss +++ b/TTKScript/ttk.iss @@ -2,7 +2,7 @@ #define MyAppNameZh "" #define MyAppNameEN "TTKMusicPlayer" -#define MyAppVersion "2.15.12.0" +#define MyAppVersion "3.0.0.0" #define MyAppPublisher "Greedysky Studio" #define MyAppCopyright "Copyright (C) 2015 - 2022 Greedysky Studio" #define MyAppURL "http://download.csdn.net/album/detail/3094" diff --git a/TTKVersion.pri b/TTKVersion.pri index 6881f712e..884d019a3 100644 --- a/TTKVersion.pri +++ b/TTKVersion.pri @@ -21,5 +21,5 @@ MOC_DIR = ./.build/moc OBJECTS_DIR = ./.build/obj RCC_DIR = ./.build/rcc -# update time 2022.09.15 -TTK_VERSION = 2.15.12.0 +# update time 2022.11.11 +TTK_VERSION = 3.0.0.0