| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
This also updates ENet from 1.3.2 to 1.3.18.
The previously supported WITH_BUNDLEDHEADERS option that affected which
ENet was being used has now been reversed and renamed to
USE_SYSTEM_ENET, which defaults to OFF for now.
|
|
We need to set the custom values before including GNUInstallDirs, so
that GNUInstallDirs will set the CMAKE_INSTALL_FULL_<dir> variables
correctly.
Fixes breakage in aecbf876cd0a7894396a2e5034af9d93bf028aa0.
|
|
More consistent formatting and no longer everything in uppercase, yay!
|
|
Also enable using `cpack -G DragNDrop` to create a DMG to easily drag
Mana into the Applications folder.
The DMG is also available as a CI artifact.
The minimum deployment target has been set to 10.15, as required due to
usage of std::filesystem::create_directories.
|
|
This should make CMake options a little more standardized. The Windows
part could potentially still be unified further.
Absolute paths are now only used for the defines and not for values
going to install() commands.
|
|
Otherwise they are included in the NSIS installer, as well. We don't
need the Guichan library since we link to it statically.
|
|
The linker could not find _nl_locale_name_default. Maybe it could be
fixed by linking to another library, but it would likely not yield the
preferred behavior. Instead, we now use GetUserPreferredUILanguages to
set the LANG environment variable with one or more languages and let
gettext choose the best fitting available translation.
Also fixed the directory from which the translations are loaded to match
the installation directory,
|
|
The configured file wasn't actually being used, because it was not in
the include path. Instead, a checked in version was used.
In addition, winver.h is an existing Windows header, which was
conflicting with the generated file. Instead, now mana.rc itself is
configured. We didn't actually need winver.h anywhere else, anyway.
|
|
* Set the version, description and homepage URL using modern CMake
style (minimum supported version increased to CMake 3.12).
* Fixed the reference to the MUI_WELCOMEFINISHPAGE_BITMAP file, which
needed "\\" instead of "/" to work for me in MSYS2, and with
CPACK_VERBATIM_VARIABLES enabled (otherwise "\\\\" was needed).
* Fixed the icon used for the uninstall entry by setting
CPACK_NSIS_INSTALLED_ICON_NAME.
* Fixed missing start menu entry by setting CPACK_PACKAGE_EXECUTABLES.
* Fixed running Mana when finishing the install by setting
CPACK_NSIS_EXECUTABLES_DIRECTORY.
* Mark the NSIS installer as DPI-aware using
CPACK_NSIS_MANIFEST_DPI_AWARE.
* Enabled uninstall before install using
CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL.
|
|
So that one can choose to build with the Guichan submodule also on
other systems than macOS.
|
|
|
|
Since Guichan is currently disabled on Homebrew, I've opted for adding
it as a submodule instead. It currently references the 0.8 branch of
Guichan, after I cherry-picked the CMake support from the master
branch.
When using SDL2 installed through Homebrew, it was necessary to use
SDL2_LINK_LIBRARIES, since the libraries occupy various different
directories.
It no longer seems necessary to include an SDLMain.m, so I deleted it.
Removed obsolete OS X instructions.
Also added instructions for installing dependencies on Fedora.
Removed mentioning of /announce and /who in the README, since they were
removed for tmwAthena.
|
|
C++17 should be universal enough by now.
This raises the minimum CMake to 3.8, which should also pose no problem since
Ubuntu 18.04 already shipped with CMake 3.10.
C++17's 'if' initialization statement is now used in an efficient
implementation of 'join' for vector<string>, found on StackOverflow.
|
|
It seems the implementation of PhysicsFS RWops shipped requires a
somewhat up-to-date PhysFS (beyond just a missing PHYSFS_DECL macro).
Also simplified CMake files somewhat, enabling new behavior for some
policies that were triggering warnings. And removed the no longer used
FindSDL_gfx.cmake module (SDL_gfx is found using pkg-config since
2c51c98625b225cecfb9628c30d62d4e30f7e3e1).
|
|
Hadn't expected 87470d984cc8f6fe12a354aec7bf93ee4fcb95eb to break the
build, heh.
|
|
|
|
It was only used for the clipboard, which is now interacted with through
SDL 2.
|
|
|
|
|
|
Compiling in C++11 mode causes trouble when using GCC 4.7 and linking to a
version of Guichan that was not compiled in C++11 mode.
Reviewed-by: bjorn.
|
|
Reviewed-by: Ablu.
|
|
This reverts commit 2ed8a171b63e6b58262801d1f0e0cd10ba265971.
Conflicts:
CMakeLists.txt
|
|
|
|
This is in order to still support older compilers, in particular GCC 4.2.1,
so that Mana may be compiled for Maemo 5.
Reviewed-by: Yohann Ferreira
|
|
|
|
|
|
|
|
|
|
Conflicts:
po/de.po
src/game.cpp
src/resources/wallpaper.cpp
|
|
Only using cmake conditions and an ifdef. This will greatly help
packaging the mana 0.5 version on other distros.
|
|
The check for whether we're not compiling for Mac was evaluating to
false, apparently since it used the wrong CMake syntax.
Reviewed-by: Bernd Wachter
|
|
Trivial fix.
|
|
|
|
The syntax IF ((condition) OR (condition)) is not accepted by cmake
prior to 2.6.4.
The syntax IF (NOT (condition OR condition)) is also not accepted.
The patch should address this without affecting newer versions.
A newline character was also automatically added to the end of the file.
|
|
|
|
Reviewed-by: Thorbjørn Lindeijer
|
|
With CMakeLists.txt adaptions from the Aethyra project.
Reviewed-by: Bernd Wachter
Reviewed-by: Jared Adams
|
|
to src/
|
|
|
|
|
|
|
|
|
|
|
|
available Add a workaround for a cmake-bug in translations target
|
|
|
|
installation
|
|
the eathena-binary gets named tmw-ea Fixed gitignore for CMake files
|
|
|
|
|
