Jonathan G Rennison
ae15c96c1a
Merge branch 'master' into jgrpp
...
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_gui.cpp
# src/bridge_map.h
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/rail_map.h
# src/rail_type.h
# src/road_map.h
# src/saveload/afterload.cpp
# src/saveload/map_sl.cpp
# src/saveload/saveload.cpp
# src/script/api/script_rail.cpp
# src/station_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
2018-07-26 20:54:13 +01:00
glx
d418d30947
Fix: dmusic detection
2018-07-24 21:39:21 +02:00
Jonathan G Rennison
035f5622b9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_cmds.cpp
# src/landscape.cpp
# src/linkgraph/linkgraphschedule.cpp
# src/openttd.cpp
# src/roadveh_cmd.cpp
# src/toolbar_gui.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/viewport.cpp
# src/window_type.h
2018-07-24 18:30:42 +01:00
Jonathan G Rennison
8fc1517515
Codechange: detect native Apple clang correctly in config.lib #6773
...
Fixes: 00c1603256
2018-07-22 15:15:54 +01:00
Charles Pigott
a3d1950b65
Codechange: Ensure that -lfreetype is always last when linking statically
...
Fixes weird bug with MinGW
2018-07-19 20:24:17 +02:00
Jonathan G Rennison
4d1bd8e4b4
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/genworld_gui.cpp
# src/gfx.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/music.cpp
# src/table/settings.ini
# src/town_cmd.cpp
# src/train_cmd.cpp
2018-06-25 18:57:48 +01:00
Jonathan G Rennison
b48a6ef368
Revert "Revert "Add: [Win32] Uniscribe configure options for MinGW targets.""
...
This reverts commit ca4a4869a2
2018-06-25 18:39:59 +01:00
glx
10d8b83038
Fix: library detection on MSYS2 file system
2018-06-17 21:56:46 +02:00
Jonathan G Rennison
ca4a4869a2
Revert "Add: [Win32] Uniscribe configure options for MinGW targets."
...
Revert "Change: [Win32] Use Uniscribe instead of ICU for text caret handling."
Revert "Change: [Win32/MSVC] Make the Uniscribe text layouter the windows default and remove usage of the deprecated ICU layout libs."
Revert "Add: [Win32] Text layout using the native Windows Uniscribe library."
Revert "Codechange: Move ParagraphLayouter-specific functions into factory classes instead of relying on overloads."
Revert "Add: [Win32] Native natural sort implementation."
This reverts commit cd966f3810eec3f4093133829dc6ab768a31bfe3a4278c302bf4394debdc#58 .
2018-06-13 01:46:19 +01:00
Jonathan G Rennison
8e9d68048a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/string.cpp
2018-06-07 06:49:18 +01:00
Michael Lutz
cd966f3810
Add: [Win32] Uniscribe configure options for MinGW targets.
2018-06-06 21:37:09 +02:00
Jonathan G Rennison
56be293107
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse2.cpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/ground_vehicle.cpp
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/newgrf_house.cpp
# src/newgrf_house.h
# src/town_cmd.cpp
# src/vehicle_base.h
# src/viewport_gui.cppp
2018-05-25 18:29:17 +01:00
Owen Rudge
7bd2fa3516
Feature: Add XAudio2 driver
2018-05-17 15:06:37 +01:00
Jonathan G Rennison
094e04a04d
Fix configure script detection of clang
...
See 00c16032
2018-05-10 01:05:40 +01:00
Jonathan G Rennison
ce80eedd96
Merge branch 'crashlog_improvements' into jgrpp
...
# Conflicts:
# config.lib
2018-05-06 12:04:14 +01:00
Jonathan G Rennison
ffa4f03128
Fix lib detection when using environment c/l flags
...
This was broken by f06061aa3b
2018-05-06 12:02:11 +01:00
Jonathan G Rennison
ad1c402ad8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/settings_type.h
# src/town_cmd.cpp
# src/window.cpp
2018-05-03 23:54:51 +01:00
Patric Stout
0165fe1283
Codechange: remove endian_check in favour of __BYTE_ORDER macro (Rubidium) ( #6762 )
2018-04-29 19:01:28 +02:00
Patric Stout
aef69443e7
Remove: WinCE support
2018-04-29 15:32:16 +02:00
Patric Stout
85adde7485
Remove: PSP support
2018-04-29 15:32:16 +02:00
Jonathan G Rennison
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
2018-04-27 02:42:20 +01:00
Jonathan G Rennison
f42cc19aad
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# Makefile.src.in
# src/crashlog.cpp
# src/crashlog.h
2018-04-27 00:33:44 +01:00
Jonathan G Rennison
b90c5b9618
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
2018-04-26 23:59:13 +01:00
Charles Pigott
00c1603256
Fix e614357: Ask the compiler who it is, instead of using symlinks ( #6727 )
...
This fixes #6723
2018-04-15 23:07:17 +02:00
Patric Stout
aaf7e98c77
Fix 6ac0790: don't show the location to / failure of 'realpath' every time ( #6719 )
2018-04-14 22:05:39 +02:00
Patric Stout
ae5628e903
Change: [Build] prioritize cc-build over build (based on patch by woutershep2) ( #6716 )
...
This closes #6414
2018-04-14 20:12:05 +02:00
Patric Stout
f06061aa3b
Change: [Build] use flags set by env at the end, not at the start (based on patch by adf88) ( #6715 )
...
This closes #6433
2018-04-14 20:11:49 +02:00
Victor Sergienko
6ac079020b
Fix e614357: MingW/MacOS/MacPorts don't have realpath, use reallink in those cases ( #6710 )
2018-04-12 23:46:09 +02:00
Charles Pigott
e47f646cb3
Fix e61435774b: Some systems don't have realpath ( #6705 )
2018-04-11 22:50:23 +02:00
Charles Pigott
e61435774b
Fix: Resolve symlinks when working out which compiler is being used
2018-04-11 18:24:19 +02:00
Charles Pigott
4b1a42c703
Codechange: Remove outdated assumption about FreeBSD's C compiler
2018-04-11 18:24:19 +02:00
Jonathan G Rennison
f77a368268
Merge branch 'crashlog_improvements' into jgrpp
2017-09-04 01:23:08 +01:00
Jonathan G Rennison
4a6ddb2d50
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# config.lib
2017-09-04 01:22:54 +01:00
Jonathan G Rennison
509e20406f
Merge branch 'master' into cpp-11
2017-09-04 01:22:19 +01:00
adf88
b3d37c0032
(svn r27902) -Feature [FS#6614]: Preserve PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR environment variables in config.cache file (just like other variabes CFLAGS, LDFLAGS etc.) so they can be resused when OpenTTD re-configures itself
2017-08-27 16:07:24 +00:00
adf88
2aa806842f
(svn r27902) -Feature [FS#6614]: Preserve PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR environment variables in config.cache file (just like other variabes CFLAGS, LDFLAGS etc.) so they can be resused when OpenTTD re-configures itself
2017-08-27 16:07:24 +00:00
Jonathan G Rennison
f3a0aace0c
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
2017-08-15 18:44:17 +01:00
Jonathan G Rennison
90cd312428
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios.h
2017-01-17 19:11:09 +00:00
michi_cc
3e7bdb0c73
(svn r27727) -Fix(-or-not) [FS#6295]: [OSX] Out-of-the-box compilation on newer OSX versions (dunn).
2017-01-08 17:00:18 +00:00
michi_cc
8ad28478a3
(svn r27727) -Fix(-or-not) [FS#6295]: [OSX] Out-of-the-box compilation on newer OSX versions (dunn).
2017-01-08 17:00:18 +00:00
Jonathan G Rennison
5c7f36ef4b
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
Further fixes for viewport lines/marker for multiplayer clients.
# Conflicts:
# src/lang/russian.txt
2016-12-26 15:38:56 +00:00
Jonathan G Rennison
56f173e15e
Merge branch 'master' into save_ext
2016-12-26 15:26:08 +00:00
frosch
d8a316d7c5
(svn r27709) -Fix-ish: Silence some warnings. (adf88)
2016-12-25 13:26:15 +00:00
frosch
4342798ff5
(svn r27709) -Fix-ish: Silence some warnings. (adf88)
2016-12-25 13:26:15 +00:00
frosch
ab3d5305a5
(svn r27703) -Change [FS#6532]: [gcc] Wnarrowing and Wfree-nonheap-object do no longer trigger in gcc 4.9.2, so reenable them.
2016-12-22 12:59:46 +00:00
frosch
41e5e7626e
(svn r27703) -Change [FS#6532]: [gcc] Wnarrowing and Wfree-nonheap-object do no longer trigger in gcc 4.9.2, so reenable them.
2016-12-22 12:59:46 +00:00
Jonathan G Rennison
f1999edbf0
Merge branch 'cpp-11' into jgrpp
2016-09-27 01:06:05 +01:00
Jonathan G Rennison
06f9c01986
Fix CPU pointer width detection in configure script.
2016-09-27 01:05:42 +01:00
Jonathan G Rennison
778d3f1352
Configure: Default to trying clang then gcc on OSX, gcc then clang elsewhere.
2016-09-08 23:14:02 +01:00
Jonathan G Rennison
5672b6c2c8
Enable custom allocator use on clang.
2016-09-08 20:09:42 +01:00
