Commit graph

70547 commits

Author SHA1 Message Date
David Seifert
870f896a53 Update changelog
* Detail the `GNUInstallDirs` changes
* Non-Windows builds now use the absolute path for all
  data paths. This is less brittle, as relative path
  lookup in Unix always depends on the current value of
  the PWD environmental variable.
2017-11-20 07:45:00 +02:00
David Seifert
0e57d0840a Use GNUInstallDirs to specify directories
* GNUInstallDirs is the only Kitware-supported
  way to change the default directories. Most
  distributions have hooks for changing these
  directories, which makes integrating wesnoth
  easier and more consistent with the rest of
  the CMake ecosystem.
* Make build system perfectly out-of-source
  compatible. The build system should never
  touch files in the source tree.
2017-11-20 07:44:46 +02:00
lundberg
7d910ab075 Fix MSVC variable hides variable warning 2017-11-20 07:38:35 +02:00
pentarctagon
e45e824499 Have scons and cmake link against same static libraries. 2017-11-20 07:38:18 +02:00
Jyrki Vesterinen
17c0fd97a8 Fix MSVC compiler warning about overriding a function
Visual Studio 2013 omits a warning if a parameter is const-qualified in the
original function but not the overriding one (or the reverse).
2017-11-20 07:38:18 +02:00
Jyrki Vesterinen
5535b36395 Fix build with TDM-GCC
@newfrenchy83 said that the build is failing:
37225d24ea (commitcomment-25629052)

It looks like TDM-GCC uses Windows XP development headers, unfortunately.
However, the problem is easy to work around by simply #defining the missing
value ourselves. We should consider dropping TDM-GCC support after the 1.14
release, though.
2017-11-20 07:38:18 +02:00
pentarctagon
c8b37856c5 Add explanation comment. 2017-11-20 07:38:18 +02:00
pentarctagon
f1b4f79afc Fix the scons Wesnoth Windows executable icon. 2017-11-20 07:38:18 +02:00
Wedge009
34008913ed Add missing configuration for Release compilation.
[ci skip]
2017-11-20 16:33:21 +11:00
Wedge009
de31ac37b1 Tidy recent additions.
[ci skip]
2017-11-20 16:32:39 +11:00
Charles Dang
335ffa1b81 MP Create Game: minor improvements
* The dialog now owns its own create_engine object. Previously, it was created immediately
  adjacent to the dialog object and passed in by reference, which made no sense.
* The create_engine also no longer takes a CVideo reference and instead initializes its CVideo
  member from the singleton.
* The 'Registered Users Only' toggle is now disabled if the host isn't registered themselves
  (fixes #2206)
* The above setting, along with Observers, Strict Sync, and Game Password, are disabled in local
  mode. These don't really make sense when not playing a networked game.
2017-11-20 12:30:11 +11:00
Jyrki Vesterinen
91151cbe52 Update Visual Studio project 2017-11-19 20:21:11 +02:00
Alexander van Gessel
5e575694b9 Remove unneeded include 2017-11-19 18:39:23 +01:00
Alexander van Gessel
3d3b1bc443 Partially revert ca51442277
Taking an argument, especially by reference, does not require a full type.
Including unit.hpp in make.hpp utterly defeats the point of make.hpp's existence.
2017-11-19 18:35:58 +01:00
Gregory A Lundberg
ca51442277 Fix compile errors from 669ba885ce
Sorry, you can't avoid including unit.hpp in all cases.

But, it's still a lot less than it used to be.
2017-11-19 11:22:01 -06:00
Alexander van Gessel
65ecc2d8ca Use make_unit_ptr to avoid a heavy include 2017-11-19 17:51:16 +01:00
Alexander van Gessel
669ba885ce Add make_unit_ptr functions in separate header, to avoid inclusion of unit.hpp 2017-11-19 17:50:47 +01:00
Alexander van Gessel
f2dc997b50 Remove unneeded include 2017-11-19 17:38:34 +01:00
Alexander van Gessel
067e475a0a Out-of-line some functions to remove an include 2017-11-19 17:38:03 +01:00
Alexander van Gessel
ba33ed7cd4 Out-of-line some functions to remove an include 2017-11-19 17:37:27 +01:00
Alexander van Gessel
d9fe6395af Out-of-line a function to remove an include 2017-11-19 17:35:00 +01:00
Alexander van Gessel
543119134b Out-of-line and forward-declare to remove some includes 2017-11-19 17:32:13 +01:00
Alexander van Gessel
f8ecc545a2 Out-of-line a function to remove an include 2017-11-19 17:17:00 +01:00
Alexander van Gessel
826c28b87c Out-of-line some functions to remove an include 2017-11-19 17:08:52 +01:00
Jyrki Vesterinen
01835123fe Windows: if a CMD switch immediately exits, wait for an Enter press
Helpful if a developer is testing --help from Visual Studio, for example.
2017-11-18 22:13:50 +02:00
Jyrki Vesterinen
2ad0715d7f Update --help text about FPS-related options 2017-11-18 22:09:22 +02:00
sigurdfdragon
7c276059ea Update changelogs 2017-11-18 13:58:12 -05:00
sigurdfdragon
8ba4e33e7a DM S19: Fix dialog 2017-11-18 13:40:49 -05:00
sigurdfdragon
22492fc1b5 DM S19: Have either undead or Delfador be able to kill Iliah-Malal
Previously, there was temptation for players to ditch all of their
undead before leaving the land of the dead scenarios so they had
Delfador instead of the undead able to kill Iliah-Malal.
2017-11-18 13:40:49 -05:00
sigurdfdragon
44f42b0fc5 Update pofix.py
For HttT S20b change.
2017-11-18 13:39:13 -05:00
Jyrki Vesterinen
c680613996 Fix misplaced parenthesis 2017-11-18 19:10:29 +02:00
Celtic Minstrel
48178adb9f Add string insert function for WFL 2017-11-18 11:51:33 -05:00
Celtic Minstrel
9e20250e93 Finish deploying DEFINE_WFL_FUNCTION macro 2017-11-18 11:51:31 -05:00
David Seifert
0f2b585fc5 Bring back LOCALEDIR
* The current infrastructure relies on `LOCALEDIR`
  in places beyond CMake, hence we need to keep
  it for the time being.

Fixes #2211
2017-11-18 10:36:12 -06:00
Gregory A Lundberg
d8efb9a2bf Git: do NOT ignore any MO translations in the po folder.
PR #1725 moved the compiled translations from the translations directory to the po directory.

I would have noticed sooner if Git had not been told to ignore virtually all MO files.
2017-11-17 15:13:12 -06:00
David Seifert
509aa5a1ea Update changelog
* Detail the `GNUInstallDirs` changes
* Non-Windows builds now use the absolute path for all
  data paths. This is less brittle, as relative path
  lookup in Unix always depends on the current value of
  the PWD environmental variable.
2017-11-17 13:41:32 -06:00
David Seifert
533c0b8005 Use GNUInstallDirs to specify directories
* GNUInstallDirs is the only Kitware-supported
  way to change the default directories. Most
  distributions have hooks for changing these
  directories, which makes integrating wesnoth
  easier and more consistent with the rest of
  the CMake ecosystem.
* Make build system perfectly out-of-source
  compatible. The build system should never
  touch files in the source tree.
2017-11-17 13:41:32 -06:00
lundberg
e8cd3df79a Fix MSVC variable hides variable warning 2017-11-17 11:34:55 -06:00
Jyrki Vesterinen
ec02c499c5 Fix MSVC compiler warning about overriding a function
Visual Studio 2013 omits a warning if a parameter is const-qualified in the
original function but not the overriding one (or the reverse).
2017-11-16 19:33:58 +02:00
Jyrki Vesterinen
f0fc40dc12 Fix build with TDM-GCC
@newfrenchy83 said that the build is failing:
37225d24ea (commitcomment-25629052)

It looks like TDM-GCC uses Windows XP development headers, unfortunately.
However, the problem is easy to work around by simply #defining the missing
value ourselves. We should consider dropping TDM-GCC support after the 1.14
release, though.
2017-11-16 19:31:03 +02:00
Sergey Popov
b4c08f462c
Merge pull request #2205 from Pentarctagon/2204
Fix the scons Wesnoth Windows executable icon.
2017-11-16 16:19:38 +03:00
pentarctagon
5869c36b82 Add explanation comment. 2017-11-16 03:55:26 -06:00
pentarctagon
961b306324 Fix the scons Wesnoth Windows executable icon. 2017-11-16 03:21:03 -06:00
Charles Dang
f7f2da45d4 Fixup f626a2d (more expansive _WIN32_WINNT value check)
Just in case _WIN32_WINNT doesn't exactly match _WIN32_WINNT_WINXP (0x0501) when building.
2017-11-16 18:26:10 +11:00
Charles Dang
f626a2dd31 Only define BOOST_ASIO_DISABLE_IOCP on Windows XP
That define allows boost::asio::ip::tcp::socket::cancel to work on Windows XP, but there's no
reason to have it enabled on other Windows versions.
2017-11-16 17:25:22 +11:00
Charles Dang
bc3c79a3e0 Campaignd/Network Asio: formatting cleanup 2017-11-16 16:42:07 +11:00
sigurdfdragon
ac2c6e6e6d DM S08: Use simpler way to keep leader on his keep
He won't attack, but that's not a big deal here.
2017-11-15 20:31:31 -05:00
gfgtdf
073a4ebcf6
fix build 2017-11-16 02:07:43 +01:00
gfgtdf
1c44296b22
round instead of floor to fitting value in slider::set_value 2017-11-16 02:06:44 +01:00
gfgtdf
8c1f07f607
add debug output on slider error. 2017-11-16 01:53:43 +01:00