Rename the project
This commit is contained in:
Magnus Norddahl
parent
be6f29c1d5
commit
38a1a8d5cb
9 changed files with 47 additions and 61 deletions
|
|
@ -1,5 +1,5 @@
|
|||
cmake_minimum_required( VERSION 3.1.0 )
|
||||
project(GZDoom)
|
||||
project(VkDoom)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
|
@ -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 "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
|
||||
|
|
|
|||
26
README.md
26
README.md
|
|
@ -1,28 +1,8 @@
|
|||
# Welcome to GZDoom!
|
||||
## Welcome to VkDoom!
|
||||
|
||||
[](https://github.com/ZDoom/gzdoom/actions/workflows/continuous_integration.yml)
|
||||
VkDoom is a source port based on the DOOM engine with a focus on vulkan and modern computers.
|
||||
|
||||
## GZDoom is a modder-friendly OpenGL and Vulkan source port based on the DOOM engine
|
||||
|
||||
Copyright (c) 1998-2022 ZDoom + GZDoom teams, and contributors
|
||||
|
||||
Doom Source (c) 1997 id Software, Raven Software, and contributors
|
||||
|
||||
Please see license files for individual contributor licenses
|
||||
|
||||
Special thanks to Coraline of the EDGE team for allowing us to use her [README.md](https://github.com/3dfxdev/EDGE/blob/master/README.md) as a template for this one.
|
||||
Please see license files for individual contributor licenses.
|
||||
|
||||
### Licensed under the GPL v3
|
||||
##### https://www.gnu.org/licenses/quick-guide-gplv3.en.html
|
||||
---
|
||||
|
||||
## How to build GZDoom
|
||||
|
||||
To build GZDoom, please see the [wiki](https://zdoom.org/wiki/) and see the "Programmer's Corner" on the bottom-right corner of the page to build for your platform.
|
||||
|
||||
# Resources
|
||||
- https://zdoom.org/ - Home Page
|
||||
- https://forum.zdoom.org/ - Forum
|
||||
- https://zdoom.org/wiki/ - Wiki
|
||||
- https://discord.gg/zdoom - Discord Server
|
||||
- https://docs.google.com/spreadsheets/d/1pvwXEgytkor9SClCiDn4j5AH7FedyXS-ocCbsuQIXDU/edit?usp=sharing - Translation sheet (Google Docs)
|
||||
|
|
|
|||
|
|
@ -1356,7 +1356,7 @@ endif()
|
|||
|
||||
add_custom_command(TARGET zdoom POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||
${CMAKE_SOURCE_DIR}/soundfont/gzdoom.sf2 $<TARGET_FILE_DIR:zdoom>/soundfonts/gzdoom.sf2
|
||||
${CMAKE_SOURCE_DIR}/soundfont/vkdoom.sf2 $<TARGET_FILE_DIR:zdoom>/soundfonts/vkdoom.sf2
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||
${CMAKE_SOURCE_DIR}/fm_banks/GENMIDI.GS.wopl $<TARGET_FILE_DIR:zdoom>/fm_banks/GENMIDI.GS.wopl
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||
|
|
@ -1391,7 +1391,7 @@ if( APPLE )
|
|||
set_target_properties(zdoom PROPERTIES
|
||||
LINK_FLAGS "${LINK_FRAMEWORKS}"
|
||||
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/posix/osx/zdoom-info.plist"
|
||||
XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.drdteam.gzdoom"
|
||||
XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.vkdoom.vkdoom"
|
||||
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "" )
|
||||
|
||||
# Dymanic libraries like libvulkan.dylib or libMoltenVK.dylib will be loaded by dlopen()
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -458,9 +458,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.11pre"
|
||||
#define VERSIONSTR "1.0pre"
|
||||
|
||||
// The version as seen in the Windows resource
|
||||
#define RC_FILEVERSION 4,10,9999,0
|
||||
#define RC_PRODUCTVERSION 4,10,9999,0
|
||||
#define RC_FILEVERSION 1,0,9999,0
|
||||
#define RC_PRODUCTVERSION 1,0,9999,0
|
||||
#define RC_PRODUCTVERSION2 VERSIONSTR
|
||||
|
||||
// These are for content versioning.
|
||||
#define VER_MAJOR 4
|
||||
#define VER_MINOR 11
|
||||
#define VER_MAJOR 1
|
||||
#define VER_MINOR 0
|
||||
#define 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
|
||||
// These are for zscript versioning.
|
||||
#define ZSCRIPT_VER_MAJOR 4
|
||||
#define ZSCRIPT_VER_MINOR 11
|
||||
#define ZSCRIPT_VER_REVISION 0
|
||||
|
||||
// This should always refer to the VkDoom version a derived port is based on and not reflect the derived port's version number!
|
||||
#define ENG_MAJOR 1
|
||||
#define ENG_MINOR 0
|
||||
#define ENG_REVISION 0
|
||||
|
||||
// Version identifier for network games.
|
||||
|
|
@ -91,18 +97,18 @@ const char *GetVersionString();
|
|||
#define SAVEVER 4560
|
||||
|
||||
// This is so that derivates can use the same savegame versions without worrying about engine compatibility
|
||||
#define GAMESIG "GZDOOM"
|
||||
#define BASEWAD "gzdoom.pk3"
|
||||
#define GAMESIG "VKDOOM"
|
||||
#define BASEWAD "vkdoom.pk3"
|
||||
#define OPTIONALWAD "game_support.pk3"
|
||||
#define GZDOOM 1
|
||||
#define VR3D_ENABLED
|
||||
|
||||
// More stuff that needs to be different for derivatives.
|
||||
#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 GAMENAME "VKDoom"
|
||||
#define WGAMENAME L"VKDoom"
|
||||
#define GAMENAMELOWERCASE "vkdoom"
|
||||
//#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
|
||||
|
|
|
|||
|
|
@ -69,13 +69,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"", ""GZDoom""\r\n"
|
||||
" VALUE ""FileDescription"", ""VkDoom""\r\n"
|
||||
" VALUE ""FileVersion"", RC_FILEVERSION2\r\n"
|
||||
" VALUE ""InternalName"", ""GZDoom""\r\n"
|
||||
" VALUE ""LegalCopyright"", ""Copyright © 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al.""\r\n"
|
||||
" VALUE ""InternalName"", ""VkDoom""\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 ""OriginalFilename"", ""gzdoom.exe""\r\n"
|
||||
" VALUE ""ProductName"", ""GZDoom""\r\n"
|
||||
" VALUE ""OriginalFilename"", ""vkdoom.exe""\r\n"
|
||||
" VALUE ""ProductName"", ""VkDoom""\r\n"
|
||||
" VALUE ""ProductVersion"", GIT_VERSION\r\n"
|
||||
" END\r\n"
|
||||
" END\r\n"
|
||||
|
|
@ -209,7 +209,7 @@ CAPTION "Welcome"
|
|||
FONT 8, "MS Shell Dlg", 0, 0, 0x1
|
||||
BEGIN
|
||||
ICON IDI_ICON1,IDC_STATIC,7,7,20,20
|
||||
LTEXT "Welcome to GZDoom!",IDC_STATIC,43,8,180,8
|
||||
LTEXT "Welcome to VkDoom!",IDC_STATIC,43,8,180,8
|
||||
LTEXT "<Version info>",IDC_WELCOME_VERSION,43,18,180,8
|
||||
GROUPBOX "IWAD selection",IDC_STATIC,8,32,208,117
|
||||
LTEXT "Select which game file (IWAD) to run.",IDC_STATIC,12,44,190,8
|
||||
|
|
@ -236,7 +236,7 @@ END
|
|||
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
|
||||
EXSTYLE WS_EX_CONTROLPARENT | WS_EX_APPWINDOW
|
||||
CAPTION "GZDoom Very Fatal Error"
|
||||
CAPTION "VkDoom Very Fatal Error"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x0
|
||||
BEGIN
|
||||
CONTROL "",IDC_CRASHTAB,"SysTabControl32",WS_TABSTOP,4,4,404,280
|
||||
|
|
@ -346,13 +346,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", "GZDoom " GIT_DESCRIPTION
|
||||
VALUE "FileDescription", "VkDoom " GIT_DESCRIPTION
|
||||
VALUE "FileVersion", RC_FILEVERSION2
|
||||
VALUE "InternalName", "GZDoom"
|
||||
VALUE "LegalCopyright", "Copyright © 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al."
|
||||
VALUE "LegalTrademarks", "Doom® is a Registered Trademark of id Software, Inc."
|
||||
VALUE "OriginalFilename", "gzdoom.exe"
|
||||
VALUE "ProductName", "GZDoom"
|
||||
VALUE "InternalName", "VkDoom"
|
||||
VALUE "LegalCopyright", "This isn't 1995. Typing a copyright here is silly!"
|
||||
VALUE "LegalTrademarks", "Doom is a Registered Trademark of id Software, Inc."
|
||||
VALUE "OriginalFilename", "vkdoom.exe"
|
||||
VALUE "ProductName", "VkDoom"
|
||||
VALUE "ProductVersion", GIT_DESCRIPTION
|
||||
END
|
||||
END
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
cmake_minimum_required( VERSION 3.1.0 )
|
||||
|
||||
add_pk3(gzdoom.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static)
|
||||
add_pk3(vkdoom.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue