mirror of https://github.com/ZDoom/gzdoom.git
- Make QZDoom GZDoom again!
This commit is contained in:
Rachael Alexanderson
parent
4d70b01da5
commit
536e8fad19
|
|
@ -1,5 +1,5 @@
|
|||
cmake_minimum_required( VERSION 2.8.7 )
|
||||
project(QZDoom)
|
||||
project(GZDoom)
|
||||
|
||||
if( COMMAND cmake_policy )
|
||||
if( POLICY CMP0011 )
|
||||
|
|
@ -122,7 +122,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 "qzdoom" CACHE FILEPATH "Name of the executable to create" )
|
||||
set( ZDOOM_EXE_NAME "gzdoom" 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
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ CUSTOM_CVAR(Bool, vid_autoswitch, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_
|
|||
|
||||
static int s_currentRenderer;
|
||||
|
||||
CUSTOM_CVAR(Int, vid_renderer, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
|
||||
CUSTOM_CVAR(Int, vid_renderer, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
|
||||
{
|
||||
// 0: Software renderer
|
||||
// 1: OpenGL renderer
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ void I_RestartRenderer();
|
|||
int currentrenderer;
|
||||
|
||||
// [ZDoomGL]
|
||||
CUSTOM_CVAR (Int, vid_renderer, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
|
||||
CUSTOM_CVAR (Int, vid_renderer, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
|
||||
{
|
||||
// 0: Software renderer
|
||||
// 1: OpenGL renderer
|
||||
|
|
|
|||
|
|
@ -46,12 +46,12 @@ const char *GetVersionString();
|
|||
#ifdef GIT_DESCRIPTION
|
||||
#define VERSIONSTR GIT_DESCRIPTION
|
||||
#else
|
||||
#define VERSIONSTR "1.3pre"
|
||||
#define VERSIONSTR "2.3pre"
|
||||
#endif
|
||||
|
||||
// The version as seen in the Windows resource
|
||||
#define RC_FILEVERSION 1,3,9999,0
|
||||
#define RC_PRODUCTVERSION 1,3,9999,0
|
||||
#define RC_FILEVERSION 2,3,9999,0
|
||||
#define RC_PRODUCTVERSION 2,3,9999,0
|
||||
#define RC_PRODUCTVERSION2 VERSIONSTR
|
||||
// These are for content versioning. The current state is '2.4'.
|
||||
#define VER_MAJOR 2
|
||||
|
|
@ -92,14 +92,14 @@ const char *GetVersionString();
|
|||
#define SAVEVER 4550
|
||||
|
||||
// This is so that derivates can use the same savegame versions without worrying about engine compatibility
|
||||
#define GAMESIG "QZDOOM"
|
||||
#define BASEWAD "qzdoom.pk3"
|
||||
#define GAMESIG "GZDOOM"
|
||||
#define BASEWAD "gzdoom.pk3"
|
||||
|
||||
// More stuff that needs to be different for derivatives.
|
||||
#define GAMENAME "QZDoom"
|
||||
#define GAMENAMELOWERCASE "qzdoom"
|
||||
#define FORUM_URL "http://forum.drdteam.org/viewforum.php?f=196"
|
||||
#define BUGS_FORUM_URL "http://forum.drdteam.org/viewforum.php?f=197"
|
||||
#define GAMENAME "GZDoom"
|
||||
#define GAMENAMELOWERCASE "gzdoom"
|
||||
#define FORUM_URL "http://forum.drdteam.org"
|
||||
#define BUGS_FORUM_URL "http://forum.drdteam.org/viewforum.php?f=24"
|
||||
|
||||
#if defined(__APPLE__) || defined(_WIN32)
|
||||
#define GAME_DIR GAMENAME
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ CUSTOM_CVAR(Bool, vid_used3d, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOIN
|
|||
}
|
||||
|
||||
// [ZDoomGL]
|
||||
CUSTOM_CVAR (Int, vid_renderer, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
|
||||
CUSTOM_CVAR (Int, vid_renderer, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
|
||||
{
|
||||
// 0: Software renderer
|
||||
// 1: OpenGL renderer
|
||||
|
|
|
|||
|
|
@ -72,13 +72,13 @@ BEGIN
|
|||
" BEGIN\r\n"
|
||||
" VALUE ""Comments"", ""Thanks to id Software for creating DOOM and then releasing the source code. Thanks also to TeamTNT for creating BOOM, which ZDoom is partially based on. Includes code based on the Cajun Bot 0.97 by Martin Collberg.""\r\n"
|
||||
" VALUE ""CompanyName"", "" ""\r\n"
|
||||
" VALUE ""FileDescription"", ""QZDoom""\r\n"
|
||||
" VALUE ""FileDescription"", ""GZDoom""\r\n"
|
||||
" VALUE ""FileVersion"", RC_FILEVERSION2\r\n"
|
||||
" VALUE ""InternalName"", ""QZDoom""\r\n"
|
||||
" VALUE ""InternalName"", ""GZDoom""\r\n"
|
||||
" VALUE ""LegalCopyright"", ""Copyright \\u00A9 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al.""\r\n"
|
||||
" VALUE ""LegalTrademarks"", ""DoomR is a Registered Trademark of id Software, Inc.""\r\n"
|
||||
" VALUE ""OriginalFilename"", ""qzdoom.exe""\r\n"
|
||||
" VALUE ""ProductName"", ""QZDoom""\r\n"
|
||||
" VALUE ""OriginalFilename"", ""gzdoom.exe""\r\n"
|
||||
" VALUE ""ProductName"", ""GZDoom""\r\n"
|
||||
" VALUE ""ProductVersion"", RC_PRODUCTVERSION2\r\n"
|
||||
" END\r\n"
|
||||
" END\r\n"
|
||||
|
|
@ -228,7 +228,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
|||
FONT 8, "MS Shell Dlg"
|
||||
{
|
||||
CONTROL 101, IDC_STATIC, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20
|
||||
CONTROL "Welcome to QZDoom!", IDC_STATIC, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 42, 8, 180, 8
|
||||
CONTROL "Welcome to GZDoom!", IDC_STATIC, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 42, 8, 180, 8
|
||||
CONTROL "<Version info>", IDC_WELCOME_VERSION, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 42, 18, 180, 8
|
||||
CONTROL "IWAD selection", IDC_STATIC, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 8, 32, 208, 117
|
||||
CONTROL "Select which game file (IWAD) to run.", IDC_STATIC, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 12, 44, 190, 8
|
||||
|
|
@ -242,7 +242,7 @@ FONT 8, "MS Shell Dlg"
|
|||
CONTROL "Load lights", IDC_WELCOME_LIGHTS, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 130, 180, 51, 10
|
||||
CONTROL "Load brightmaps", IDC_WELCOME_BRIGHTMAPS, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 130, 190, 65, 10
|
||||
CONTROL "Don't ask me this again", IDC_DONTASKIWAD, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 73, 211, 87, 10
|
||||
CONTROL "Play QZDoom", IDOK, BUTTON, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 228, 90, 14
|
||||
CONTROL "Play GZDoom", IDOK, BUTTON, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 228, 90, 14
|
||||
CONTROL "Exit", IDCANCEL, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 166, 228, 50, 14
|
||||
}
|
||||
|
||||
|
|
@ -504,13 +504,13 @@ BEGIN
|
|||
BEGIN
|
||||
VALUE "Comments", "Thanks to id Software for creating DOOM and then releasing the source code. Thanks also to TeamTNT for creating BOOM, which ZDoom is partially based on. Includes code based on the Cajun Bot 0.97 by Martin Collberg."
|
||||
VALUE "CompanyName", " "
|
||||
VALUE "FileDescription", "QZDoom"
|
||||
VALUE "FileDescription", "GZDoom"
|
||||
VALUE "FileVersion", RC_FILEVERSION2
|
||||
VALUE "InternalName", "QZDoom"
|
||||
VALUE "InternalName", "GZDoom"
|
||||
VALUE "LegalCopyright", "Copyright \u00A9 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al."
|
||||
VALUE "LegalTrademarks", "DoomR is a Registered Trademark of id Software, Inc."
|
||||
VALUE "OriginalFilename", "qzdoom.exe"
|
||||
VALUE "ProductName", "QZDoom"
|
||||
VALUE "OriginalFilename", "gzdoom.exe"
|
||||
VALUE "ProductName", "GZDoom"
|
||||
VALUE "ProductVersion", RC_PRODUCTVERSION2
|
||||
END
|
||||
END
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
cmake_minimum_required( VERSION 2.8.7 )
|
||||
|
||||
add_pk3(qzdoom.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static)
|
||||
add_pk3(gzdoom.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static)
|
||||
|
|
|
|||
Loading…
Reference in New Issue