miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,976 Commits 14 Branches 28 Tags
c1febca55fcbb91ecb5b13d71e62ba9bc896d913
Commit Graph

667 Commits

Author SHA1 Message Date
rubidium
b892103747 (svn r27557) -Fix: bashism that caused different CFLAGS with bash vs dash 2016-05-11 18:38:44 +00:00
rubidium
9ea3e42768 (svn r27557) -Fix: bashism that caused different CFLAGS with bash vs dash 2016-05-11 18:38:44 +00: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
planetmaker
e78ce08287 (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
562c269770 (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
d45969779d (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
c7c93c68b7 (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
d5810e5d65 (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
95ccddd6fe (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
b8bb123580 (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
2f267b9207 (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
a00d2b8b3c (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
a6710b7ea9 (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
8585cdc6c6 (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
69fac508c3 (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
9cadc0e150 (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
rubidium
b40f750243 (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
frosch
4fa052dd19 (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
5c80edb7ed (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
b1a9cf2ed8 (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
planetmaker
bc371a2d9e (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
rubidium
2361aaf601 (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
planetmaker
a58b74f997 (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
d60b2d04e4 (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
rubidium
f4a381f991 (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