From 8c01d59551b052a42f21225e64b0228f0f84e814 Mon Sep 17 00:00:00 2001 From: Mike Swanson Date: Wed, 13 Jun 2018 10:45:01 -0700 Subject: [PATCH] Remove the codeblocks project With both autotools and cmake build systems in the repository, we can accommodate pretty much every IDE there is without needing hand-crafted files for each one. Closes: #1057 --- Makefile.am | 17 -- NEWS.md | 6 +- codeblocks/README | 4 - codeblocks/chocolate.workspace | 32 -- codeblocks/config.h | 32 -- codeblocks/doom.cbp | 521 -------------------------------- codeblocks/game-res.rc | 26 -- codeblocks/heretic.cbp | 455 ---------------------------- codeblocks/hexen.cbp | 451 ---------------------------- codeblocks/libopl.cbp | 83 ------ codeblocks/libpcsound.cbp | 64 ---- codeblocks/libtextscreen.cbp | 137 --------- codeblocks/server.cbp | 113 ------- codeblocks/setup-res.rc | 26 -- codeblocks/setup.cbp | 196 ------------ codeblocks/strife.cbp | 523 --------------------------------- 16 files changed, 3 insertions(+), 2683 deletions(-) delete mode 100644 codeblocks/README delete mode 100644 codeblocks/chocolate.workspace delete mode 100644 codeblocks/config.h delete mode 100644 codeblocks/doom.cbp delete mode 100644 codeblocks/game-res.rc delete mode 100644 codeblocks/heretic.cbp delete mode 100644 codeblocks/hexen.cbp delete mode 100644 codeblocks/libopl.cbp delete mode 100644 codeblocks/libpcsound.cbp delete mode 100644 codeblocks/libtextscreen.cbp delete mode 100644 codeblocks/server.cbp delete mode 100644 codeblocks/setup-res.rc delete mode 100644 codeblocks/setup.cbp delete mode 100644 codeblocks/strife.cbp diff --git a/Makefile.am b/Makefile.am index d18e76bd..1bd91a43 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,22 +11,6 @@ CMAKE_FILES= \ cmake/Findsamplerate.cmake \ cmake/config.h.cin -CODEBLOCKS_FILES= \ - codeblocks/chocolate.workspace \ - codeblocks/config.h \ - codeblocks/doom.cbp \ - codeblocks/game-res.rc \ - codeblocks/heretic.cbp \ - codeblocks/hexen.cbp \ - codeblocks/strife.cbp \ - codeblocks/libopl.cbp \ - codeblocks/libpcsound.cbp \ - codeblocks/libtextscreen.cbp \ - codeblocks/README \ - codeblocks/server.cbp \ - codeblocks/setup.cbp \ - codeblocks/setup-res.rc - DOC_FILES= \ COPYING.md \ README.md \ @@ -38,7 +22,6 @@ DOC_FILES= \ EXTRA_DIST= \ $(AUX_DIST_GEN) \ $(CMAKE_FILES) \ - $(CODEBLOCKS_FILES) \ $(DOC_FILES) \ NOT-BUGS.md \ README.Strife.md \ diff --git a/NEWS.md b/NEWS.md index 6d141065..46cb13c6 100644 --- a/NEWS.md +++ b/NEWS.md @@ -18,9 +18,9 @@ ### Build systems * CMake has been added along with the deprecation of Microsoft - Visual Studio files. CMake maintains support for multiple - versions of Visual Studio as well as additional IDEs, and reduces - developer overhead when updating Chocolate Doom. (thanks AlexMax) + Visual Studio and Code::Blocks files. CMake maintains support for + multiple IDEs and versions thereof, and reduces developer overhead + when updating Chocolate Doom. (thanks AlexMax) ### Doom * Map33 intermission screen and map33-map35 automap names are diff --git a/codeblocks/README b/codeblocks/README deleted file mode 100644 index 139cef91..00000000 --- a/codeblocks/README +++ /dev/null @@ -1,4 +0,0 @@ - -This is a set of codeblocks project files for building chocolate doom -under Windows. Thanks to Russell Rice for these :-) - diff --git a/codeblocks/chocolate.workspace b/codeblocks/chocolate.workspace deleted file mode 100644 index ed611b7b..00000000 --- a/codeblocks/chocolate.workspace +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/codeblocks/config.h b/codeblocks/config.h deleted file mode 100644 index 1ad323dc..00000000 --- a/codeblocks/config.h +++ /dev/null @@ -1,32 +0,0 @@ - -/* Name of package */ -#define PACKAGE "chocolate-doom" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "fraggle@gmail.com" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "Chocolate Doom" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Chocolate Doom 3.0.0" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "chocolate-doom" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "3.0.0" - -/* Change this when you create your awesome forked version */ -#define PROGRAM_PREFIX "chocolate-" - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Version number of package */ -#define VERSION "3.0.0" - -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -/* #undef WORDS_BIGENDIAN */ - diff --git a/codeblocks/doom.cbp b/codeblocks/doom.cbp deleted file mode 100644 index a74296d4..00000000 --- a/codeblocks/doom.cbp +++ /dev/null @@ -1,521 +0,0 @@ - - - - - - diff --git a/codeblocks/game-res.rc b/codeblocks/game-res.rc deleted file mode 100644 index c0438774..00000000 --- a/codeblocks/game-res.rc +++ /dev/null @@ -1,26 +0,0 @@ -1 ICON "../data/doom.ico" - -1 VERSIONINFO -PRODUCTVERSION 3,0,0,0 -FILEVERSION 3,0,0,0 -FILETYPE 1 -{ - BLOCK "StringFileInfo" - { - BLOCK "040904E4" - { - VALUE "FileVersion", "3.0.0" - VALUE "FileDescription", "3.0.0" - VALUE "InternalName", "Chocolate Doom" - VALUE "CompanyName", "Chocolate Doom" - VALUE "LegalCopyright", "GNU General Public License" - VALUE "ProductName", "Chocolate Doom" - VALUE "ProductVersion", "3.0.0" - } - } - BLOCK "VarFileInfo" - { - VALUE "Translation", 0x409, 1252 - } -} - diff --git a/codeblocks/heretic.cbp b/codeblocks/heretic.cbp deleted file mode 100644 index e4165c56..00000000 --- a/codeblocks/heretic.cbp +++ /dev/null @@ -1,455 +0,0 @@ - - - - - - diff --git a/codeblocks/hexen.cbp b/codeblocks/hexen.cbp deleted file mode 100644 index dd3a7199..00000000 --- a/codeblocks/hexen.cbp +++ /dev/null @@ -1,451 +0,0 @@ - - - - - - diff --git a/codeblocks/libopl.cbp b/codeblocks/libopl.cbp deleted file mode 100644 index f1e51c31..00000000 --- a/codeblocks/libopl.cbp +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - diff --git a/codeblocks/libpcsound.cbp b/codeblocks/libpcsound.cbp deleted file mode 100644 index 81af4984..00000000 --- a/codeblocks/libpcsound.cbp +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - diff --git a/codeblocks/libtextscreen.cbp b/codeblocks/libtextscreen.cbp deleted file mode 100644 index d84de061..00000000 --- a/codeblocks/libtextscreen.cbp +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - diff --git a/codeblocks/server.cbp b/codeblocks/server.cbp deleted file mode 100644 index 98bf2a62..00000000 --- a/codeblocks/server.cbp +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - diff --git a/codeblocks/setup-res.rc b/codeblocks/setup-res.rc deleted file mode 100644 index 077f244e..00000000 --- a/codeblocks/setup-res.rc +++ /dev/null @@ -1,26 +0,0 @@ -1 ICON "../data/setup.ico" - -1 VERSIONINFO -PRODUCTVERSION 3,0,0,0 -FILEVERSION 3,0,0,0 -FILETYPE 1 -{ - BLOCK "StringFileInfo" - { - BLOCK "040904E4" - { - VALUE "FileVersion", "3.0.0" - VALUE "FileDescription", "Chocolate Doom Setup" - VALUE "InternalName", "chocolate-setup" - VALUE "CompanyName", "Chocolate Doom" - VALUE "LegalCopyright", "GNU General Public License" - VALUE "ProductName", "Chocolate Doom Setup" - VALUE "ProductVersion", "3.0.0" - } - } - BLOCK "VarFileInfo" - { - VALUE "Translation", 0x409, 1252 - } -} - diff --git a/codeblocks/setup.cbp b/codeblocks/setup.cbp deleted file mode 100644 index 50aa17fb..00000000 --- a/codeblocks/setup.cbp +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - diff --git a/codeblocks/strife.cbp b/codeblocks/strife.cbp deleted file mode 100644 index 8a38eedf..00000000 --- a/codeblocks/strife.cbp +++ /dev/null @@ -1,523 +0,0 @@ - - - - - -