Include modified PrBoomX enhancements

CMakeLists.txt

@@ -1,15 +1,8 @@
 cmake_minimum_required(VERSION 3.0)
 
-project("PrBoom-Plus"
-    VERSION 2.6.66
-    HOMEPAGE_URL "https://github.com/coelckers/prboom-plus")
-
-# The EMSCRIPTEN conditional is available after project configuration
-if(EMSCRIPTEN)
-    set(PROJECT_NAME "Dwasm")
-    set(PROJECT_VERSION 1.4.1)
-    set(PROJECT_HOMEPAGE_URL "https://github.com/GMH-Code/Dwasm")
-endif()
+project("Dwasm"
+    VERSION 2.0.0
+    HOMEPAGE_URL "https://github.com/GMH-Code/Dwasm")
 
 # Set a default build type if none was specified
 set(default_build_type "RelWithDebInfo")
@@ -32,7 +25,7 @@ if(NOT EMSCRIPTEN)
 endif()
 
 # Check if a CMAKE_INSTALL_DOCDIR is provided before GNUInstallDirs sets its
-# own default; this lets us set our own PrBoom-Plus default docdir later
+# own default; this lets us set our own PrBoomX default docdir later
 # without clobbering a user-configured one
 set(CUSTOM_DOCDIR "${CMAKE_INSTALL_DOCDIR}")
 include(GNUInstallDirs)
@@ -47,7 +40,7 @@ endif()
 set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../dependencies_${DEPENDENCY_SUFFIX}")
 
 set(PACKAGE_NAME "${PROJECT_NAME}")
-set(PACKAGE_TARNAME "prboom-plus")
+set(PACKAGE_TARNAME "prboomX")
 set(PACKAGE_VERSION "${PROJECT_VERSION}")
 set(PACKAGE_HOMEPAGE "${PROJECT_HOMEPAGE_URL}")
 set(PACKAGE_STRING "${PROJECT_NAME} ${PROJECT_VERSION}")
@@ -310,7 +303,7 @@ endif()
 
 set(PRBOOM_OUTPUT_PATH ${CMAKE_BINARY_DIR})
 
-set(WAD_DATA prboom-plus.wad)
+set(WAD_DATA prboomx.wad)
 set(WAD_DATA_PATH "${PRBOOM_OUTPUT_PATH}/${WAD_DATA}")
 
 if(NOT EMSCRIPTEN)

ICONS/icons.rc

@@ -14,7 +14,7 @@
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ICON1               ICON    DISCARDABLE     "prboom-plus.ico"
+IDI_ICON1               ICON    DISCARDABLE     "prboomX.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -24,16 +24,16 @@ IDI_ICON1               ICON    DISCARDABLE     "prboom-plus.ico"
 #ifdef USE_WINDOWS_LAUNCHER
 
 #ifdef _MSC_VER
-1                       24      MOVEABLE PURE   "prboom-plus.exe.manifest"
+1                       24      MOVEABLE PURE   "prboomX.exe.manifest"
 #else
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST  "prboom-plus.exe.manifest"
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST  "prboomX.exe.manifest"
 #endif
 
 IDD_LAUNCHERSERVERDIALOG DIALOGEX 0, 0, 187, 245
 STYLE DS_SYSMODAL | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | 
     WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT | WS_EX_APPWINDOW
-CAPTION "PrBoom-Plus Launcher"
+CAPTION "PrBoomX Launcher"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,72,224,50,14

ICONS/prboom-plus.bash → ICONS/prboomX.bash

@@ -1,6 +1,6 @@
 # bash completion for PrBoom+                              -*- shell-script -*-
 
-_prboom_plus()
+_prboomX()
 {
     local cur prev words cword
     _init_completion || return
@@ -46,6 +46,6 @@ _prboom_plus()
     fi
 } &&
 
-complete -F _prboom_plus prboom-plus
+complete -F _prboomX prboomX
 
 # ex: ts=4 sw=4 et filetype=sh

ICONS/prboom-plus.desktop → ICONS/prboomX.desktop

@@ -1,10 +1,10 @@
 [Desktop Entry]
 Type=Application
-Name=PrBoom+
+Name=PrBoomX
 Comment=enhanced clone of the classic first-person shooter Doom
-Icon=prboom-plus
-TryExec=prboom-plus
-Exec=prboom-plus %F
+Icon=prboomX
+TryExec=prboomX
+Exec=prboomX %F
 Categories=Game;ActionGame;
 MimeType=application/x-doom-wad;
 Keywords=first;person;shooter;doom;

ICONS/prboom-plus.exe.manifest → ICONS/prboomX.exe.manifest

@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- What's this??? It's for WinXP. See bug#466423 if you're interested -->
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-<assemblyIdentity
-    version="1.0.0.0"
-    processorArchitecture="*"
-    name="prboom-plus.prboom-plus.prboom-plus"
-    type="win32"
-/>
-<description>PrBoom-Plus</description>
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            processorArchitecture="*"
-            publicKeyToken="6595b64144ccf1df"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-
-  <!-- Declare app as DPI aware, so that Windows Vista and later will not
-       apply DPI virtualization. -->
-
-  <asmv3:application>
-    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
-      <dpiAware>true</dpiAware>
-    </asmv3:windowsSettings>
-  </asmv3:application>
-</assembly>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- What's this??? It's for WinXP. See bug#466423 if you're interested -->
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+<assemblyIdentity
+    version="1.0.0.0"
+    processorArchitecture="*"
+    name="prboomX.prboomX.prboomX"
+    type="win32"
+/>
+<description>PrBoomX</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="*"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+
+  <!-- Declare app as DPI aware, so that Windows Vista and later will not
+       apply DPI virtualization. -->
+
+  <asmv3:application>
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+      <dpiAware>true</dpiAware>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>