Commit Graph

11063 Commits (stable-8)
 

Author SHA1 Message Date
Romain Naour f8136fcbc5 CMake: add C4GROUP_TOOL_ONLY
When cross-compiling c4group should be build for the host
machine before building OpenClonk for the target.

Without C4GROUP_TOOL_ONLY option, we have to build OpenClonk
for the host.

C4GROUP_TOOL_ONLY allow to build only c4group tool for the
host.

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
With this patch I can build OpenClonk with Buildroot.
2018-04-12 23:20:21 +02:00
Romain Naour 54d2ce7e07 CMake: use FIND_PROGRAM
While cross-compiling, it is easier to find a binary
from the patch using FIND_PROGRAM instead of using
a cmake file.

Try to find c4group native tool with FIND_PROGRAM and
fallback to the cmake file if c4group is not found.

Signed-off-by: Romain Naour <romain.naour@gmail.com>
2018-04-12 23:20:21 +02:00
Romain Naour 923d355c91 CMake: build libmisc and libc4script statically
As reported by [1], some distributions use shared libraries as
default preset in CMake.

Without explicitely linking statically libmisc and libc4script,
we have the following link issue:

[...]/host/bin/x86_64-linux-g++ --sysroot=[...]sysroot
-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os
-std=gnu++14 -Wall -Wextra -Wredundant-decls -Wendif-labels
-Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Winit-self
-Wsign-promo -Wno-reorder -Wno-unused-parameter -Wnon-virtual-dtor
-Woverloaded-virtual  -DNDEBUG
-rdynamic CMakeFiles/c4group.dir/src/c4group/C4GroupMain.cpp.o
-o c4group
-Wl,-rpath,[...]/build/openclonk-7.0:
liblibmisc.so -lz -lpthread -lrt
liblibmisc.so : référence indéfinie vers « C4LangStringTable::Translate(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const »
liblibmisc.so : référence indéfinie vers « C4LangStringTable::system_string_table »

[1] https://github.com/openclonk/openclonk/pull/26

While at it, build libopenclonk statically since libopenclonk is not
installed by the CMake build system.

Signed-off-by: Romain Naour <romain.naour@gmail.com>
2018-04-12 23:19:14 +02:00
Nicolas Hake c1ee1bdac7 Fix the most horrible merge I've done yet 2018-03-21 13:34:13 +01:00
Nicolas Hake c291488034 Merge branch 'blake2-no-sse2' into stable-8 2018-03-21 13:03:39 +01:00
Nicolas Hake e0850947bf BLAKE2: Fall back to plain C implementation on non-amd64 platforms
While amd64 always supports the SSE2 instruction set extension,
other architectures don't (including 32 bit x86). For the platforms
that don't, we'll use the reference C implementation by default, but
allow users to override it with the BLAKE2_USE_SSE2 option.
2018-03-21 13:00:40 +01:00
Nicolas Hake 288e9f339b Merge commit '9493ed1277ef924c3005a9ff51f194d1cda87947' as 'thirdparty/blake2' 2018-03-19 13:50:17 +01:00
Nicolas Hake 9493ed1277 Squashed 'thirdparty/blake2/' content from commit beb75f451
git-subtree-dir: thirdparty/blake2
git-subtree-split: beb75f4512223e6a3a03a48992345256c5ef393a
2018-03-19 13:50:17 +01:00
Maikel de Vries 5c6fadfb26 warn about deprecated use of base respawn rule 2018-03-16 18:25:33 +01:00
Maikel de Vries 4dc3fe5928 fix king of the hill graphics in editor mode 2018-03-16 18:25:27 +01:00
Maikel de Vries 168277abdb moving brick: fix movement graph saving
Did not test all corner cases but this improves the situation for sure.
2018-03-15 15:41:25 +01:00
Maikel de Vries a7e1f59369 flame: option to make eternal for editor mode 2018-03-15 15:41:17 +01:00
Maikel de Vries 90ea896814 correctly update active fire effect when NoBurnDecay changes 2018-03-15 15:41:08 +01:00
Maikel de Vries 7c0ae67289 do not show compensator burning battery in editor creation list 2018-03-15 15:40:58 +01:00
Maikel de Vries 07b0f51742 remove duplicate cloud effect object
The particle had the same graphics as the real Cloud object and the script does not seem to have any uses. Also unused for more than 4 years.
2018-03-15 15:40:46 +01:00
Maikel de Vries 0aba4f88fc make time object more editor friendly 2018-03-15 15:40:35 +01:00
Maikel de Vries a935a9d4ac fix meteor graphics 2018-03-15 15:40:27 +01:00
Maikel de Vries 97f87019b7 waterfall: implement editor interface 2018-03-15 15:40:17 +01:00
Maikel de Vries a85a3201d9 hide some more objects in editor creation list
The burned object may be creatable, but must then be moved such that the libraries parent folder remains invisble in the editor.
2018-03-15 15:40:04 +01:00
Maikel de Vries e0e570e9c9 fix DefCore Version entry for stone and wooden sign 2018-03-12 16:51:16 +01:00
Maikel de Vries 68d901b61c relaunch rule: fix scoreboard updating and scenario overloading 2018-03-12 15:05:50 +01:00
Maikel de Vries 2c4676d63c update version to 8.1 2018-03-05 17:47:43 +01:00
Armin Burgmeier d952012331 Install platforms/ folder in windows installer 2018-03-05 17:42:17 +01:00
Maikel de Vries 0f67b7bb70 treasure hunt: fix wrong dialogue translation of Dagobert to Scrooge 2018-03-05 17:37:08 +01:00
Maikel de Vries 2a59351edd add wooden sign object
Graphics made by Foaly.
2018-03-05 17:37:08 +01:00
Maikel de Vries 0c0c5df94d signpost and stone sign: clean up scripts and lessen code duplication 2018-03-05 17:37:08 +01:00
Maikel de Vries 84063e1917 c4script: some fixes for style guidelines and typos 2018-03-05 17:37:08 +01:00
Maikel de Vries b88e72c67a add stone sign object
Graphics made by Foaly.
2018-03-05 17:37:08 +01:00
Maikel de Vries 459b081033 fix guide post pictures and interaction icons 2018-03-05 17:37:08 +01:00
Maikel de Vries 44b377d637 prevent floor switch from making object stuck while moving 2018-03-05 17:37:08 +01:00
Maikel de Vries 2c43ac6bac item spawn: prevent pickung up two carry heavy objects 2018-03-05 17:37:08 +01:00
Maikel de Vries c2ac2bda42 item spawn: instantly pick carry heavy items 2018-03-05 17:37:07 +01:00
Nicolas Hake 0e45bb8ee9 Enable SSE2 for BLAKE2 library 2018-03-05 17:37:07 +01:00
Maikel de Vries 66f52a4097 keypad: save code hashed, so that they can't be read off in editor mode 2018-03-05 17:37:07 +01:00
Nicolas Hake 3e0ed99c83 Add BLAKE2 library and expose its a CS hash algorithm to script
The crypto "library" only consists of a single function at the
moment because that's all that users have asked for so far. It is
also highly experimental. We will make an attempt to keep the public
interface (i.e. the interface provided by Library_Crypto.c) stable,
but it might still change if necessary. The internal interface
(provided via the global _Crypto proplist) is not for public
consumption and will probably change at some point.
2018-03-05 17:37:07 +01:00
Nicolas Hake 49a1b5aaf7 Make cross-compiling work with GCC 6+
GCC6 doesn't like getting some of its default include search paths
passed with the -isystem flag, and the devs seem unlikely to change
whatever they did back to before they broke it. Work around CMake
not dealing with it well either by figuring out the paths at
configure time and telling CMake about them so it can avoid adding
them superfluously.
2018-03-05 17:37:07 +01:00
Maikel de Vries 0eeaf99266 fix dialogue image size for use as icon 2018-03-05 17:37:07 +01:00
Lukas Werling 03d05ff98f Add EvaluateOnAbort scenario flag for Tower of Despair
In Tower of Despair, the scenario saves per-room progress in the
player files. Players win individual rooms, but never the whole
scenario. Consequently, they currently have to give up to make sure
they don't lose their progress. This is not intuitive at all. With the
new flag enabled, players will be saved even if the scenario is aborted.
2018-03-05 17:37:07 +01:00
Maikel de Vries fabe8302eb add stalactites to hot ice as decoration (#1564) 2018-03-05 17:37:07 +01:00
Maikel de Vries 0f48bb2a86 stalactite: fix raindrop, allow placing in sky, fix stalagmite, clean up 2018-03-05 17:37:07 +01:00
Maikel de Vries 64c08e1510 add star icon 2018-03-05 17:37:07 +01:00
Lukas Werling 32df251d2e Fix editor keyboard input on FreeBSD (hopefully)
Assuming keyboard scancodes on FreeBSD are the same as on Linux.
2018-02-18 22:37:52 +01:00
Lukas Werling 2159895280 Fix IPv4 address serialization on FreeBSD (hopefully) 2018-02-18 22:37:52 +01:00
Lukas Werling 846ba60d46 Editor join: Serialize reference as INI
On FreeBSD, the binary serialization doesn't work for IPv4 addresses,
and we never serialize game references as binary anywhere else.
2018-02-18 22:37:52 +01:00
Lukas Werling e10d4b3bf5 Launch editor via argv[0] on Unix systems without /proc/self/exe (#1999) 2018-02-18 22:37:52 +01:00
Lukas Werling a091874546 Autodetect "/proc/self/exe"-equivalent on FreeBSD (#1999) 2018-02-18 22:37:52 +01:00
Lukas Werling cd1f540b1e Disable -Wformat-security in parts of C4AulCompiler (#1992, GH-64) 2018-02-18 22:37:52 +01:00
Kevin Zheng d57e0e08d2 Fix networking on FreeBSD (#1998) 2018-02-18 22:37:52 +01:00
Lukas Werling 1f20add428 Credits: Fix Kevin Zheng's name 2018-02-18 22:37:52 +01:00
Maikel de Vries 9af9e5d98f docs: removed obsolote Components entry and add IsEditor function 2018-02-15 13:04:22 +01:00