Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Git情報がなくてもビルドできるようにする (Close #148) #191

Merged
merged 3 commits into from
Jun 30, 2018
Merged

Git情報がなくてもビルドできるようにする (Close #148) #191

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c1ca56
Git情報がなくてもビルドできるようにする
kobake Jun 30, 2018
7e08337
version.h の VER_GITHASH がCDlgAbout.cpp 定義の定数名と被っていたので命名変更
kobake Jun 30, 2018
16c199f
.rc ファイルからの version.h インクルード時に日本語コメントが行認識を狂わせる問題を修正
kobake Jun 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions sakura_core/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,15 @@
#define ALPHA_VERSION_STR_WITH_SPACE ""
#endif

// バージョン情報埋め込み用 Git ハッシュ文字列 (存在しない場合には空文字列)
#ifdef GIT_SHORT_COMMIT_HASH
#define VER_GITHASH " (" GIT_SHORT_COMMIT_HASH ")"
#else
#define VER_GITHASH ""
#endif

// リソース埋め込み用バージョン文字列
// e.g. "2.3.2.0 (4a0de579) UNICODE 64bit DEBUG"
// e.g. "2.3.2.0 (4a0de579) UNICODE 64bit"
#define RESOURCE_VERSION_STRING(_VersionString) _VersionString " (" GIT_SHORT_COMMIT_HASH ") " VER_CHARSET " " VER_PLATFORM SPACE_WHEN_DEBUG VER_CONFIG ALPHA_VERSION_STR_WITH_SPACE
// e.g. "2.3.2.0 (4a0de579) UNICODE 64bit DEBUG" … デバッグビルド時の例
// e.g. "2.3.2.0 (4a0de579) UNICODE 64bit" … リリースビルド時の例
// e.g. "2.3.2.0 UNICODE 64bit" … Git 情報無い場合の例
#define RESOURCE_VERSION_STRING(_VersionString) _VersionString VER_GITHASH " " VER_CHARSET " " VER_PLATFORM SPACE_WHEN_DEBUG VER_CONFIG ALPHA_VERSION_STR_WITH_SPACE