Skip to content

Commit

Permalink
Release on 2.6.3.0 Final
Browse files Browse the repository at this point in the history
  • Loading branch information
@Greedysky
Greedysky committed Dec 11, 2017
1 parent c710a48 commit 8af66b6
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.11)

add_definitions(-DMUSIC_LIBRARY)

set(TTK_VERSION "2.6.2.0")
set(TTK_VERSION "2.6.3.0")

# Find includes in the build directories
set(CMAKE_INCLUDE_CURRENT_DIR ON)
Expand Down
2 changes: 1 addition & 1 deletion ChangeLog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,6 @@ v2.6.3.0 Final
添加高级搜索。
添加每日推荐。
修复虾米闪退问题。
搜索优化。
细节优化处理。
添加Goom可视化。
其他优化。
2 changes: 1 addition & 1 deletion Doxyfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = TTKMusicplayer
PROJECT_NUMBER = 2.6.2.0
PROJECT_NUMBER = 2.6.3.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_player_logo.png
OUTPUT_DIRECTORY = TTKDocs
Expand Down
8 changes: 4 additions & 4 deletions TTKModule/TTKCore.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#endif

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,6,2,0
PRODUCTVERSION 2,6,2,0
FILEVERSION 2,6,3,0
PRODUCTVERSION 2,6,3,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -25,10 +25,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky studio, Ltd."
VALUE "FileDescription", "TTKCore"
VALUE "FileVersion", "2.6.2.0"
VALUE "FileVersion", "2.6.3.0"
VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2017"
VALUE "ProductName", "TTKCore"
VALUE "ProductVersion", "2.6.2.0"
VALUE "ProductVersion", "2.6.3.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions TTKQrc/TTKQrc.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#endif

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,6,2,0
PRODUCTVERSION 2,6,2,0
FILEVERSION 2,6,3,0
PRODUCTVERSION 2,6,3,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -25,10 +25,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky studio, Ltd."
VALUE "FileDescription", "TTKUi"
VALUE "FileVersion", "2.6.2.0"
VALUE "FileVersion", "2.6.3.0"
VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2017"
VALUE "ProductName", "TTKUi"
VALUE "ProductVersion", "2.6.2.0"
VALUE "ProductVersion", "2.6.3.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions TTKRun/TTKApp/TTKApp.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
IDI_ICON1 ICON DISCARDABLE "../../TTKResource/lb_player_logo.ico"

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,6,2,0
PRODUCTVERSION 2,6,2,0
FILEVERSION 2,6,3,0
PRODUCTVERSION 2,6,3,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -27,12 +27,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky studio, Ltd."
VALUE "FileDescription", "�������"
VALUE "FileVersion", "2.6.2.0"
VALUE "FileVersion", "2.6.3.0"
VALUE "InternalName", "�������.exe"
VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2017"
VALUE "OriginalFilename", "�������.exe"
VALUE "ProductName", "�������"
VALUE "ProductVersion", "2.6.2.0"
VALUE "ProductVersion", "2.6.3.0"
END
END
BLOCK "VarFileInfo"
Expand Down
4 changes: 2 additions & 2 deletions TTKScript/ttk.iss
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; Script generated by the Inno Setup Script Wizard.

#define MyAppNameZh "天天酷音"
#define MyAppVersion "2.6.2.0"
#define MyAppVersion "2.6.3.0"
#define MyAppPublisher "Greedysky Studio"
#define MyAppCopyright "Copyright (c) 2015 - 2017 Greedysky Studio"
#define MyAppURL "http://download.csdn.net/album/detail/3094"
Expand Down Expand Up @@ -58,7 +58,7 @@ Name: "{group}\ж
; Name: "chinese"; MessagesFile: "_resourcesPath_\ChineseSimp.isl"

[PostCompile]
Name: "makeCert.bat";Parameters:"D:\Qt\v2.6.2.0.exe" ;Flags: cmdprompt redirectoutput
Name: "makeCert.bat";Parameters:"D:\Qt\v2.6.3.0.exe" ;Flags: cmdprompt redirectoutput

[Code]
// for dll
Expand Down
8 changes: 4 additions & 4 deletions TTKService/TTKService.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ IDI_ICON1 ICON DISCARDABLE "../TTKResource/lb_player_logo
IDI_ICON2 ICON DISCARDABLE "../TTKResource/fileIcon/fileIcon.ico"

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,6,2,0
PRODUCTVERSION 2,6,2,0
FILEVERSION 2,6,3,0
PRODUCTVERSION 2,6,3,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -28,12 +28,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky studio, Ltd."
VALUE "FileDescription", "�������"
VALUE "FileVersion", "2.6.2.0"
VALUE "FileVersion", "2.6.3.0"
VALUE "InternalName", "�������.exe"
VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2017"
VALUE "OriginalFilename", "�������.exe"
VALUE "ProductName", "�������"
VALUE "ProductVersion", "2.6.2.0"
VALUE "ProductVersion", "2.6.3.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions TTKThirdParty/TTKExtras/TTKExtras.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#endif

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,6,2,0
PRODUCTVERSION 2,6,2,0
FILEVERSION 2,6,3,0
PRODUCTVERSION 2,6,3,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -25,10 +25,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky studio, Ltd."
VALUE "FileDescription", "TTKExtras"
VALUE "FileVersion", "2.6.2.0"
VALUE "FileVersion", "2.6.3.0"
VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2017"
VALUE "ProductName", "TTKExtras"
VALUE "ProductVersion", "2.6.2.0"
VALUE "ProductVersion", "2.6.3.0"
END
END
BLOCK "VarFileInfo"
Expand Down
4 changes: 2 additions & 2 deletions TTKVersion.pri
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
# * with this program; If not, see <http://www.gnu.org/licenses/>.
# =================================================

# update time 2017.11.11
TTKMusicPlayer = 2.6.2.0
# update time 2017.12.12
TTKMusicPlayer = 2.6.3.0
12 changes: 6 additions & 6 deletions musicversion.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,17 @@
* with this program; If not, see <http://www.gnu.org/licenses/>.
================================================= */

//update time 2017.11.11
#define TTKMUSIC_VERSION_STR "2.6.2.0"
#define TTKMUSIC_VERSION_WSTR L"2.6.2.0"
#define TTKMUSIC_VER_TIME_STR "(2017/11/11)"
//update time 2017.12.12
#define TTKMUSIC_VERSION_STR "2.6.3.0"
#define TTKMUSIC_VERSION_WSTR L"2.6.3.0"
#define TTKMUSIC_VER_TIME_STR "(2017/12/12)"

#define TTKMUSIC_MAJOR_VERSION 2
#define TTKMUSIC_MIDLE_VERSION 6
#define TTKMUSIC_MINOR_VERSION 2
#define TTKMUSIC_MINOR_VERSION 3
#define TTKMUSIC_PATCH_VERSION 0

#define TTKMUSIC_VERSION 0x02620
#define TTKMUSIC_VERSION 0x02630

#define TTKMUSIC_VERSION_CHECK(major, middle, minor, patch) ((major<<12)|(middle<<8)|(minor<<4)|(patch))

Expand Down

0 comments on commit 8af66b6

Please sign in to comment.