Commit Graph

75 Commits

Author SHA1 Message Date
Sergii Pylypenko
8909ce3d8c Fixed emscripten compilation 2021-12-15 00:40:26 +02:00
Sergii Pylypenko
793444e1ba Merge tag '12.1' into branch 12 2021-12-10 02:36:38 +02:00
Sergii Pylypenko
2f6b20cbfd Merge branch upstream/master while introducing compile errors and reverting parts of Android changes, video BPP options are gone 2021-11-29 02:20:37 +02:00
Sergii Pylypenko
43ea278ad1 Emscripten: socket proxy first draft 2021-11-28 03:39:27 +02:00
Sergii Pylypenko
c41bcce1e8 Emscripten: removed network stubs and re-enabled multiplayer dialog 2021-11-28 03:38:46 +02:00
Sergii Pylypenko
c9e2163aa6 Emscripten: compile libiculx for RTL text support 2021-11-28 03:35:07 +02:00
Sergii Pylypenko
5be853ed09 Emscripten: fixed a warning 2021-11-28 03:35:06 +02:00
Sergii Pylypenko
d92212e60b Enabled LTO for Android 64-bit architectures 2021-11-28 03:35:06 +02:00
Sergii Pylypenko
7defb52028 Merge branch upstream/master 2021-11-28 03:16:36 +02:00
Sergii Pylypenko
8efa8964d0 Emscripten: libicu is not working anyway, because there are no libicuuc and libicu-le-hb available 2021-11-28 02:04:25 +02:00
Sergii Pylypenko
1e3d5662ff Emscripten: disabled libtimidity in cmake 2021-11-28 02:04:25 +02:00
Sergii Pylypenko
fd42ae95f4 Emscripten: added fontconfig library 2021-11-28 02:04:25 +02:00
Sergii Pylypenko
81796d8c8f Emscripten: build with timidity 2021-11-28 02:04:25 +02:00
Sergii Pylypenko
b38461174b Emscripten: fixed data file path 2021-11-28 02:04:25 +02:00
Sergii Pylypenko
ffe5031dbe Emscripten: add SFX and music to the data file 2021-11-28 02:04:25 +02:00
Sergii Pylypenko
8be06db7fa Emscripten: Include GFX baseset into data file 2021-11-28 02:04:25 +02:00
Charles Pigott
17dfc6e28a Doc: Prepare for 12.1 release 2021-11-08 18:36:15 +00:00
Patric Stout
4137c2e2e8 Change: upgrade Emscripten to 2.0.31 and enable LZMA by default (#9604) 2021-10-16 20:33:50 +02:00
Patric Stout
eca73a810c Change: rebrand 1.12.0 to 12.0
One question that keeps popping up: "when do we release 2.0?".
NewGRF will force that at least 1.16 will be 2.0, but to not wait
for this, let's drop the "1." and be for ever done with that
conversation.

We are following in the footstep of giants here.
2021-08-15 12:28:51 +02:00
rubidium42
98e653dacc Fix #9386: compilers failing to compile with LTO by using variants instead of new + unique_ptr
With std::variant all memory can be figured out at compile time, so the compiler needs to keep track of fewer elements. It also saves out a unique_ptr and its memory management, over a slight impact for resolving a setting.
2021-06-26 20:28:34 +02:00
glx22
5d05c4919b Codechange: [WIN32] Reduce manual dynamic loading as WinXP is the minimum version 2021-06-10 23:17:29 +02:00
Loïc Guilloux
076f3d26c2 Fix #9329: [CMake] FindVersion.cmake relied on internal cmake variable (#9330) 2021-06-10 22:14:08 +02:00
Patric Stout
bcd7a7aafe Codechange: rename _SQ64 into POINTER_IS_64BIT (#9313) 2021-05-30 10:40:03 +02:00
milek7
36bcd2956a Fix: Building on Haiku 2021-05-24 08:56:18 +02:00
Loïc Guilloux
e162d0a55c Fix: [MinGW] Reapply 48fd7b27 to fix launch on Windows 7 x64 (#9225) 2021-05-09 18:28:47 +02:00
Loïc Guilloux
2985277bec Fix d4f0b6f4: [CMake] CMAKE_PROJECT_VERSION_XXX are not in CMake 3.9 (#9154) 2021-05-01 11:11:07 +01:00
Loïc Guilloux
d4f0b6f434 Fix: [CMake] Auto-fill version details in rev.cpp and ottres.rc (#9066) 2021-04-20 21:38:46 +02:00
Loïc Guilloux
39b4a8e67e Change: [CMake] Improve 'In-source build' error message (#8955) 2021-04-06 13:54:27 +02:00
Loïc Guilloux
799eb31ff1 Change: [CMake] Copy AI/GS compatibility files to build dir (#8906) 2021-04-02 10:15:45 +02:00
Sergii Pylypenko
6ff256a3d1 Merge tag '1.11.0-RC1' into master 2021-03-15 21:01:22 +02:00
glx22
35a228f78f Add: [CMake] Install menu and media files 2021-03-09 22:42:25 +01:00
glx22
1d79f55a46 Fix: [CMake] Skip detection for unused libs for dedicated builds 2021-03-04 16:22:58 +01:00
Sergii Pylypenko
53458e55d7 Fixed NDK armeabi-v7a compilation speed 2021-03-03 01:24:43 +02:00
Sergii Pylypenko
870c254ee2 Merge tag '1.11.0-beta2' into master 2021-03-03 00:51:28 +02:00
glx22
54fb4c04e3 Fix: [CMake] libpng header/library mismatch for macos 2021-02-27 02:23:33 +01:00
Patric Stout
dc7ba33b51 Fix: don't link to OpenGL with SDL2 as backend; SDL2 dynamically loads it (#8745)
Although for developers this doesn't change anything, for our
linux-generic binary it changes everything. Without this, the
OpenGL dynamic library is dragged in as dependency, and as it
depends on X11, that will be dragged in too. This is not
something we prefer to have, as that won't run on as many
machines as it could.

SDL2 doesn't depend on OpenGL directly, as it tries to load it
in on runtime. If found, it would work in exactly the same way
as if we would link to OpenGL ourselves. As such, this is
the best of both worlds: our linux-generics have less linked
dependencies, and developers won't notice any difference.

As a side-effect, if someone uses linux-generic on a machine
that does not have any OpenGL package installed, it will
gracefully fall back to the default backend of SDL instead.
2021-02-27 00:34:41 +01:00
Michael Lutz
ef478ade64 Add: [Win32] Video driver that uses OpenGL to transfer the video buffer to the screen. 2021-02-22 22:16:07 +01:00
milek7
b749d6f1cb Fix: Allow building with Allegro and without SDL on Linux 2021-02-21 23:05:50 +00:00
Michael Lutz
6755ff63e1 Add: [OSX] Native font rendering without using FreeType. 2021-02-14 11:48:58 +01:00
pelya
da2947e5e3 Fixed slow compilation on Android, -O1 does not help 2021-02-14 00:31:12 +02:00
Michael Lutz
43326d11d8 Change: [OSX] Use a layer-backed view to speed up drawing. 2021-02-13 22:21:17 +01:00
Owen Rudge
395e015282 Change: Convert .md to .rtf for Windows/Mac packages 2021-02-08 23:23:24 +00:00
glx22
2cbfcd2327 Change: [CMake] Bump minimum version to 3.9 2021-02-07 16:21:13 +01:00
Loïc Guilloux
f7ac2969ef Fix: [CMake] Restore 'games' as default install bindir (#8629) 2021-02-07 16:19:30 +01:00
glx22
99448eedca Fix: [CMake] os/windows/openttd.manifest is not a generated file 2021-02-05 23:41:55 +01:00
pelya
40f573cb91 Fixed Fontconfig not linking on Android 2021-02-05 23:18:42 +02:00
Patric Stout
05df7996a4 Feature: [Actions / CMake] support for generic linux builds (#8641)
These bundles can be opened on any "modern" Linux machine with
a driver that SDL2 supports.

Machines needs at least glibc 2.15, which was released 10 years ago.
It is build with CentOS 7 as base, and only assumes the following
libraries are available on the system:
- libc
- libdl
- libgcc_s
- libpthread
- librt
- libstdc++

All other libraries the game depends on are bundled together with
the game, so users don't need any library installed to use this
bundle. The downside of course is that this increases the binary
size a bit: 30 MiB of libraries are in this bundle.

RPATH is used to make ld-linux find the folder libraries are
stored in; however, system libraries are always used before these,
in the assumption libraries on the user system are more up-to-date.

Using -DOPTION_PACKAGE_DEPENDENCIES=ON switches on packaging
of libraries in the "lib" folder. This requires CMake 3.16 to
be installed; otherwise it will fail.
2021-02-05 12:31:27 +01:00
pelya
3e6f1924bb Fixed SONAME in Android shared library 2021-01-28 00:59:32 +02:00
pelya
8c363ccc9d Fixed slow compilation on Android 2021-01-25 01:10:13 +02:00
pelya
25d6b94c0f Do not use Git revision for Android 2021-01-25 01:07:27 +02:00