dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,060 Commits 1 Branch 0 Tags
1df56993ead01636a9f08e4d9acb97aaaa455378
Commit Graph

747 Commits

Author SHA1 Message Date
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 cd966f3810.
This reverts commit eec3f40931.
This reverts commit 33829dc6ab.
This reverts commit 768a31bfe3.
This reverts commit a4278c302b.
This reverts commit f4394debdc.

This is to fix various problems and crashes with text rendering
and font handling on Windows.

See #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
Jonathan G Rennison
8ad53acfef Merge branch 'crashlog_improvements' into jgrpp 2016-09-08 19:41:53 +01:00
Jonathan G Rennison
c59509c2aa Use -gline-tables-only instead of -g1 on clang. 2016-09-08 19:38:13 +01:00
Jonathan G Rennison
f7774415f2 Merge branch 'cpp-11' into crashlog_improvements 
# Conflicts:
#	src/stdafx.h
 2016-09-08 19:36:00 +01:00
Jonathan G Rennison
8a2f9311a9 Include -01 in CFLAGS_BUILD when using clang. 2016-09-08 19:31:40 +01:00
Jonathan G Rennison
5e67582a64 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	config.lib
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
 2016-09-07 22:02:57 +01:00
Jonathan G Rennison
2fe7571034 Require C++11 support. 
Set minimum compiler versions to:
GCC 4.7
clang 3.3
ICC 14.0
 2016-09-05 22:45:57 +01:00
frosch
533cb7c156 (svn r27654) -Change: Enable C++11 for clang 3.3 (LordAro) 2016-09-05 19:11:01 +00:00
frosch
ac6793dace (svn r27654) -Change: Enable C++11 for clang 3.3 (LordAro) 2016-09-05 19:11:01 +00:00