summaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)Author
2006-03-29(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of ↵celestar
code and proofreading, thanks to peter1138 for another lot of code and ideas.
2006-03-29(svn r4149) -Codechange: [OSX] rewrite of how universal binaries are compiledbjarni
Now OSX stores object files in .OSX and instead of making FAT object files, there are one for each architecture Each architecture got their own targets to make a non-FAT binary and in the end, lipo will merge them into one binary It's now possible to select which architectures you want to support by defining OTTD_PPC, OTTD_PPC970 (G5) and/or OTTD_i386 All combos are supported. UNIVERSAL_BINARY and TRIPLE_BINARY can still be used even though it's possible to gain the same result by using the new flags Making a universal build when you already got part of it compiled (say the PPC part), it will reuse it and only compile the i386 part to save time Note: in some cases when you switch flags, you risk that openttd is not updated. Delete it and try again. The Makefile can't solve this except if it forces linking each time This fixes: FS#87 universal binary building borked in 0.4.7 Now universal binaries work on OSX 10.3.9 again Building universal binaries no longer needs to store flags in Makefile.config as the new design makes it possible to figure everything out automatically
2006-03-26(svn r4125) - Feature: Add a general TIC() TOC() mechanism using rdtsc or ↵Darkvater
something similar on non-i386 architectures to performance-tune (critical) code. Some systems are probably missing, but those can be added later.
2006-03-26(svn r4113) Moved all relevant map functions for stations to station_map.[ch]celestar
Some work with animated tiles remains. Thanks to Tron for parts of the code and lots of proof-reading and suggesting
2006-03-24(svn r4076) Back out r4074. It doesn't work and leads to make endlessly ↵tron
calling itself. NOTE: Delete Makefile.config to recover.
2006-03-23(svn r4074) -Feature: [Makefile] the makefile can now detect if iconv is ↵bjarni
present in the system if detected, WITH_ICONV will be defined in the C code WITH_ICONV is also added to Makefile.config OSX do not use this flag setting in Makefile.config, as it is set at compile time based on target OS version the actual C code is not changed as the current iconv code is hardcoded for OSX and would break if any other OS got iconv This detection system is by request of Darkvater
2006-03-22(svn r4019) -Fix: [OSX] stopped using iconv for 10.2.8, since it was added ↵bjarni
in 10.3 this have the sideeffect that 10.2.8 will still have the "failure to save with certain chars in the filename bug", but at least it can compile again
2006-03-18(svn r3966) -Fix: [OSX and some linux] [ 1157244 ] Can't save game if name ↵bjarni
contains german umlauts now it saves correctly, but the load window still display some chars wrong (fix by ln-)
2006-03-15(svn r3887) Add a function to get the other bridge end when you're at a ↵tron
bridge ramp
2006-03-15(svn r3884) renamed TRIPPLE_BINARY to TRIPLE_BINARYbjarni
2006-03-15(svn r3882) -Codechange: [OSX] changed the way universal and tripple ↵bjarni
binaries are build Instead of compiling a binary for each arch and then join them in the end, each .o file is now compiled as a fat file This means that the makefile will not call itself to make a binary for each target and we don't have to make clean between each build it also means that if one file changed, we don't have to recompile all files Another benefit is since it's handled at .o level and though LDFLAGS, no special code is needed if we decide to compile more binaries (like a lot of stuff used to happen at post linking) We also needs much less flags to set up, so it should be even easier to get to work out of the box now The tradeoff in doing so is that now the binary needs at least OSX 10.3.9 to execute To deal with this issue, the JAGUAR flag can be used to compile for older OSes. We will release a binary for old OSes at next release to see if anybody even downloads it (not that many people use OSX 10.2 anymore) GPMI will not work on 10.2 anyway so we will cut support for it some day anyway
2006-03-14(svn r3864) -Fix: small problems with make-system, making room for a ↵truelight
wrapper-configure
2006-03-06(svn r3777) Add some functions to handle tunnelstron
2006-03-05(svn r3766) Add a function to get the RoadBits from an arbitrary tiletron
2006-03-04(svn r3759) -Fix: [OSX] don't set CC_HOST to i686 gcc when compiling ↵bjarni
universal binaries on PPC without any Makefile.config. Introduced in 3674 (before that i686 used PPC as CC_HOST, but nobody noticed that)
2006-02-25(svn r3674) -Feature: [OSX] Added support for tripple binaries (binaries ↵bjarni
optimised for G3, G5 and i686) G4 have no problems using G3 code while G5 can, but really benefit from getting their own optimised code (Apple: G5 is not just a fast G4) Also changed FAT_BINARY to UNIVERSAL_BINARY since Apple removed most (all?) references to fat binaries on their homepage two days after I added FAT_BINARY
2006-02-25(svn r3673) -Codechange: [OSX] changed the makefile to autodetect if it ↵bjarni
compiles on G5 and then adds flags to optimise for G5 This will not interfere with crosscompiling or universal binaries
2006-02-20(svn r3622) - Partly revert r3214. The patch setting max_num_autosaves stays ↵Darkvater
to help control PDA-troubles which the commit was intended for. Didn't revert makefile-config version since it would cause trouble. But Bjarni promised to rewrite it :)
2006-02-17(svn r3611) -Feature: [OSX profiling] Shark (Xcode's profiling tool) can now ↵bjarni
relate CPU usage to lines in the source files Now OSX users can tell what lines in the C code that keeps the CPU busy instead of just ASM code Note: PROFILE needs to be enabled in Makefile.config for this to work
2006-02-07(svn r3574) - [Merge] [GPMI] -Fix: finally OTTD doesn't compile if you do a ↵Darkvater
'make mrproper' (TrueLight)
2006-02-03(svn r3525) - Rename station_newgrf.[ch] to newgrf_station.[ch], and update ↵peter1138
project files.
2006-02-03(svn r3524) - Split newgrf features from engine.[ch] into ↵peter1138
newgrf_engine.[ch], and add the new files to project files.
2006-02-01(svn r3507) - Fix: [Makefile] Make sure the ICON_DIR gets created before ↵matthijs
copying files there. - Fix: Fix small syntactic error in the manpage.
2006-01-29(svn r3474) -Fix: don't use CXXFLAGS for DEP and CFLAGS for Compile, gives ↵truelight
funny results ;)
2006-01-29(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it ↵Darkvater
in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron) - The only change is that the nsignalsw.grf file is kept and that existing nightlies with PBS signals get those signals converted to combo-signals.
2006-01-28(svn r3456) - Feature: [Makefile] Icons can now be installed in a seperate ↵matthijs
directory.
2006-01-07(svn r3383) -Code cleanup: [OSX] removed SDL support from FAT binaries as it ↵bjarni
caused problems for non-SDL builds FAT binaries now need to rely on COCOA drivers. SDL didn't work properly anyway
2006-01-07(svn r3382) -Feature: [OSX] added the flag JAGUAR to crosscompile for OSX ↵bjarni
10.2.8 on 10.4
2005-12-27(svn r3348) Dependency checking didn't include all compile parameters, which ↵tron
lead to wrong results
2005-12-25(svn r3340) Fix dependency calculation: dependencies didn't get recalculated ↵tron
if a header file changed Also really automagically create the dependency directories by deriving the directory names from $(DEPS)
2005-12-21(svn r3326) - Fix: [ 1226832 ] Build fails if SDL is built without pthread ↵Darkvater
support (dst)
2005-12-18(svn r3313) Remove GPMI related changes from trunktron
Revisions in detail: 2542, 3226 (partial), 3229, 3231, 3232, 3238, 3242-3245, 3251, 3253, 3260, 3263, 3265, 3266, 3269, 3277, 3278, 3279, 3283 (partial), 3304, 3305, 3306
2005-12-14(svn r3296) Warn about testing an undefined macro with #if - should most ↵tron
probably be #ifdef
2005-12-11(svn r3287) Turn the winres.o: openttd.rc special case into a normal %.o: ↵tron
%.rc rule
2005-12-10(svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)bjarni
you can still use SDL drivers if you like and you have to run "make upgradeconf" to start using the cocoa drivers (or manually write WITH_COCOA:=1) since SDL breaks the cocoa drivers, you can't compile with both SDL and cocoa support Using cocoa drivers makes it easier to make universal binaries and it solves: -FS#18 [OSX] SDL is weird in universal binaries -FS#2 [OSX] lazy pointer crash on exit -FS#10 [OSX] linking error when linking statically to SDL 1.2.8 (needless to explain this, but it means it should be able to compile statically with the default settings now) -[ 1215073 ] Switching to large size out of fullscreen crashes Using SDL drivers will still have those issues though
2005-12-10(svn r3280) Merge the seperate (C|CXX|OBJC)_SOURCES variables into a single ↵tron
variable SRCS Now adding a new file to compile is just adding a line like SRCS += $(FIILE), regardless of type
2005-12-09(svn r3276) reverted the last two commits. OSX 10.2 kept finding new stuff ↵bjarni
to prevent it from running OpenTTD, so now it's not supported anymore
2005-12-09(svn r3275) -Fix: [OSX] removed libpng support and error dialogs from jaguar ↵bjarni
crosscompiles to fix crash
2005-12-09(svn r3274) -Fix: [OSX] added JAGUAR flag to crosscompile for OSX 10.2 ↵bjarni
(codenamed jaguar) JAGUAR and FAT_BINARY can't be used at the same time JAGUAR will disable network support due to missing libs in 10.2
2005-12-09(svn r3273) -Fix: [OSX] PPC part of universal binaries now target 10.3 ↵bjarni
instead of 10.4 10.2 support appears to be broken right now Changed BUILD_UNIVERSAL_BINARY into FAT_BINARY (I got tired of typing)
2005-12-06(svn r3267) -Codechange: [OSX] universal binary makefile code cleanupbjarni
now PPC code is always compiled before x86 code strgen and lng files are only compiled once, which results in shorter building time the makefile now assigns default values to undefined values so much less needs to be set up the code is now easier to maintain
2005-12-06(svn r3264) -Codechange: [OSX] OSX targets will now always use the ↵bjarni
preprocessor to determine endianess this means that ENDIAN_FORCE is obsolite since it's always overwritten with PREPROCESSOR Since the preprocessor should never be able to pick wrong, it's easier this way specially when compiling universal binaries as they got both endianess
2005-12-06(svn r3262) -Fix: [OSX] universal binaries can now include the dynamic SDL ↵bjarni
lib into the bundle
2005-12-04(svn r3259) -Fix: [OSX] fixed that universal binaries did not make a bundlebjarni
2005-12-04(svn r3258) -Feature: [OSX] added support for universal binariesbjarni
it needs both PPC and x86 libs to compile due to this fact, compilation with libPNG or SDL is not tested (dedicated servers only) only PPC part is tested as I don't have x86 OSX
2005-12-03(svn r3257) -Codechange: [OSX] removed the dynamic lib in bundle option ↵bjarni
(introduced in rev 3230) it caused way more problems than it solved
2005-11-23(svn r3231) Fix: update the GPMI implementation to the latest GPMI-API versiontruelight
2005-11-23(svn r3230) -Feature: [OSX] OSX builds can now change where it searches for ↵bjarni
dynamic libs and can move libs into the bundle This is not a fix for the issues with static linking, more like a workaround. Static linking still got issues Apple recommends to use dynamic linking anyway, so I guess this doesn't matter much
2005-11-17(svn r3214) -Feature: openttd.cfg can now set how many autosaves to keep ↵bjarni
before starting to overwrite old ones max_autosave_num in the config files sets the number of autosaves to keep (default 16) MAX_NUM_AUTOSAVES in Makefile.config sets the default value. 16 is used if no value is given this behaviour can still be overwritten by keep_all_autosave (openttd.config setting) Note: this is a requested behaviour for PDA ports, since they got limited storage space
2005-11-12(svn r3167) - NewGRF: Start moving custom station code to separate files.peter1138
Rewrite handling of station classes. Allow for more than 8 station tile layouts. Start of code to unload custom stations.