--- CMakeLists.txt
+++ CMakeLists.txt
@@ -62,7 +62,7 @@ if(PNG_FOUND)
endif()
# Check for FluidSynth.
-find_package(FluidSynth 2.2.0)
+find_package(FluidSynth 2.0.0)
if(FluidSynth_FOUND AND ENABLE_SDL2_MIXER)
set(HAVE_FLUIDSYNTH TRUE)
endif()
@@ -87,11 +87,8 @@ set(PROGRAM_PREFIX "${PROGRAM_SPREFIX}-"
configure_file(cmake/config.h.cin config.h)
configure_file(src/doom-res.rc.in src/doom-res.rc)
-configure_file(src/heretic-res.rc.in src/heretic-res.rc)
-configure_file(src/hexen-res.rc.in src/hexen-res.rc)
configure_file(src/setup-res.rc.in src/setup-res.rc)
configure_file(src/setup/setup-manifest.xml.in src/setup/setup-manifest.xml)
-configure_file(src/strife-res.rc.in src/strife-res.rc)
foreach(SUBDIR textscreen opl pcsound src)
add_subdirectory("${SUBDIR}")
--- configure.ac
+++ configure.ac
@@ -296,9 +296,6 @@ Makefile
man/Makefile
man/bash-completion/Makefile
man/bash-completion/doom.template
-man/bash-completion/heretic.template
-man/bash-completion/hexen.template
-man/bash-completion/strife.template
opl/Makefile
opl/examples/Makefile
pcsound/Makefile
@@ -313,22 +310,10 @@ src/Doom.metainfo.xml
src/Doom.desktop
src/Doom_Screensaver.desktop
src/doom/Makefile
-src/heretic-res.rc
-src/Heretic.metainfo.xml
-src/Heretic.desktop
-src/heretic/Makefile
-src/hexen-res.rc
-src/Hexen.metainfo.xml
-src/Hexen.desktop
-src/hexen/Makefile
src/setup-res.rc
src/setup/Makefile
src/setup/Setup.desktop
src/setup/setup-manifest.xml
-src/strife-res.rc
-src/Strife.metainfo.xml
-src/Strife.desktop
-src/strife/Makefile
textscreen/Makefile
textscreen/examples/Makefile
textscreen/fonts/Makefile
--- data/Makefile.am
+++ data/Makefile.am
@@ -3,37 +3,19 @@ EXTRA_DIST= \
README \
doom.ico \
doom.png \
- heretic.ico \
- heretic.png \
- hexen.ico \
- hexen.png \
setup.ico \
setup.png \
- strife.ico \
- strife.png \
wadfile.png \
convert-icon
iconsdir = $(prefix)/share/icons/hicolor/128x128/apps
icons_DATA = @PROGRAM_PREFIX@doom.png \
- @PROGRAM_PREFIX@heretic.png \
- @PROGRAM_PREFIX@hexen.png \
- @PROGRAM_PREFIX@setup.png \
- @PROGRAM_PREFIX@strife.png
+ @PROGRAM_PREFIX@setup.png
@PROGRAM_PREFIX@doom.png : doom.png
cp $(top_srcdir)/data/doom.png $@
-@PROGRAM_PREFIX@heretic.png : heretic.png
- cp $(top_srcdir)/data/heretic.png $@
-
-@PROGRAM_PREFIX@hexen.png : hexen.png
- cp $(top_srcdir)/data/hexen.png $@
-
@PROGRAM_PREFIX@setup.png : setup.png
cp $(top_srcdir)/data/setup.png $@
-
-@PROGRAM_PREFIX@strife.png : strife.png
- cp $(top_srcdir)/data/strife.png $@
CLEANFILES = $(icons_DATA)
--- Makefile.am
+++ Makefile.am
@@ -35,15 +35,6 @@ EXTRA_DIST=
doomdocsdir = ${docdir}/../${PROGRAM_PREFIX}doom
doomdocs_DATA = $(DOC_FILES) NOT-BUGS.md
-#hereticdocsdir = ${docdir}/../${PROGRAM_PREFIX}heretic
-#hereticdocs_DATA = $(DOC_FILES)
-
-#hexendocsdir = ${docdir}/../${PROGRAM_PREFIX}hexen
-#hexendocs_DATA = $(DOC_FILES)
-
-#strifedocsdir = ${docdir}/../${PROGRAM_PREFIX}strife
-#strifedocs_DATA = $(DOC_FILES) README.Strife.md
-
MAINTAINERCLEANFILES = $(AUX_DIST_GEN)
SUBDIRS=textscreen opl pcsound data src man
@@ -53,7 +44,7 @@ DIST_SUBDIRS=pkg $(SUBDIRS)
if HAVE_DOC
INSTALL : man/INSTALL.template man/simplecpp
- $(srcdir)/man/simplecpp -DDOOM -DHERETIC -DHEXEN -DSTRIFE \
+ $(srcdir)/man/simplecpp -DDOOM \
-DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Doom" \
-DLONG_EXE_NAME="@PROGRAM_PREFIX@doom" \
< $(srcdir)/man/INSTALL.template > $@
--- man/bash-completion/Makefile.am
+++ man/bash-completion/Makefile.am
@@ -1,18 +1,12 @@
bashcompletiondir=@datadir@/bash-completion/completions
BASH_COMPLETION_TEMPLATES = \
- doom.template \
- heretic.template \
- hexen.template \
- strife.template
+ doom.template
if HAVE_BASH_COMPLETION
BASH_COMPLETION_SCRIPTLETS = \
- @PROGRAM_PREFIX@doom \
- @PROGRAM_PREFIX@heretic \
- @PROGRAM_PREFIX@hexen \
- @PROGRAM_PREFIX@strife
+ @PROGRAM_PREFIX@doom
bashcompletion_DATA = $(BASH_COMPLETION_SCRIPTLETS)
CLEANFILES = $(BASH_COMPLETION_SCRIPTLETS)
@@ -24,21 +18,6 @@ DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFI
$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-g doom -b doom.template \
$(top_srcdir)/src $(top_srcdir)/src/doom > $@
-
-@PROGRAM_PREFIX@heretic: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
- $(DOCGEN) $(DOCGEN_COMMON_ARGS) \
- -g heretic -b heretic.template \
- $(top_srcdir)/src $(top_srcdir)/src/heretic > $@
-
-@PROGRAM_PREFIX@hexen: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
- $(DOCGEN) $(DOCGEN_COMMON_ARGS) \
- -g hexen -b hexen.template \
- $(top_srcdir)/src $(top_srcdir)/src/hexen > $@
-
-@PROGRAM_PREFIX@strife: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
- $(DOCGEN) $(DOCGEN_COMMON_ARGS) \
- -g strife -b strife.template \
- $(top_srcdir)/src $(top_srcdir)/src/strife > $@
EXTRA_DIST = \
$(BASH_COMPLETION_TEMPLATES) \
--- man/Makefile.am
+++ man/Makefile.am
@@ -3,9 +3,6 @@ SUBDIRS = bash-completion
MANPAGE_GEN_FILES = environ.man \
iwad_paths.man \
doom.template \
- heretic.template \
- hexen.template \
- strife.template \
docgen \
default.cfg.template \
extra.cfg.template \
@@ -13,51 +10,32 @@ MANPAGE_GEN_FILES = environ.man
setup.template
doomdocsdir = ${docdir}/../${PROGRAM_PREFIX}doom
-hereticdocsdir = ${docdir}/../${PROGRAM_PREFIX}heretic
-hexendocsdir = ${docdir}/../${PROGRAM_PREFIX}hexen
-strifedocsdir = ${docdir}/../${PROGRAM_PREFIX}strife
if HAVE_DOC
GENERATED_MAN_PAGES = \
@PROGRAM_PREFIX@doom.6 \
@PROGRAM_PREFIX@doom.cfg.5 \
- @PROGRAM_PREFIX@heretic.6 \
- @PROGRAM_PREFIX@heretic.cfg.5 \
- @PROGRAM_PREFIX@hexen.6 \
- @PROGRAM_PREFIX@hexen.cfg.5 \
- @PROGRAM_PREFIX@strife.6 \
- @PROGRAM_PREFIX@strife.cfg.5 \
@PROGRAM_PREFIX@server.6
SETUP_MAN_PAGES = \
- @PROGRAM_PREFIX@doom-setup.6 \
- @PROGRAM_PREFIX@heretic-setup.6 \
- @PROGRAM_PREFIX@hexen-setup.6 \
- @PROGRAM_PREFIX@strife-setup.6
+ @PROGRAM_PREFIX@doom-setup.6
man_MANS = $(GENERATED_MAN_PAGES) \
$(SETUP_MAN_PAGES)
doomdocs_DATA = INSTALL.doom CMDLINE.doom
-hereticdocs_DATA = INSTALL.heretic CMDLINE.heretic
-hexendocs_DATA = INSTALL.hexen CMDLINE.hexen
-strifedocs_DATA = INSTALL.strife CMDLINE.strife
if HAVE_WINDRES
WIN32=-D_WIN32
doomdocs_DATA += CMDLINE.doom.md
-hereticdocs_DATA += CMDLINE.heretic.md
-hexendocs_DATA += CMDLINE.hexen.md
-strifedocs_DATA += CMDLINE.strife.md
endif
CLEANFILES = $(GENERATED_MAN_PAGES) $(SETUP_MAN_PAGES) \
- $(doomdocs_DATA) $(hereticdocs_DATA) \
- $(hexendocs_DATA) $(strifedocs_DATA)
+ $(doomdocs_DATA)
DOCGEN = $(srcdir)/docgen
DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" -s "@PACKAGE_NAME@" -z "@PACKAGE_SHORTNAME@"
@@ -96,73 +74,6 @@ INSTALL.doom: INSTALL.template
-DLONG_EXE_NAME="@PROGRAM_PREFIX@doom" \
-DPRECOMPILED < $(srcdir)/INSTALL.template > $@
-@PROGRAM_PREFIX@heretic.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES) heretic.template
- $(DOCGEN) $(DOCGEN_COMMON_ARGS) \
- -g heretic -m $(srcdir)/heretic.template \
- $(top_srcdir)/src $(top_srcdir)/src/heretic > $@
-
-heretic.cfg.5: $(top_srcdir)/src $(srcdir)/default.cfg.template
- $(DOCGEN) $(DOCGEN_COMMON_ARGS) \
- -g heretic -m $(srcdir)/default.cfg.template \
- -c default $(top_srcdir)/src/m_config.c > $@
-
-@PROGRAM_PREFIX@heretic.cfg.5: $(top_srcdir)/src extra.cfg.template
- $(DOCGEN) $(DOCGEN_COMMON_ARGS) \
- -g heretic -m $(srcdir)/extra.cfg.template \
- -c extended $(top_srcdir)/src/m_config.c > $@
-
-CMDLINE.heretic : CMDLINE.template $(top_srcdir)/src $(top_srcdir)/src/heretic
- $(DOCGEN) $(DOCGEN_COMMON_ARGS) \
- -p $(srcdir)/CMDLINE.template \
- $(top_srcdir)/src/ $(top_srcdir)/src/heretic/ > $@
-
-CMDLINE.heretic.md : CMDLINE.template.md $(top_srcdir)/src $(top_srcdir)/src/heretic
- $(DOCGEN) $(DOCGEN_COMMON_ARGS) \
- -M $(srcdir)/CMDLINE.template.md \
- $(top_srcdir)/src/ $(top_srcdir)/src/heretic/ > $@
-
-INSTALL.heretic: INSTALL.template
- $(srcdir)/simplecpp -DHERETIC $(WIN32) \
- -DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Heretic" \
- -DLONG_EXE_NAME="@PROGRAM_PREFIX@heretic" \
- -DPRECOMPILED < $(srcdir)/INSTALL.template > $@
-
-
-@PROGRAM_PREFIX@hexen.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES)
- $(DOCGEN) $(DOCGEN_COMMON_ARGS) \
- -g hexen -m $(srcdir)/hexen.template \
- $(top_srcdir)/src $(top_srcdir)/src/hexen > $@
-
-hexen.cfg.5: $(top_srcdir)/src default.cfg.template
- $(DOCGEN) $(DOCGEN_COMMON_ARGS) \
- -g hexen -m $(srcdir)/default.cfg.template \
- -c default $(top_srcdir)/src/m_config.c > $@
-
-@PROGRAM_PREFIX@hexen.cfg.5: $(top_srcdir)/src extra.cfg.template
- $(DOCGEN) $(DOCGEN_COMMON_ARGS) \
- -g hexen -m $(srcdir)/extra.cfg.template \
- -c extended $(top_srcdir)/src/m_config.c > $@
-
-CMDLINE.hexen : CMDLINE.template $(top_srcdir)/src $(top_srcdir)/src/hexen
- $(DOCGEN) $(DOCGEN_COMMON_ARGS) \
- -p $(srcdir)/CMDLINE.template \
- $(top_srcdir)/src/ $(top_srcdir)/src/hexen/ > $@
-
-CMDLINE.hexen.md : CMDLINE.template.md $(top_srcdir)/src $(top_srcdir)/src/hexen
- $(DOCGEN) $(DOCGEN_COMMON_ARGS) \
- -M $(srcdir)/CMDLINE.template.md \
- $(top_srcdir)/src/ $(top_srcdir)/src/hexen/ > $@
-
-INSTALL.hexen: INSTALL.template
- $(srcdir)/simplecpp -DHEXEN $(WIN32) \
- -DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Hexen" \
- -DLONG_EXE_NAME="@PROGRAM_PREFIX@hexen" \
- -DPRECOMPILED < $(srcdir)/INSTALL.template > $@
-
-@PROGRAM_PREFIX@strife.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES)
- $(DOCGEN) $(DOCGEN_COMMON_ARGS) \
- -g strife -m $(srcdir)/strife.template \
- $(top_srcdir)/src $(top_srcdir)/src/strife > $@
@PROGRAM_PREFIX@server.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES)
$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
@@ -175,35 +86,9 @@ $(SETUP_MAN_PAGES): $(top_srcdir)/src $(
-m $(srcdir)/setup.template \
$(top_srcdir)/src > $@
-strife.cfg.5: $(top_srcdir)/src default.cfg.template
- $(DOCGEN) $(DOCGEN_COMMON_ARGS) \
- -g strife -m $(srcdir)/default.cfg.template \
- -c default $(top_srcdir)/src/m_config.c > $@
-
-@PROGRAM_PREFIX@strife.cfg.5: $(top_srcdir)/src extra.cfg.template
- $(DOCGEN) $(DOCGEN_COMMON_ARGS) \
- -g strife -m $(srcdir)/extra.cfg.template \
- -c extended $(top_srcdir)/src/m_config.c > $@
-
-CMDLINE.strife : CMDLINE.template $(top_srcdir)/src $(top_srcdir)/src/strife
- $(DOCGEN) $(DOCGEN_COMMON_ARGS) \
- -p $(srcdir)/CMDLINE.template \
- $(top_srcdir)/src/ $(top_srcdir)/src/strife/ > $@
-
-CMDLINE.strife.md : CMDLINE.template.md $(top_srcdir)/src $(top_srcdir)/src/strife
- $(DOCGEN) $(DOCGEN_COMMON_ARGS) \
- -M $(srcdir)/CMDLINE.template.md \
- $(top_srcdir)/src/ $(top_srcdir)/src/strife/ > $@
-
-INSTALL.strife: INSTALL.template
- $(srcdir)/simplecpp -DSTRIFE $(WIN32) \
- -DLONG_EXE_NAME="@PROGRAM_PREFIX@strife" \
- -DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Strife" \
- -DPRECOMPILED < $(srcdir)/INSTALL.template > $@
-
INSTALL: INSTALL.template
- $(srcdir)//simplecpp -DDOOM -DHERETIC -DHEXEN -DSTRIFE \
+ $(srcdir)//simplecpp -DDOOM \
-DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Doom" \
-DLONG_EXE_NAME="@PROGRAM_PREFIX@doom" \
-DPRECOMPILED < $(srcdir)/INSTALL.template > $@
--- pkg/osx/Info.plist.in
+++ pkg/osx/Info.plist.in
@@ -31,7 +31,7 @@
NSMainNibFile
launcher
NSHumanReadableCopyright
- Copyright (C) 1993-2015, id Software and Raven Software, Simon Howard, James Haley, Samuel Villarreal and other contributors.
+ Copyright (C) 1993-2024, id Software and Raven Software, Simon Howard, James Haley, Samuel Villarreal and other contributors.
Licensed under the GNU GPL v2.
@@ -73,30 +73,6 @@ Licensed under the GNU GPL v2.
CFBundleTypeExtensions
deh
-
-
-
- CFBundleTypeName
- Heretic HHE patch
- CFBundleTypeIconFile
- wadfile.icns
- CFBundleTypeRole
- Viewer
- CFBundleTypeExtensions
-
- hhe
-
-
-
- CFBundleTypeName
- Strife Sehacked patch
- CFBundleTypeIconFile
- wadfile.icns
- CFBundleTypeRole
- Viewer
- CFBundleTypeExtensions
-
- seh
--- src/CMakeLists.txt
+++ src/CMakeLists.txt
@@ -1,4 +1,4 @@
-foreach(SUBDIR doom heretic hexen strife setup)
+foreach(SUBDIR doom setup)
add_subdirectory("${SUBDIR}")
endforeach()
@@ -160,48 +160,6 @@ target_link_libraries("${PROGRAM_PREFIX}
if(MSVC)
set_target_properties("${PROGRAM_PREFIX}doom" PROPERTIES
- LINK_FLAGS "/MANIFEST:NO")
-endif()
-
-if(WIN32)
- add_executable("${PROGRAM_PREFIX}heretic" WIN32 ${SOURCE_FILES_WITH_DEH} "${CMAKE_CURRENT_BINARY_DIR}/heretic-res.rc")
-else()
- add_executable("${PROGRAM_PREFIX}heretic" ${SOURCE_FILES_WITH_DEH})
-endif()
-
-target_include_directories("${PROGRAM_PREFIX}heretic" PRIVATE ${GAME_INCLUDE_DIRS})
-target_link_libraries("${PROGRAM_PREFIX}heretic" heretic ${EXTRA_LIBS})
-
-if(MSVC)
- set_target_properties("${PROGRAM_PREFIX}heretic" PROPERTIES
- LINK_FLAGS "/MANIFEST:NO")
-endif()
-
-if(WIN32)
- add_executable("${PROGRAM_PREFIX}hexen" WIN32 ${SOURCE_FILES} "${CMAKE_CURRENT_BINARY_DIR}/hexen-res.rc")
-else()
- add_executable("${PROGRAM_PREFIX}hexen" ${SOURCE_FILES})
-endif()
-
-target_include_directories("${PROGRAM_PREFIX}hexen" PRIVATE ${GAME_INCLUDE_DIRS})
-target_link_libraries("${PROGRAM_PREFIX}hexen" hexen ${EXTRA_LIBS})
-
-if(MSVC)
- set_target_properties("${PROGRAM_PREFIX}hexen" PROPERTIES
- LINK_FLAGS "/MANIFEST:NO")
-endif()
-
-if(WIN32)
- add_executable("${PROGRAM_PREFIX}strife" WIN32 ${SOURCE_FILES_WITH_DEH} "${CMAKE_CURRENT_BINARY_DIR}/strife-res.rc")
-else()
- add_executable("${PROGRAM_PREFIX}strife" ${SOURCE_FILES_WITH_DEH})
-endif()
-
-target_include_directories("${PROGRAM_PREFIX}strife" PRIVATE ${GAME_INCLUDE_DIRS})
-target_link_libraries("${PROGRAM_PREFIX}strife" strife ${EXTRA_LIBS})
-
-if(MSVC)
- set_target_properties("${PROGRAM_PREFIX}strife" PROPERTIES
LINK_FLAGS "/MANIFEST:NO")
endif()
--- src/Makefile.am
+++ src/Makefile.am
@@ -1,20 +1,14 @@
-SUBDIRS = doom heretic hexen strife setup
+SUBDIRS = doom setup
execgamesdir = ${bindir}
execgames_PROGRAMS = @PROGRAM_PREFIX@doom \
- @PROGRAM_PREFIX@heretic \
- @PROGRAM_PREFIX@hexen \
- @PROGRAM_PREFIX@strife \
@PROGRAM_PREFIX@server
noinst_PROGRAMS = @PROGRAM_PREFIX@setup
-SETUP_BINARIES = @PROGRAM_PREFIX@doom-setup$(EXEEXT) \
- @PROGRAM_PREFIX@heretic-setup$(EXEEXT) \
- @PROGRAM_PREFIX@hexen-setup$(EXEEXT) \
- @PROGRAM_PREFIX@strife-setup$(EXEEXT)
+SETUP_BINARIES = @PROGRAM_PREFIX@doom-setup$(EXEEXT)
execgames_SCRIPTS = $(SETUP_BINARIES)
@@ -164,30 +158,6 @@ endif
@PROGRAM_PREFIX@doom_LDADD = doom/libdoom.a $(EXTRA_LIBS)
-if HAVE_WINDRES
-@PROGRAM_PREFIX@heretic_SOURCES=$(SOURCE_FILES_WITH_DEH) heretic-res.rc
-else
-@PROGRAM_PREFIX@heretic_SOURCES=$(SOURCE_FILES_WITH_DEH)
-endif
-
-@PROGRAM_PREFIX@heretic_LDADD = heretic/libheretic.a $(EXTRA_LIBS)
-
-if HAVE_WINDRES
-@PROGRAM_PREFIX@hexen_SOURCES=$(SOURCE_FILES) hexen-res.rc
-else
-@PROGRAM_PREFIX@hexen_SOURCES=$(SOURCE_FILES)
-endif
-
-@PROGRAM_PREFIX@hexen_LDADD = hexen/libhexen.a $(EXTRA_LIBS)
-
-if HAVE_WINDRES
-@PROGRAM_PREFIX@strife_SOURCES=$(SOURCE_FILES_WITH_DEH) strife-res.rc
-else
-@PROGRAM_PREFIX@strife_SOURCES=$(SOURCE_FILES_WITH_DEH)
-endif
-
-@PROGRAM_PREFIX@strife_LDADD = strife/libstrife.a $(EXTRA_LIBS)
-
$(SETUP_BINARIES): @PROGRAM_PREFIX@setup$(EXEEXT)
cp @PROGRAM_PREFIX@setup$(EXEEXT) $@
@@ -196,15 +166,6 @@ $(SETUP_BINARIES): @PROGRAM_PREFIX@setup
doom/libdoom.a:
$(MAKE) -C doom
-heretic/libheretic.a:
- $(MAKE) -C heretic
-
-hexen/libhexen.a:
- $(MAKE) -C hexen
-
-strife/libstrife.a:
- $(MAKE) -C strife
-
# Source files needed for chocolate-setup:
SETUP_FILES= \
@@ -238,41 +199,17 @@ EXTRA_DIST = \
metainfodir = $(prefix)/share/metainfo
metainfo_DATA = \
- @PACKAGE_RDNS@.Doom.metainfo.xml \
- @PACKAGE_RDNS@.Heretic.metainfo.xml \
- @PACKAGE_RDNS@.Hexen.metainfo.xml \
- @PACKAGE_RDNS@.Strife.metainfo.xml
+ @PACKAGE_RDNS@.Doom.metainfo.xml
@PACKAGE_RDNS@.Doom.metainfo.xml : Doom.metainfo.xml
cp Doom.metainfo.xml $@
-@PACKAGE_RDNS@.Heretic.metainfo.xml : Heretic.metainfo.xml
- cp Heretic.metainfo.xml $@
-
-@PACKAGE_RDNS@.Hexen.metainfo.xml : Hexen.metainfo.xml
- cp Hexen.metainfo.xml $@
-
-@PACKAGE_RDNS@.Strife.metainfo.xml : Strife.metainfo.xml
- cp Strife.metainfo.xml $@
-
appdir = $(prefix)/share/applications
app_DATA = \
- @PACKAGE_RDNS@.Doom.desktop \
- @PACKAGE_RDNS@.Heretic.desktop \
- @PACKAGE_RDNS@.Hexen.desktop \
- @PACKAGE_RDNS@.Strife.desktop
+ @PACKAGE_RDNS@.Doom.desktop
@PACKAGE_RDNS@.Doom.desktop : Doom.desktop
cp Doom.desktop $@
-
-@PACKAGE_RDNS@.Heretic.desktop : Heretic.desktop
- cp Heretic.desktop $@
-
-@PACKAGE_RDNS@.Hexen.desktop : Hexen.desktop
- cp Hexen.desktop $@
-
-@PACKAGE_RDNS@.Strife.desktop : Strife.desktop
- cp Strife.desktop $@
screensaverdir = $(prefix)/share/applications/screensavers
screensaver_DATA = @PACKAGE_RDNS@.Doom_Screensaver.desktop
--- src/setup/Setup.desktop.in
+++ src/setup/Setup.desktop.in
@@ -5,4 +5,4 @@ Icon=@PROGRAM_PREFIX@setup
Type=Application
Comment=Setup tool for @PACKAGE_SHORTNAME@
Categories=Settings;
-Keywords=first;person;shooter;doom;heretic;hexen;strife;vanilla;
+Keywords=first;person;shooter;doom;vanilla;