zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-12-04 09:52:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Changed game name to LZDoom.

Browse source
This commit is contained in:
drfrag666 2018-06-20 14:26:09 +02:00
parent 5045845896
commit 11ebbc689d
4 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -1,5 +1,5 @@
cmake_minimum_required( VERSION 2.8.7 ) cmake_minimum_required( VERSION 2.8.7 )
project(GZDoom) project(LZDoom)
if( COMMAND cmake_policy ) if( COMMAND cmake_policy )
if( POLICY CMP0011 ) if( POLICY CMP0011 )
@ -132,7 +132,7 @@ IF( NOT CMAKE_BUILD_TYPE )
ENDIF() ENDIF()
set( ZDOOM_OUTPUT_DIR ${CMAKE_BINARY_DIR} CACHE PATH "Directory where zdoom.pk3 and the executable will be created." ) 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 "lzdoom" CACHE FILEPATH "Name of the executable to create" )
if( MSVC ) if( MSVC )
# Allow the user to use ZDOOM_OUTPUT_DIR as a single release point. # Allow the user to use ZDOOM_OUTPUT_DIR as a single release point.
# Use zdoom, zdoomd, zdoom64, and zdoomd64 for the binary names # Use zdoom, zdoomd, zdoom64, and zdoomd64 for the binary names

12
src/version.h
View file

@ -41,7 +41,7 @@ const char *GetVersionString();
/** Lots of different version numbers **/ /** Lots of different version numbers **/
#define VERSIONSTR "g3.4.1v" #define VERSIONSTR "3.4.1"
// The version as seen in the Windows resource // The version as seen in the Windows resource
#define RC_FILEVERSION 3,4,1,0 #define RC_FILEVERSION 3,4,1,0
@ -50,7 +50,7 @@ const char *GetVersionString();
// These are for content versioning. The current state is '3.4'. // These are for content versioning. The current state is '3.4'.
#define VER_MAJOR 3 #define VER_MAJOR 3
#define VER_MINOR 4 #define VER_MINOR 4
#define VER_REVISION 0 #define VER_REVISION 1
// Version identifier for network games. // Version identifier for network games.
// Bump it every time you do a release unless you're certain you // Bump it every time you do a release unless you're certain you
@ -86,13 +86,13 @@ const char *GetVersionString();
#define SAVEVER 4552 #define SAVEVER 4552
// This is so that derivates can use the same savegame versions without worrying about engine compatibility // This is so that derivates can use the same savegame versions without worrying about engine compatibility
#define GAMESIG "GZDOOM" #define GAMESIG "LZDOOM"
#define BASEWAD "gzdoom.pk3" #define BASEWAD "lzdoom.pk3"
#define OPTIONALWAD "zd_extra.pk3" #define OPTIONALWAD "zd_extra.pk3"
// More stuff that needs to be different for derivatives. // More stuff that needs to be different for derivatives.
#define GAMENAME "GZDoom" #define GAMENAME "LZDoom"
#define GAMENAMELOWERCASE "gzdoom" #define GAMENAMELOWERCASE "lzdoom"
#define FORUM_URL "http://forum.zdoom.org/" #define FORUM_URL "http://forum.zdoom.org/"
#define BUGS_FORUM_URL "http://forum.zdoom.org/viewforum.php?f=2" #define BUGS_FORUM_URL "http://forum.zdoom.org/viewforum.php?f=2"

28
src/win32/zdoom.rc
View file

@ -73,13 +73,13 @@ BEGIN
" BEGIN\r\n" " 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 ""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 ""CompanyName"", "" ""\r\n"
" VALUE ""FileDescription"", ""GZDoom""\r\n" " VALUE ""FileDescription"", ""LZDoom""\r\n"
" VALUE ""FileVersion"", RC_FILEVERSION2\r\n" " VALUE ""FileVersion"", RC_FILEVERSION2\r\n"
" VALUE ""InternalName"", ""GZDoom""\r\n" " VALUE ""InternalName"", ""LZDoom""\r\n"
" VALUE ""LegalCopyright"", ""Copyright © 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al.""\r\n" " VALUE ""LegalCopyright"", ""Copyright © 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 ""LegalTrademarks"", ""DoomR is a Registered Trademark of id Software, Inc.""\r\n"
" VALUE ""OriginalFilename"", ""gzdoom.exe""\r\n" " VALUE ""OriginalFilename"", ""lzdoom.exe""\r\n"
" VALUE ""ProductName"", ""GZDoom""\r\n" " VALUE ""ProductName"", ""LZDoom""\r\n"
" VALUE ""ProductVersion"", RC_PRODUCTVERSION2\r\n" " VALUE ""ProductVersion"", RC_PRODUCTVERSION2\r\n"
" END\r\n" " END\r\n"
" END\r\n" " END\r\n"
@ -230,7 +230,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
{ {
CONTROL 101, IDC_STATIC, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 CONTROL 101, IDC_STATIC, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20
CONTROL "Welcome to GZDoom!", IDC_STATIC, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 42, 8, 180, 8 CONTROL "Welcome to LZDoom!", 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 "<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 "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 CONTROL "Select which game file (IWAD) to run.", IDC_STATIC, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 12, 44, 190, 8
@ -244,7 +244,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 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 "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 "Don't ask me this again", IDC_DONTASKIWAD, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 73, 211, 87, 10
CONTROL "Play GZDoom", IDOK, BUTTON, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 228, 90, 14 CONTROL "Play LZDoom", 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 CONTROL "Exit", IDCANCEL, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 166, 228, 50, 14
} }
#else #else
@ -252,13 +252,13 @@ FONT 8, "MS Shell Dlg"
FONT 8, "MS Shell Dlg", 0, 0, 0x1 FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN BEGIN
ICON IDI_ICON1,IDC_STATIC,7,7,21,20 ICON IDI_ICON1,IDC_STATIC,7,7,21,20
LTEXT "Welcome to GZDoom!",IDC_STATIC,42,8,180,8 LTEXT "Welcome to LZDoom!",IDC_STATIC,42,8,180,8
LTEXT "<Version info>",IDC_WELCOME_VERSION,42,18,180,8 LTEXT "<Version info>",IDC_WELCOME_VERSION,42,18,180,8
GROUPBOX "IWAD selection",IDC_STATIC,8,32,208,102 GROUPBOX "IWAD selection",IDC_STATIC,8,32,208,102
LTEXT "Select which game file (IWAD) to run.",IDC_STATIC,12,44,190,8 LTEXT "Select which game file (IWAD) to run.",IDC_STATIC,12,44,190,8
LISTBOX IDC_IWADLIST,12,56,200,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP LISTBOX IDC_IWADLIST,12,56,200,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Video settings",IDC_STATIC,8,138,208,48 GROUPBOX "Video settings",IDC_STATIC,8,138,208,48
LTEXT "Choose how GZDoom will render the game.",IDC_STATIC,12,148,190,8 LTEXT "Choose how LZDoom will render the game.",IDC_STATIC,12,148,190,8
CONTROL "Hardware (OpenGL)",IDC_WELCOME_OPENGL,"Button",BS_AUTORADIOBUTTON,12,170,93,10 CONTROL "Hardware (OpenGL)",IDC_WELCOME_OPENGL,"Button",BS_AUTORADIOBUTTON,12,170,93,10
CONTROL "Software (Doom)",IDC_WELCOME_SOFTWARE,"Button",BS_AUTORADIOBUTTON,12,160,93,10 CONTROL "Software (Doom)",IDC_WELCOME_SOFTWARE,"Button",BS_AUTORADIOBUTTON,12,160,93,10
CONTROL "Fullscreen",IDC_WELCOME_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,124,160,48,10 CONTROL "Fullscreen",IDC_WELCOME_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,124,160,48,10
@ -266,7 +266,7 @@ BEGIN
CONTROL "Lights.pk3",IDC_WELCOME_LIGHTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,46,192,51,10 CONTROL "Lights.pk3",IDC_WELCOME_LIGHTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,46,192,51,10
CONTROL "Brightmaps.pk3",IDC_WELCOME_BRIGHTMAPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,111,192,65,10 CONTROL "Brightmaps.pk3",IDC_WELCOME_BRIGHTMAPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,111,192,65,10
CONTROL "Don't ask me this again",IDC_DONTASKIWAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,73,211,87,10 CONTROL "Don't ask me this again",IDC_DONTASKIWAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,73,211,87,10
DEFPUSHBUTTON "Play GZDoom",IDOK,8,228,90,14 DEFPUSHBUTTON "Play LZDoom",IDOK,8,228,90,14
PUSHBUTTON "Exit",IDCANCEL,166,228,50,14 PUSHBUTTON "Exit",IDCANCEL,166,228,50,14
END END
#endif #endif
@ -418,7 +418,7 @@ END
IDD_CRASHDIALOG DIALOGEX 0, 0, 415, 308 IDD_CRASHDIALOG DIALOGEX 0, 0, 415, 308
STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTROLPARENT | WS_EX_APPWINDOW EXSTYLE WS_EX_CONTROLPARENT | WS_EX_APPWINDOW
CAPTION "GZDoom Very Fatal Error" CAPTION "LZDoom Very Fatal Error"
FONT 8, "MS Shell Dlg", 400, 0, 0x0 FONT 8, "MS Shell Dlg", 400, 0, 0x0
BEGIN BEGIN
CONTROL "",IDC_CRASHTAB,"SysTabControl32",WS_TABSTOP,4,4,404,280 CONTROL "",IDC_CRASHTAB,"SysTabControl32",WS_TABSTOP,4,4,404,280
@ -529,13 +529,13 @@ BEGIN
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 "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 "CompanyName", " "
VALUE "FileDescription", "GZDoom" VALUE "FileDescription", "LZDoom"
VALUE "FileVersion", RC_FILEVERSION2 VALUE "FileVersion", RC_FILEVERSION2
VALUE "InternalName", "GZDoom" VALUE "InternalName", "LZDoom"
VALUE "LegalCopyright", "Copyright © 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al." VALUE "LegalCopyright", "Copyright © 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 "LegalTrademarks", "DoomR is a Registered Trademark of id Software, Inc."
VALUE "OriginalFilename", "gzdoom.exe" VALUE "OriginalFilename", "lzdoom.exe"
VALUE "ProductName", "GZDoom" VALUE "ProductName", "LZDoom"
VALUE "ProductVersion", RC_PRODUCTVERSION2 VALUE "ProductVersion", RC_PRODUCTVERSION2
END END
END END

2
wadsrc/CMakeLists.txt
View file

@ -1,3 +1,3 @@
cmake_minimum_required( VERSION 2.8.7 ) cmake_minimum_required( VERSION 2.8.7 )
add_pk3(gzdoom.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static) add_pk3(lzdoom.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static)