Commit Graph

312 Commits

Author SHA1 Message Date
frosch
0a5258743a (svn r27607) [1.6] -Backport from trunk:
- Fix: Compilation and optimisation issues with GCC6 (r27606, r27605, r27595)
- Fix: Compilation with --disable-network [FS#6481] (r27602)
- Fix: [NewGRF] shift-and-add-divide/modulo varadjusts use signed division/modulo (r27600)
- Fix: Company 0 could accept engine previews before they were offered (r27598)
2016-07-01 21:29:49 +03:00
frosch
c2c30aa18c (svn r27588) [1.6] -Backport from trunk:
- Fix: [Build] Force sorting to be locale independent, so files are always ordered the same and by that token better diff-able (r27562, r27558)
- Fix: Typos in comments and string (r27561, r27560)
- Fix: [Build] bashism that caused different CFLAGS with bash vs dash (r27557)
2016-07-01 21:24:34 +03:00
pelya
3ef1c1baff Merge commit 'a8b575671894ffe1329ef37dca4989c0e60d70f5'
These merges are becoming more awful every time

Conflicts:
	src/ai/ai_gui.cpp
	src/build_vehicle_gui.cpp
	src/cheat_gui.cpp
	src/company_gui.cpp
	src/depot_gui.cpp
	src/dock_gui.cpp
	src/error_gui.cpp
	src/genworld_gui.cpp
	src/misc_gui.cpp
	src/network/network_content_gui.cpp
	src/network/network_gui.cpp
	src/newgrf_gui.cpp
	src/news_gui.cpp
	src/rail_gui.cpp
	src/rev.cpp.in
	src/road_gui.cpp
	src/settings_gui.cpp
	src/settings_gui.h
	src/signs_gui.cpp
	src/station_gui.cpp
	src/table/settings.ini
	src/terraform_gui.cpp
	src/toolbar_gui.cpp
	src/toolbar_gui.h
	src/vehicle_gui.cpp
	src/video/sdl_v.cpp
	src/viewport.cpp
	src/widget.cpp
	src/widgets/settings_widget.h
2016-03-27 22:33:11 +03:00
planetmaker
96aa437f85 (svn r27472) -Change [FS#6401] (r20219): On Haiku use the appropriate system variable to obtain the include dir (aarroyoc) 2015-12-15 20:43:39 +00:00
rubidium
eb4b6a08d0 (svn r27377) -Codechange: use the pkg-config files of ICU as well. Since they are split into separate libraries it becomes possible to split RTL support for natural sorting, although the effect will be minimal 2015-08-09 13:54:17 +00:00
rubidium
cc5b8ea6cb (svn r27376) -Codechange: let libtimidity detection and configuration make use of pkg-config 2015-08-09 12:43:52 +00:00
rubidium
2011c24502 (svn r27375) -Fix-ish: update help parameter for png configuration (it has used pkg-config for a long time) 2015-08-09 12:42:52 +00:00
rubidium
36f77b1aa7 (svn r27374) -Codechange: make zlib detection and configuration make use of pkg-config 2015-08-09 12:42:21 +00:00
rubidium
c3715a025d (svn r27373) -Codechange: make sdl detection and configuration use pkg-config 2015-08-09 12:41:54 +00:00
rubidium
f05d71a9a6 (svn r27372) -Codechange: make allegro detection and configuration use pkg-config 2015-08-09 12:41:35 +00:00
rubidium
f179a92007 (svn r27371) -Codechange: make freetype detection and configuration use pkg-config 2015-08-09 12:41:12 +00:00
rubidium
2aee2899e8 (svn r27370) -Codechange: move the "dedicated server" check into the pkg-config check routine 2015-08-09 12:40:17 +00:00
rubidium
a08d1a044f (svn r27369) -Cleanup: there's no need to do dependency checking of libraries in OpenTTD; zlib should always be installed if libpng is because it links to zlib 2015-08-09 12:39:26 +00:00
rubidium
625bc2e0e7 (svn r27368) -Cleanup: undo the special case of OSX; it works fine without it 2015-08-09 12:37:20 +00:00
rubidium
ee700fd3b1 (svn r27367) -Codechange: make a distinction between the layouting part of ICU (lx) or the sorting/collation part of ICU (i18n) 2015-08-09 12:33:27 +00:00
rubidium
bc199a4fe1 (svn r27361) -Fix-ish: when attempting to find a host, try gcc/g++ but also CC/CXX appended to the host triple. This to make cross compilation with clang alone easier 2015-08-08 08:54:49 +00:00
rubidium
501ee2105a (svn r27360) -Feature: allow configuring pkg-config in one go for all libraries 2015-08-08 08:52:21 +00:00
frosch
482714e1cf (svn r27250) -Fix [FS#6286]: Broken error message in configure. (NG) 2015-04-26 08:59:20 +00:00
planetmaker
e54ba05393 (svn r27224) -Cleanup: Duplicate #ifdef for FreeBSD (AMDim3) 2015-04-11 10:47:20 +00:00
planetmaker
acef9bb811 (svn r27223) -Add [FS#6274]: Support for DragonflyBSD (AMDmi3) 2015-04-11 10:25:36 +00:00
planetmaker
2d3ad05aa7 (svn r27059) -Change: [Makefile] Make sure to use plain mercurial output unaltered by personal presets 2014-11-09 16:37:07 +00:00
rubidium
6592da4952 (svn r26869) -Add: support for an all black palette to prevent the need of having a black tile of all different slopes (ic111) 2014-09-21 07:57:45 +00:00
planetmaker
7836a487ae (svn r26850) -Fix: [Makefile] Compilation of strgen requires also defining variable in for platforms like Solaris 2014-09-19 09:28:23 +00:00
Sergii Pylypenko
2603e6b5e3 Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/os/unix/unix.cpp
	src/widgets/dropdown.cpp
2014-08-19 19:21:47 +03:00
rubidium
a290f4a6fb (svn r26737) -Fix (r26735): one = too many... why can't all languages use the same basic definition for comparisons? 2014-08-16 10:31:24 +00:00
rubidium
bbe58ca737 (svn r26735) -Fix (rmakefilerewrite): for profiling CFLAGS got a -p (for prof) and LDFLAGS got -pg (for gprof), but in the end gprof would be used (via make run-prof). Furthermore -pg isn't compatible with -fomit-frame-pointer on certain architectures (most importantly x86(_64)), so simply don't enable that flag when profiling is enabled 2014-08-16 10:17:18 +00:00
Sergii Pylypenko
91ebce1a9c Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/console_gui.cpp
	src/genworld_gui.cpp
	src/group_gui.cpp
	src/misc_gui.cpp
	src/settings_gui.cpp
	src/widgets/settings_widget.h
2014-06-04 17:09:23 +03:00
planetmaker
c10662e4cc (svn r26458) -Doc: Correct a few spelling mistakes (__ln__) 2014-04-12 15:59:56 +00:00
Sergii Pylypenko
7c024612f6 Merge remote-tracking branch 'upstream/master' 2014-04-02 22:54:47 +03:00
rubidium
3e4124695d (svn r26435) -Fix (r26434): linking issue on OS X 2014-03-28 19:18:36 +00:00
rubidium
07a9086ced (svn r26433) -Codechange: use pkg-config for libpng as well 2014-03-28 18:19:48 +00:00
rubidium
aa5f505b64 (svn r26432) -Codechange: deduplicate code for checking pkg-config dependencies 2014-03-28 18:12:21 +00:00
pelya
d7b18a8e2d Detect version from git submodule 2014-03-15 19:53:53 +02:00
rubidium
aca4b5bf37 (svn r26198) -Fix (r26195): some platforms leave an .exe around... 2014-01-02 09:07:50 +00:00
rubidium
bfd72d7a89 (svn r26194) -Change: add SSE detection to the configure script with the possibility to disable it (based on patch by MJP) 2014-01-02 08:35:45 +00:00
rubidium
108b65c967 (svn r26019) -Fix: copy-paste error in configure help 2013-11-16 22:17:02 +00:00
rubidium
7de6238e25 (svn r26011) -Fix: --help text of ./configure for packages that require pkg-config 2013-11-16 13:16:38 +00:00
rubidium
a77aa68f16 (svn r25975) -Feature [FS#5385]: XDG base directory support 2013-11-13 19:32:37 +00:00
rubidium
7d5aaf95c4 (svn r25960) -Fix-ish: make it less likely to trigger clang's hang with -D_FORTIFY_SOURCE=2 -O1 2013-11-09 07:15:01 +00:00
fonsinchen
c8d4e83909 (svn r25706) -Fix: don't pass -mmacosx-version-min to compilers that don't support it 2013-08-10 12:47:08 +00:00
michi_cc
1880c36405 (svn r25679) -Codechange: [Win32] Get the result string of an IME input directly without a trip through the window messaging system. 2013-08-05 20:37:06 +00:00
planetmaker
b1e2922a23 (svn r25642) -Fix (r25638): Compilation with static ICU 2013-07-31 18:09:21 +00:00
planetmaker
0727c3c76d (svn r25638) -Fix (r25470): Some icu_config are too stupid to separate two ldflags by spaces, thus only call it with one 2013-07-30 22:03:36 +00:00
michi_cc
ac583fc787 (svn r25480) -Codechange: [OSX] OS X SDK versions >= 10.5 always have a non-const iconv declaration. 2013-06-26 21:17:09 +00:00
rubidium
672ccbfde5 (svn r25470) -Feature-ish: use ICU's layout engine when that's available 2013-06-25 20:40:58 +00:00
glx
95552ba45b (svn r25266) -Fix: gcc4.6 removed -mno-cygwin option 2013-05-19 15:44:09 +00:00
planetmaker
5ed3969ab9 (svn r25209) -Doc: Mention --without-grfcodec in the help for configure and explain its use in the readme 2013-04-26 18:39:15 +00:00
frosch
e4c87948c5 (svn r25205) -Feature: Translations of baseset descriptions via lang files. 2013-04-24 20:30:02 +00:00
rubidium
a9af895fbb (svn r25107) -Change: be slightly more lenient with trying to detect a subversion repository in case someone has a sparse tags checkout. In that case the .svn folder misses from the $ROOT_DIR because it is in the $ROOT_DIR/.. (i.e. tags) folder 2013-03-18 06:18:06 +00:00
rubidium
c6ecb1f2f3 (svn r25054) -Document: the *FLAGS_BUILD in configure 2013-02-28 06:51:45 +00:00