Commit Graph

48 Commits (objectmenu)

Author SHA1 Message Date
Günther Brammer 16ef28e05f Drop unused C4VERSIONBUILDNAME and C4ENGINEINFO
This was used to name snapshot releases of the Network2 branch, and has
seen almost no use since.

C4ENGINEINFO(LONG) was a duplicate of C4ENGINENAME and C4ENGINECAPTION.
2015-12-29 15:47:55 +01:00
Günther Brammer 30e0cdb418 CMake: Re-enable readline support for openclonk-server 2015-12-28 18:48:45 +01:00
Nicolas Hake da51a2d8af CMake: Have headless build as a project instead of a separate config
Hardly anyone ever tests the headless build, because it requires you to
run CMake a second time with -DUSE_CONSOLE=On. So now it's an included
project which you'll get whether you want it or not.

I'm well aware that this could be solved more nicely, and that we could
be splitting unchanged files out into a separate support library, but
that's left for a later date.
2015-12-16 00:50:09 +01:00
Julius Michaelis 5b9f4bf4d0 Fix cmake/FindGTK3.cmake (fix by Isilkor) 2015-10-21 21:56:02 +02:00
Nicolas Hake 5abc112a81 CMake: Split GTK3 tests into a separate module
Nobody uses pkg-config on Windows, and we already have a perfectly
viable solution for finding libraries - it's called CMake. We're still
defering to pkg-config when it exists because who knows what arcane
cflags might be required on some systems.
2015-10-19 16:11:12 +02:00
Nicolas Hake 0c1abe69f9 Get rid of FMOD
Not only is FMOD neither free (libre) nor free (gratis), the version we
support(ed) is also impossible to legally obtain anymore. So there's no
reason we should keep code around that (pretends to) support a library
nobody can use or test.
2015-10-12 17:34:26 +02:00
Julius Michaelis 6fe58fd878 Add warning about old gcc when !HAVE_WORKING_REGEX
Related to ee859d8.
2015-10-03 13:42:46 +02:00
Nicolas Hake 8e36b43f9c CMake: Split GLEW out into a module, look for both shared and static lib
On Windows, we need to know whether the library we're linking against is
a static library or a shared library import stub. If it's a shared lib
(and only then), we need to #define GLEW_STATIC.

Other OSes handle library imports differently and don't care.
2015-09-19 21:35:55 +02:00
Sven Eberhardt 535fc79c0f Silence a few compiler warnings. 2015-08-29 08:33:00 -04:00
Sven Eberhardt bc2259d197 MSVC/Apple CMake: Search for alext.h separately and make OpenAL extensions optional if only al.h is found. 2015-08-28 20:11:59 -04:00
Nicolas Hake 97d7240fe8 Fix C4ENGINECAPTION generation
Not only was it interpolating the wrong variable, it was also adding a
space that shouldn't be there.
2015-05-22 21:00:17 +02:00
Nicolas Hake 2eb78b617d Split calculated values out of Version.txt
Version.txt should only contain values that you set manually. Anything
that's derived from that or calculated separately should be in a
separate file.
2015-05-21 23:09:01 +02:00
hasufell 5f29846b7d Fix USE_SYSTEM_TINYXML
* fix the if-conditional
* don't use pkgconfig (there is no .pc file upstream)

Signed-off-by: Julius Michaelis <caesar@hg.openclonk.org>
(Added license to FindTinyXML.cmake)
2015-03-28 22:58:53 +09:00
Nicolas Hake 0076fc7d7b Fix DbgHelp check
CMake didn't always find the correct DbgHelp.lib on Win64. Somehow,
nobody seems to have noticed!
2015-02-08 15:03:08 +01:00
Günther Brammer a92c22a7b3 Merge various build system fixes and cleanups 2015-01-25 18:50:29 +01:00
Nicolas Hake 53ff6da5ef Remove some OSX-specific hacks from the main CMakeLists 2015-01-23 17:15:56 +01:00
Nicolas Hake bc7fcf5daa OpenAL <1.15: check some additional include directories
OpenAL's pkg-config database doesn't list include/AL as a location for
AL headers, but including <AL/al.h> is unusable because some systems
store the headers in OpenAL instead of AL. So check if the file can
actually be found as <al.h> and amend the include directory list
otherwise.
2015-01-19 13:39:18 +01:00
Nicolas Hake 9759f72b89 Downgrade requirements to Ubuntu Precise (12.04LTS) 2015-01-19 12:26:42 +01:00
Nicolas Hake ee62586013 CMake: Fallback to the system FindFreetype if pkg-config fails
Instead of shipping our own copy of FindFreetype.cmake, use the system
one if pkg-config is not available or can't find FreeType.
2015-01-18 20:50:32 +01:00
Nicolas Hake 2b2d70d02a CMake: Update for 3.1 compatibility
CMake 3.1's if() by default now interprets quoted variable names as
strings. This is a good idea from a strictness perspective, so make it
do this even if we're in 2.8.9 compatibility mode.
2015-01-18 20:50:31 +01:00
Nicolas Hake 804bf41c92 Fix UPnP auto-detection
Auto-detecting UPnP might fail when CMake was invoked multiple times.
This would result in a broken build because the compiler would not find
<natupnp.h>.
2015-01-07 21:15:53 +01:00
Günther Brammer d9e3d9db3d Require filenames to be in unicode, remove iconv usage
Every modern operating system and Clonk uses UTF-8, and windows uses UTF-16
and has its own conversion code.
2015-01-03 20:41:03 +01:00
Sven Eberhardt bab89a6514 CMake: Rename OpenAL_LIBRARY to OpenAL_LIBRARIES for MSVC to be more consistent with the other platforms. 2014-09-29 23:07:05 +02:00
Martin Plicht 9891ff048b cmake/FindAudio: Do not add OpenAL_Library to Audio_LIBRARIES on mac because as a preinstalled framework it is just assumed to be present, and linked via the framework linker flag in the main CMakeLists.txt file 2014-09-29 22:29:29 +02:00
Sven Eberhardt 42d53c5225 Add OpenAL_LIBRARY to Audio_LIBRARIES.
Doesn't make sense to not add them. Let's hope this doesn't break autobuilds again.
2014-09-25 16:46:21 +02:00
Martin Plicht cf474e99aa mac: Rearrange sound toolkit includes and FindAudio.cmake so that sound+music works for OSX 2014-09-21 22:16:54 +02:00
Sven Eberhardt d7c59d272b CMake: Add OpenAL to link libraries.
I need this for my build. Let's hope it doesn't break the snapshots.
2014-08-14 17:18:29 +02:00
Nicolas Hake 642ce2eb9c Merge all of the audio provider switches into one
There's no point in splitting the audio library selection into multiple
CPP macros, since there can always only be one anyway. Merge all of them
into a single macro AUDIO_TK (for "toolkit") and have CMake select one
for the user, instead of making him choose (and potentially failing).
2014-08-01 23:37:42 +02:00
Günther Brammer 13d9608f9e Avoid using ICONV_LIBRARIES when the search for the library failed. 2014-06-09 04:17:17 +02:00
Kevin Zheng 7bc06ad652 Fix iconv detection and 'const' qualifier. 2014-06-09 04:11:52 +02:00
Günther Brammer f6b7001d0b cmake: Use C++ compiler to check for X11/extensions/Xrandr.h and keysym.h
To do this, port the CHECK_INCLUDE_FILES macro from the CMake source to
C++. While at it, actually check for both headers instead of XLib.h alone.
2014-05-28 03:53:20 +02:00
Nicolas Hake 2becbf6b44 Use pkg-config over CMake to find Freetype (#1024)
If pkg-config does not exist on the build system, then the old
FindFreetype.cmake behavior will be fallen back upon, but pkg-config
should be a lot more reliable.
2014-02-07 00:06:04 +01:00
Nicolas Hake e0dc30c59a Update copyright notices
As discussed in http://forum.openclonk.org/topic_show.pl?tid=2917, I
have merged all copyright notices into a single file and referenced that
merged file from each source file.

For the updated source files, the timeline has been split into three
parts:
 1. Pre-RWD code (before 2001)
 2. RWD code (2001 through 2009)
 3. OpenClonk code (2009 and later)
All pre-RWD copyright notices have been left intact, as have RWD-era
copyright notices where the file did not have a RedWolf design copyright
notice but only individual author ones. All copyright notices of the
OpenClonk era have been replaced by a single notice ranging from the
first recorded year to the current year (2013). Mape code did not get a
OpenClonk Team copyright notice because it is somewhat separate from the
main OpenClonk codebase and has only been touched by Armin Burgmeier.
2013-12-23 13:03:19 +01:00
Nicolas Hake 8709b841bf cmake: Also look for static libraries 2013-10-08 22:02:39 +02:00
Nicolas Hake 94b726c9ad cmake: Get FindPNG to find the correct version of libpng
FindPNG.cmake parses libpng's version from png.h. As such, there's no
reason not to use that information when looking for the library itself.
2013-10-08 21:23:08 +02:00
Nicolas Hake 59ee0ed090 cmake: Get FindFreetype to look for versioned libraries
Since FindFreetype.cmake already extracts the version of freetype
from its header files, I have no idea why they're not automatically
using that info to look for the proper library name in lieu of
hardcoding a single version.
2013-10-08 21:23:07 +02:00
Nicolas Hake 459fce0758 Replace std::auto_ptr with std::unique_ptr
std::auto_ptr has awkward copy semantics and is deprecated in C++11.
2013-03-26 15:43:01 +01:00
Julius Michaelis 2a68766856 Fix error condition in cmake's git_get_changeset_id 2012-12-08 00:24:00 +01:00
Nicolas Hake 2914aeff26 FindUpnp: Look for threadutil lib too
In case we're linking statically, libthreadutil needs to be linked
in when libupnp gets linked, or else undefined references will ensue.
2012-11-20 22:24:00 +01:00
Nicolas Hake 94225e8de5 Prepare build for Git repository
This includes fetching the build revision from git instead of hg
and adding a file to store the revision hash in archives.
2012-11-20 22:23:59 +01:00
Julius Michaelis 4f4ad5c521 Add a little warning when GCC Precompiled Headers go wrong 2012-05-02 00:25:45 +02:00
Julius Michaelis 97d34d8c46 Oversight in PCH fix 951aac232911
Shouldn't make any difference
2012-04-01 14:23:29 +02:00
Julius Michaelis 15696e75ae Fix the GCC precompiled headers
It's still hacky as hell, but changing CMAKE_BUILD_TYPE or only rebuilding c4script without c4group_pch shouldn't break anymore
2012-03-30 19:47:21 +02:00
Nicolas Hake 6979657962 cmake: Add required libixml to UPnP libraries
Earlier versions of ld(1) would attempt to implicitly satisfy link requirements
by checking the dependencies of linked-in libraries. Current versions don't do
this anymore, so we need to explicitly spell out all dependent libraries on the
linker command line.
2012-01-21 14:05:44 +01:00
Armin Burgmeier 23d54ea2c9 Implement UPnP for Linux using libupnp 2012-01-21 02:04:14 +01:00
Nicolas Hake f9f01bef9a cmake: Search for FMOD headers and add to include path 2011-10-28 23:49:11 +02:00
Nicolas Hake cc672bbd00 win32: Automatically check for DbgHelp availability 2011-10-03 13:09:51 +02:00
Nicolas Hake 14f81d7eef Move cmake modules to separate directory 2011-10-03 13:03:22 +02:00