| Age | Commit message (Collapse) | Author |
|---|
|
- A proper ./configure, so everything needs to be configured only once, not for every make.
- Usage of makedepend when available. This greatly reduces the time needed for generating the dependencies.
- A generator for all project files. There is a single file with sources, which is used to generate Makefiles and the project files for MSVC.
- Proper support for OSX universal binaries.
- Object files for non-MSVC compiles are also placed in separate directories, making is faster to switch between debug and release compiles and it does not touch the directory with the source files.
- Functionality to make a bundle of all needed files for for example a nightly or distribution of a binary with all needed GRFs and language files.
Note: as this merge moves almost all files, it is recommended to make a backup of your working copy before updating your working copy.
|
|
console.txt, since we don't have that file anymore (this made dmg building fail)
-Cleanup: [OSX] removed the link files since they aren't needed and broken anyway
|
|
Also removed all the Makefile code regarding this flag since it's no longer needed
Removed documentation about special limitations regarding running the game on OSX 10.2
OpenTTD now officially needs OSX 10.3.9 to work correctly (the trunk needed that for months)
|
|
|
|
data dir contained subdirs (now copies the subdirs as well)
-Fix: [OSX] allow subdirs in scenario when using make release (copies the subdirs as well)
-Fix: [OSX] removed an outdated line in make release that prevented the creation of the dmg file
|
|
since the target is long gone. Also corrected BUILD_OSX_BUNDLE as phony target
|
|
(lib) crashes
now OSX strips after linking again
|
|
exeption
|
|
-Fix: do not use hardcoded names for things like 'strip', keep it configurable!!
|
|
|
|
|
|
support and users for testing.
|
|
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
|
|
-added an explanation to why there is a special Jaguar download (people appears to download it even when they should download the other one)
-removed the long outdated README_if_game_crashed_on_OSX.txt
|
|
binary building and removed an absolute path for hdiutil (I don't thin anybody will have it at a non-default place, but still)
|
|
os/macosx/Makefile) easier to use since it gives the release disk image the right name automatically
it now uses REV instead of RELEASE, which means RELEASE is not needed to be set manaully anymore
it also automatically adds "-jaguar" when making a build aimed at OSX 10.2 (codenamed jaguar)
|
|
|
|
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
|
|
the package is long gone and people don't read a doc about a missing package when they don't expect to find one
the doc is called install even though it's not a real install and have nothing to do with make install. People just read it the first time they see it when it's called install ;)
|
|
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
|
|
caused problems for non-SDL builds
FAT binaries now need to rely on COCOA drivers. SDL didn't work properly anyway
|
|
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
|
|
to prevent it from running OpenTTD, so now it's not supported anymore
|
|
(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
|
|
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)
|
|
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
|
|
lib into the bundle
|
|
|
|
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
|
|
(introduced in rev 3230)
it caused way more problems than it solved
|
|
place before linking if -j 2 was used
|
|
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
|
