zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-25 13:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

- QZDoom-ify

Browse source
This commit is contained in:
Rachael Alexanderson 2017-03-14 01:19:37 -04:00
parent df8fa1274a
commit 771b321203
7 changed files with 26 additions and 26 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(QZDoom)
if( COMMAND cmake_policy ) if( COMMAND cmake_policy )
if( POLICY CMP0011 ) if( POLICY CMP0011 )
@ -122,7 +122,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 "qzdoom" 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

2
src/posix/cocoa/i_video.mm
View file

@ -148,7 +148,7 @@ CUSTOM_CVAR(Bool, vid_autoswitch, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_
static int s_currentRenderer; static int s_currentRenderer;
CUSTOM_CVAR(Int, vid_renderer, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) CUSTOM_CVAR(Int, vid_renderer, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
{ {
// 0: Software renderer // 0: Software renderer
// 1: OpenGL renderer // 1: OpenGL renderer

2
src/posix/sdl/hardware.cpp
View file

@ -65,7 +65,7 @@ void I_RestartRenderer();
int currentrenderer; int currentrenderer;
// [ZDoomGL] // [ZDoomGL]
CUSTOM_CVAR (Int, vid_renderer, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) CUSTOM_CVAR (Int, vid_renderer, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
{ {
// 0: Software renderer // 0: Software renderer
// 1: OpenGL renderer // 1: OpenGL renderer

20
src/version.h
View file

@ -46,16 +46,16 @@ const char *GetVersionString();
#ifdef GIT_DESCRIPTION #ifdef GIT_DESCRIPTION
#define VERSIONSTR GIT_DESCRIPTION #define VERSIONSTR GIT_DESCRIPTION
#else #else
#define VERSIONSTR "2.5pre" #define VERSIONSTR "1.4pre"
#endif #endif
// The version as seen in the Windows resource // The version as seen in the Windows resource
#define RC_FILEVERSION 2,4,9999,0 #define RC_FILEVERSION 1,3,9999,0
#define RC_PRODUCTVERSION 2,4,9999,0 #define RC_PRODUCTVERSION 1,3,9999,0
#define RC_PRODUCTVERSION2 VERSIONSTR #define RC_PRODUCTVERSION2 VERSIONSTR
// These are for content versioning. The current state is '2.4'. // These are for content versioning. The current state is '2.4'.
#define VER_MAJOR 2 #define VER_MAJOR 2
#define VER_MINOR 5 #define VER_MINOR 4
#define VER_REVISION 0 #define VER_REVISION 0
// Version identifier for network games. // Version identifier for network games.
@ -92,14 +92,14 @@ const char *GetVersionString();
#define SAVEVER 4551 #define SAVEVER 4551
// 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 "QZDOOM"
#define BASEWAD "gzdoom.pk3" #define BASEWAD "qzdoom.pk3"
// More stuff that needs to be different for derivatives. // More stuff that needs to be different for derivatives.
#define GAMENAME "GZDoom" #define GAMENAME "QZDoom"
#define GAMENAMELOWERCASE "gzdoom" #define GAMENAMELOWERCASE "qzdoom"
#define FORUM_URL "http://forum.drdteam.org" #define FORUM_URL "http://forum.drdteam.org/viewforum.php?f=196"
#define BUGS_FORUM_URL "http://forum.drdteam.org/viewforum.php?f=24" #define BUGS_FORUM_URL "http://forum.drdteam.org/viewforum.php?f=197"
#if defined(__APPLE__) || defined(_WIN32) #if defined(__APPLE__) || defined(_WIN32)
#define GAME_DIR GAMENAME #define GAME_DIR GAMENAME

2
src/win32/hardware.cpp
View file

@ -106,7 +106,7 @@ CUSTOM_CVAR(Bool, vid_used3d, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOIN
} }
// [ZDoomGL] // [ZDoomGL]
CUSTOM_CVAR (Int, vid_renderer, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) CUSTOM_CVAR (Int, vid_renderer, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
{ {
// 0: Software renderer // 0: Software renderer
// 1: OpenGL renderer // 1: OpenGL renderer

20
src/win32/zdoom.rc
View file

@ -72,13 +72,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"", ""QZDoom""\r\n"
" VALUE ""FileVersion"", RC_FILEVERSION2\r\n" " VALUE ""FileVersion"", RC_FILEVERSION2\r\n"
" VALUE ""InternalName"", ""GZDoom""\r\n" " VALUE ""InternalName"", ""QZDoom""\r\n"
" VALUE ""LegalCopyright"", ""Copyright \\u00A9 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al.""\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 ""LegalTrademarks"", ""DoomR is a Registered Trademark of id Software, Inc.""\r\n"
" VALUE ""OriginalFilename"", ""gzdoom.exe""\r\n" " VALUE ""OriginalFilename"", ""qzdoom.exe""\r\n"
" VALUE ""ProductName"", ""GZDoom""\r\n" " VALUE ""ProductName"", ""QZDoom""\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"
@ -228,7 +228,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 QZDoom!", 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
@ -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 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 QZDoom", 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
} }
@ -504,13 +504,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", "QZDoom"
VALUE "FileVersion", RC_FILEVERSION2 VALUE "FileVersion", RC_FILEVERSION2
VALUE "InternalName", "GZDoom" VALUE "InternalName", "QZDoom"
VALUE "LegalCopyright", "Copyright \u00A9 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al." 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 "LegalTrademarks", "DoomR is a Registered Trademark of id Software, Inc."
VALUE "OriginalFilename", "gzdoom.exe" VALUE "OriginalFilename", "qzdoom.exe"
VALUE "ProductName", "GZDoom" VALUE "ProductName", "QZDoom"
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(qzdoom.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static)