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

[ボツ] x64 版でバージョン情報にアルファ版の表示を行う #174

Closed
wants to merge 2 commits into from
Closed

[ボツ] x64 版でバージョン情報にアルファ版の表示を行う #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b10efb4
#162: x64 版でバージョン情報にアルファ版の表示を行う
m-tmatma Jun 23, 2018
c264f82
#162: x64 版でコンパイル時に alpha 版であることを pragma でメッセージを出す
m-tmatma Jun 23, 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
10 changes: 10 additions & 0 deletions sakura_core/StdAfx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@
#define STRICT 1
#endif

#if _WIN64
#define ALPHA_VERSION
#endif

#if defined(ALPHA_VERSION)
#pragma message("----------------------------------------------------------------------------------------")
#pragma message("--- This is an alpha version and under development. Be careful to use this version. ---")
#pragma message("----------------------------------------------------------------------------------------")
#endif

#if defined(_MSC_VER) && _MSC_VER >= 1400

//#pragma warning(disable: 4786)
Expand Down
9 changes: 8 additions & 1 deletion sakura_core/config/app_constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,14 @@
#define _APP_NAME_2_(TYPE) TYPE("")
#endif

#define _GSTR_APPNAME_(TYPE) _APP_NAME_(TYPE) _APP_NAME_2_(TYPE) //��:UNICODE�f�o�b�O��_T("sakura(�f�o�b�O��)")
#if defined(ALPHA_VERSION)
#define _APP_NAME_3_(TYPE) TYPE("(Alpha Version)")
#else
#define _APP_NAME_3_(TYPE) TYPE("")
#endif

//��:UNICODE�f�o�b�O��_T("sakura(�f�o�b�O��)")
#define _GSTR_APPNAME_(TYPE) _APP_NAME_(TYPE) _APP_NAME_2_(TYPE) _APP_NAME_3_(TYPE)

#define GSTR_APPNAME (_GSTR_APPNAME_(_T) )
#define GSTR_APPNAME_A (_GSTR_APPNAME_(ATEXT))
Expand Down
6 changes: 5 additions & 1 deletion sakura_core/dlg/CDlgAbout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,17 @@ BOOL CDlgAbout::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam )
// バージョン&リビジョン情報
DWORD dwVersionMS, dwVersionLS;
GetAppVersionInfo( NULL, VS_VERSION_INFO, &dwVersionMS, &dwVersionLS );
auto_sprintf(szMsg, _T("Ver. %d.%d.%d.%d\r\n"),
auto_sprintf(szMsg, _T("Ver. %d.%d.%d.%d"),
HIWORD(dwVersionMS),
LOWORD(dwVersionMS),
HIWORD(dwVersionLS),
LOWORD(dwVersionLS)
);
cmemMsg.AppendString(szMsg);
#if defined(ALPHA_VERSION)
cmemMsg.AppendString(_APP_NAME_3_(_T));
#endif
cmemMsg.AppendString(_T("\r\n") );
#if defined(GIT_COMMIT_HASH)
cmemMsg.AppendString(_T("(GitHash " GIT_COMMIT_HASH ")\r\n"));
#endif
Expand Down