mirror of
https://github.com/ZDoom/gzdoom.git
synced 2025-02-01 22:30:48 +00:00
Pulled in some changes from "Rename the project"
This commit is contained in:
parent
d07de089c0
commit
1ac428a932
4 changed files with 21 additions and 15 deletions
|
@ -155,7 +155,7 @@ IF( NOT CMAKE_BUILD_TYPE )
|
|||
ENDIF()
|
||||
|
||||
set( ZDOOM_OUTPUT_DIR ${CMAKE_BINARY_DIR} CACHE PATH "Directory where zdoom.pk3 and the executable will be created." )
|
||||
set( ZDOOM_EXE_NAME "gzdoom" CACHE FILEPATH "Name of the executable to create" )
|
||||
set( ZDOOM_EXE_NAME "vkdoom" CACHE FILEPATH "Name of the executable to create" )
|
||||
if( MSVC )
|
||||
# Allow the user to use ZDOOM_OUTPUT_DIR as a single release point.
|
||||
# Use zdoom, zdoomd, zdoom64, and zdoomd64 for the binary names
|
||||
|
|
|
@ -1796,8 +1796,8 @@ static INT_PTR CALLBACK OverviewDlgProc (HWND hDlg, UINT message, WPARAM wParam,
|
|||
SetWindowTextW(edit, L"Please tell us about this problem.\n"
|
||||
"The information will NOT be sent to Microsoft.\n\n"
|
||||
"An error report has been created that you can submit to help improve " GAMENAME ". "
|
||||
"You can either save it to disk and make a report in the bugs forum at " FORUM_URL ", "
|
||||
"or you can send it directly without letting other people know about it.");
|
||||
/*"You can either save it to disk and make a report in the bugs forum at " FORUM_URL ", "
|
||||
"or you can send it directly without letting other people know about it."*/);
|
||||
SendMessageW(edit, EM_SETSEL, 0, 81);
|
||||
SendMessageW(edit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&charFormat);
|
||||
SendMessageW(edit, EM_SETEVENTMASK, 0, ENM_LINK);
|
||||
|
@ -1822,7 +1822,7 @@ static INT_PTR CALLBACK OverviewDlgProc (HWND hDlg, UINT message, WPARAM wParam,
|
|||
{
|
||||
if (link->msg == WM_LBUTTONDOWN)
|
||||
{
|
||||
ShellExecuteA (NULL, "open", BUGS_FORUM_URL, NULL, NULL, 0);
|
||||
//ShellExecuteA (NULL, "open", BUGS_FORUM_URL, NULL, NULL, 0);
|
||||
SetWindowLongPtrW (hDlg, DWLP_MSGRESULT, 1);
|
||||
return TRUE;
|
||||
}
|
||||
|
|
|
@ -456,9 +456,9 @@ PNamespace *ParseOneScript(const int baselump, ZCCParseState &state)
|
|||
{
|
||||
sc.ScriptError("Bad version directive");
|
||||
}
|
||||
if (state.ParseVersion > MakeVersion(VER_MAJOR, VER_MINOR, VER_REVISION))
|
||||
if (state.ParseVersion > MakeVersion(ZSCRIPT_VER_MAJOR, ZSCRIPT_VER_MINOR, ZSCRIPT_VER_REVISION))
|
||||
{
|
||||
sc.ScriptError("The file you are attempting to run requires a newer version of " GAMENAME ".\n\nA version with ZScript version %d.%d.%d is required, but your copy of " GAMENAME " only supports %d.%d.%d. Please upgrade!", state.ParseVersion.major, state.ParseVersion.minor, state.ParseVersion.revision, VER_MAJOR, VER_MINOR, VER_REVISION);
|
||||
sc.ScriptError("The file you are attempting to run requires a newer version of " GAMENAME ".\n\nA version with ZScript version %d.%d.%d is required, but your copy of " GAMENAME " only supports %d.%d.%d. Please upgrade!", state.ParseVersion.major, state.ParseVersion.minor, state.ParseVersion.revision, ZSCRIPT_VER_MAJOR, ZSCRIPT_VER_MINOR, ZSCRIPT_VER_REVISION);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
@ -41,20 +41,26 @@ const char *GetVersionString();
|
|||
|
||||
/** Lots of different version numbers **/
|
||||
|
||||
#define VERSIONSTR "4.11.0"
|
||||
#define VERSIONSTR "5.0pre"
|
||||
|
||||
// The version as seen in the Windows resource
|
||||
#define RC_FILEVERSION 4,11,0,0
|
||||
#define RC_PRODUCTVERSION 4,11,0,0
|
||||
#define RC_FILEVERSION 5,0,9999,0
|
||||
#define RC_PRODUCTVERSION 5,0,9999,0
|
||||
#define RC_PRODUCTVERSION2 VERSIONSTR
|
||||
|
||||
// These are for content versioning.
|
||||
#define VER_MAJOR 4
|
||||
#define VER_MINOR 11
|
||||
#define VER_MAJOR 5
|
||||
#define VER_MINOR 0
|
||||
#define VER_REVISION 0
|
||||
|
||||
// These are for zscript versioning.
|
||||
#define ZSCRIPT_VER_MAJOR 5
|
||||
#define ZSCRIPT_VER_MINOR 0
|
||||
#define ZSCRIPT_VER_REVISION 0
|
||||
|
||||
// This should always refer to the GZDoom version a derived port is based on and not reflect the derived port's version number!
|
||||
#define ENG_MAJOR 4
|
||||
#define ENG_MINOR 11
|
||||
#define ENG_MAJOR 5
|
||||
#define ENG_MINOR 0
|
||||
#define ENG_REVISION 0
|
||||
|
||||
// Version identifier for network games.
|
||||
|
@ -101,8 +107,8 @@ const char *GetVersionString();
|
|||
#define GAMENAME "GZDoom"
|
||||
#define WGAMENAME L"GZDoom"
|
||||
#define GAMENAMELOWERCASE "gzdoom"
|
||||
#define FORUM_URL "http://forum.zdoom.org/"
|
||||
#define BUGS_FORUM_URL "http://forum.zdoom.org/viewforum.php?f=2"
|
||||
//#define FORUM_URL "http://forum.zdoom.org/"
|
||||
//#define BUGS_FORUM_URL "http://forum.zdoom.org/viewforum.php?f=2"
|
||||
|
||||
#if defined(__APPLE__) || defined(_WIN32)
|
||||
#define GAME_DIR GAMENAME
|
||||
|
|
Loading…
Reference in a new issue