Commit graph

63 commits

Author SHA1 Message Date
Fabian Greffrath
6e3418c6a5 configure: relax libpng version check to >= 1.2.50
Since this version is provided by Ubuntu trusty, we will get
Travis.CI builds with PNG support.
2019-01-23 12:38:57 +01:00
Simon Howard
419776fc72 Add system-specific globbing API.
Part of #1051.
2018-10-27 17:50:14 -04:00
Simon Howard
560cdc3e45 configure: add AM_PROG_AR macro.
Some platforms (eg. Emscripten) have their own version of the ar tool,
so it is important to pick one that matches the target architecture.
Without this macro we always use the default system-installed version
of ar.
2018-09-30 23:34:52 -04:00
Julia Nechaevskaya
774256d67c Update copyright year to 2018 2018-05-30 23:14:00 +03:00
Turo Lamminen
edd74056ba configure.ac: Add configure option to treat warnings as errors 2018-01-27 16:46:04 +02:00
Mike Swanson
3582793055 Update AppStream XML files to current (0.11) standards
<id> tag is changed to a Reverse-DNS form, and an accommodating
PACKAGE_RDNS is set in configure.ac to use it.

<name> and <summary> tags have been added, using existing autoconf
variable values.

The `appstream-util validate` command will complain about some
optionally-missing tags and a strict string length limit on some of
the <caption> tags.  `validate-relax` passes, and by the letter of the
AppStream specification, we should be completely valid.
2018-01-22 20:41:16 -08:00
Simon Howard
8777b99cf7 Update NEWS, bump version to 3.0.0. 2017-12-30 22:15:53 +01:00
Fabian Greffrath
62c8b62c5e config: only define str[n]casecmp if necessary
Recent versions of MinGW-W64 already have these symbols defined and
throw a warning if we attempt to re-define them.
2017-10-09 10:36:48 +02:00
Jonathan Dowland
83a7dfb9af Merge branch 'sdl2-branch' into chocolate-midivolume 2017-07-17 13:30:03 +01:00
Fabian Greffrath
a28f58da05 Merge branch 'master' into sdl2-branch 2017-04-24 14:46:31 +02:00
Mike Swanson
bc87379f59 configure.ac: Use echo|tr to change PROGRAM_PREFIX case
The ${VAR,} syntax seems to be new to Bash 4, and thus not portable
to older versions or other shells.
2017-03-17 11:22:06 -07:00
Mike Swanson
7f4e1ae124 bash-completion: Use autoconf substitutions for the chocolate name
Introduce a new PROGRAM_SPREFIX variable in configure.ac, which is
basically identical to PROGRAM_PREFIX but without the trailing hyphen.
PROGRAM_PREFIX was also redefined so that it bases its name from
PACKAGE_SHORTNAME, reducing the number of hardcoded chocolates in the
source.
2017-03-05 18:43:22 -08:00
Mike Swanson
9f9d647297 Add midiproc to the automake system. 2017-02-22 22:49:57 -08:00
Simon Howard
f1ffac8026 Bump version to 3.0.0-beta1. 2017-02-03 20:12:09 -05:00
Simon Howard
c5af517b3b Merge remote-tracking branch 'origin/master' into sdl2-branch 2017-01-30 22:53:36 -05:00
Fabian Greffrath
e392bd160a copyright.ac: update copyright years
Some people just spot everything! ;)

Thanks @JNechaevsky for reporting this privately as issue 27 [sic!].
2017-01-26 14:53:52 +01:00
Simon Howard
7dc588ee07 win32: Auto-determine DLL path from LDFLAGS.
Copying DLLs raises the problem of finding where the DLLs are to copy.
With autotools, DLLs are usually installed to ${prefix}/bin alongside the
libraries installed to ${prefix}/lib. So we can use the -L arguments in
LDFLAGS passed to the linker to figure out a likely set of directories to
search in. Hook this into the build, too.

This fixes #764 - we now reliably build Windows .zip packages automatically
bundled with any DLLs which may be required.
2017-01-22 21:38:54 +00:00
Fabian Greffrath
6491da9659 Revert "Link MinGW builds with static libgcc"
This reverts commit fc9ba5db9b.

This is better handled elsewhere:
https://github.com/chocolate-doom/chocpkg/issues/10
2017-01-04 21:06:55 +01:00
Fabian Greffrath
fc9ba5db9b Link MinGW builds with static libgcc
Fixes #833
2017-01-03 16:25:50 +01:00
Simon Howard
6f48bab893 Merge remote-tracking branch 'origin/master' into sdl2-branch 2017-01-02 14:42:49 +01:00
Simon Howard
939cbfeb11 Bump version number to 2.3.0, update NEWS. 2016-12-29 17:54:42 +01:00
Simon Howard
2c55acf403 Change email address for feedback to dev list.
This address is intended for bug reports. It's better if this is sent
to the dev team's mailing list rather than to me directly.
2016-11-24 19:27:12 -05:00
Fabian Greffrath
5974dfc9ce Merge branch 'master' into sdl2-branch 2016-09-17 13:12:26 +02:00
Jonathan Dowland
335519949a I don't think we need this anymore 2016-07-22 09:25:04 +01:00
Jonathan Dowland
7215d13b6c Revert using SDL_Image for PNG screenshots
This reverts commits 901ee2fe75 and
07afb7749f.

This change broke PNG screenshots on OS X and resulted in 32bit PNGs
on other platforms (large file sizes). The former might be a SDL_Image
bug, the latter definitely is.

Fixes #752
2016-07-14 23:57:28 +01:00
Jonathan Dowland
ca0e7776d0 Remove some autoconf foo for GL
I accidentally left this in the last merge; no longer needed since
we're using SDL_GL_GetProcAddress.
2016-07-14 18:47:56 +01:00
Jonathan Dowland
13704286f0 use SDL_GL_GetProcAddress to avoid GL dependency
Using SDL_GL_GetProcAddress we can get a function pointer to the
GL routine we want at runtime, if it's available, and avoid a
static dependency on GL libraries.

Thanks to fraggle for the suggestion and Mike for fixing Linux
builds (alas PKG_CHECK_MODULES for GL broke OS X builds)
2016-07-14 17:09:22 +01:00
Mike Swanson
de098378c0 Add autoconf check for GL and link the engines to it. 2016-07-13 15:53:30 -07:00
Jonathan Dowland
e82b4c186c Add CheckGLVersion to warn about software GL
Performance with a software GL implementation is not great. Check
the GL_VERSION string and warn about possible performance problems
if we find "Mesa", suggesting hardware acceleration is not
available.

Additional LDFLAGS are needed for OS X when using SDL_opengl.h,
adjust configure.ac accordingly.

Fixes #741.
2016-07-13 17:06:57 +01:00
Simon Howard
2bd688e2a6 osx: Remove GNUstep stuff.
This has never been officially supported and probably doesn't work
properly with the current .nib file. Let's just get rid of it.
2016-06-12 19:33:13 -04:00
Simon Howard
06f1f8bc7c configure: Bump to temporary version number.
This will be v3.0 eventually but not yet.
2016-06-11 17:38:27 -04:00
Simon Howard
d36dafa3fc Merge remote-tracking branch 'origin/master' into sdl2-branch 2016-06-04 19:36:32 -04:00
Fabian Greffrath
07afb7749f video: depend on SDL_Image for taking PNG screenshots
Remove any libpbg-specific code, let SDL_Image handle this for us.

For now, this uses a slow software-scaling routine for up-scaling the
original 320x200 RGBA buffer up to the desired 1600x1200 dimensions.
In the future, we might want to fall back to using the
hardware-accelerated texture-based approach of the main rendering
stack (though this may seem like an overkill here).

However, it might be easier to take screenshots in the actual screen
dimensions with this approach (though I somehow remember that we
decided on 1600x1200 being the ideal solution that we should stay
with?).
2016-05-02 22:42:26 +02:00
Simon Howard
5ad3fa6c5e textscreen: Move fonts into PNG files.
The fonts were previously in header files which were very difficult to
modify. Move these into PNG files which can be easily edited, and
convert them into header files automatically as part of the build
process, like we do with the application icons.
2016-03-06 02:19:44 -05:00
Simon Howard
2137da434e Change all chocolate-doom.org URLs to https:
The website is now available over encrypted https: and there's no
reason to direct people to unencrypted http: URLs any more.
2016-02-28 14:20:19 -05:00
Simon Howard
5d838b88a7 textscreen: Add support for OS X high-DPI rendering.
When using a Mac with a retina display, we want to use the large
textscreen font, albeit in a normal-sized window. The HIGHDPI flag is
the way to do this properly with SDL2; try to set it and if we get the
output screen size we're hoping for, switch to the large font.

As part of this, bump the SDL2 dependency to 2.0.1, since the
SDL_WINDOW_ALLOW_HIGHDPI flag was only added in this version.
2016-02-27 21:59:28 -05:00
Simon Howard
3163bf87d7 configure: Switch to pkg-config macros.
All dependency libraries install pkg-config .pc files nowadays, which
makes the process of looking them up a lot simpler. Get rid of the SDL
workaround macro as it's not needed.
2016-02-25 22:55:04 -05:00
Simon Howard
e1188317db Merge branch 'master' into sdl2-branch 2016-01-01 21:25:55 +01:00
Fabian Greffrath
2efd8ce221 autoconf: Re-direct error messages if pkg-config cannot be found
Else it will print something like

./configure: line 4426: --exists: command not found

which isn't really helpful, either.
2015-11-04 08:16:55 +01:00
Fabian Greffrath
0b0cae7206 autoconf: Call AC_CANONICAL_HOST before querying the host variable
Also, get the querying right to prevent false positives, from libvirt.
2015-11-04 07:35:18 +01:00
Mike Swanson
c3e5879502 bash-completion: Detect the appropriate directory for installation 2015-10-27 09:30:24 -07:00
Fabian Greffrath
6ce8514c98 Merge pull request #631 from chocolate-doom/completion
Bash-Completion: First attempt at programatically creating the parame…
2015-10-27 15:20:34 +01:00
Fabian Greffrath
ad37a8ff33 Bash-Completion: First attempt at programatically creating the parameters list 2015-10-26 18:44:30 +01:00
Rodrigo Rebello
61a6af25d2 configure: fix --with-PACKAGE option checks
Options of the form --with-PACKAGE[=yes] (e.g. --with-libpng), when
passed to configure, were being treated as though --without-PACKAGE had
been given.

Although the intention is to have configure check and use PACKAGE by
default if it's available, thus requiring the user to pass an option
only if PACKAGE must NOT be used, there are times when the opposite
might be desired (i.e. the user wants to indicate PACKAGE MUST be used).
Moreover, allowing --with-PACKAGE and behaving as if --without-PACKAGE
had been specified is in itself quite confusing.

Fix that by testing the result of 'with_PACKAGE' in configure.ac and
acting accordingly instead of blindly assuming a 'no'.
2015-10-26 12:55:45 -02:00
Fabian Greffrath
1b53d785ac Merge branch 'master' into sdl2-branch 2015-09-21 07:46:37 +02:00
Mike Swanson
5d6ac0a7ba Bump version number to 2.2.1 and add NEWS about it
This is not the complete news for changes since 2.2, just what will be
included for the stable release.
2015-09-10 08:37:50 -07:00
Fabian Greffrath
26524bf563 configure: Check for windres only if building for windows
This is based on a patch proposed for libvirt:
https://www.redhat.com/archives/libvir-list/2010-February/msg00863.html

Fixes #604
2015-09-03 07:44:56 +02:00
Fabian Greffrath
c01da5e230 Configure: Set minimum required SDL2 version to 2.0.2
This is what is currently in Debian now and I confirm it works. Having
to set this back and forth for is tedious and inconvenient.
2015-07-13 09:54:45 +02:00
Mike Swanson
53eea282a7 Add some preliminary *.appdata.xml files for software centers
This should resolve #406; the description text probably needs
revisement, and we still need to compose images for the screenshots
section.
2015-06-13 06:06:55 -07:00
Simon Howard
a538c179ab Bump version number to 2.2.0. 2015-06-09 22:52:39 -04:00