Commit Graph

129 Commits (f2fd789cc635f6bdce0d52803676ed74db866616)

Author SHA1 Message Date
bjarni dcad28dd22 (svn r6432) -Fix r4987: [OSX] added CCFLAGS to OSX targets as well 18 years ago
bjarni 54ff6ac968 (svn r6357) -Cleanup: [OSX] corrected some info for the bundle (info window in finder) 18 years ago
rubidium 86dc219b4b (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc. 18 years ago
truelight 7abad2b20e (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
- New optional landscape generator (TerraGenesis Perlin)
  - Load heightmaps (either BMP or PNG)
  - Progress dialog while generating worlds (no longer a 'hanging' screen)
  - New dialogs for NewGame, Create Scenario and Play Heightmap
    - Easier to configure your landscape
    - More things to configure (tree-placer, ..)
  - Speedup of world generation
  - New console command 'restart': restart the map EXACTLY as it was when you
      first started it (needs a game made after or with this commit)
  - New console command 'getseed': get the seed of your map and share it with
      others (of course only works with generated maps)
  - Many new, world generation related, things
  - Many internal cleanups and rewrites
  Many tnx to those people who helped making this:
     Belugas, DaleStan, glx, KUDr, RichK67, Rubidium, and TrueLight (alfabetic)
  Many tnx to those who helped testing:
     Arnau, Bjarni, and tokai (alfabetic)
  And to all other people who helped testing and sending comments / bugs
  Stats: 673 lines changed, 3534 new lines, 79 new strings
18 years ago
Darkvater f0a476e7ca (svn r5866) - Forward-port the release-changes from the 0.4 branch back to trunk. This ensures an updated changelog, known-bugs, etc. 18 years ago
bjarni 9b9efcc16e (svn r5759) -Fix: [OSX] fixed issue where the bundle was not build if the 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
18 years ago
Darkvater 15516f5de5 (svn r5688) - Forward-port the release-changes from the 0.4 branch back to trunk. This ensures an updated changelog, known-bugs, etc. 18 years ago
bjarni 77d3d20941 (svn r5438) -Code cleanup [OSX] removed UNIVERSAL_BINARY as a phony target since the target is long gone. Also corrected BUILD_OSX_BUNDLE as phony target 18 years ago
Darkvater cec0e23a34 (svn r5415) - Forward-port the release-changes from the 0.4 branch back to trunk. This ensures an updated changelog, known-bugs, etc. 18 years ago
tron 020721565a (svn r5136) Fix various style bugs:
- Trailing whitespace
- Trailing empty lines
- Missing newline at EOF
- Missing svn:eol-style native
18 years ago
bjarni d5bb8a3267 (svn r4997) -Fix: [OSX] reverted the OSX part of rev 4994 as it caused dyld (lib) crashes
now OSX strips after linking again
18 years ago
truelight 7bd65117af (svn r4994) -Fix: changed the stripping parts a bit. OSX is no longer an exeption 18 years ago
truelight 4941e487c2 (svn r4991) -Fix: don't compile UNITTEST by default, it isn't needed
-Fix: do not use hardcoded names for things like 'strip', keep it configurable!!
18 years ago
truelight ca7bbd262b (svn r4990) -Fix: use CXX to link MacOSX OpenTTD, not CC 18 years ago
truelight a887a529a0 (svn r4989) -Fix: make the OSX Makefile stuff to work with the compile-farm 18 years ago
KUDr 308f27a3de (svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing. 18 years ago
orudge ff3c61b011 (svn r4204) - Get trunk compiling again on OS/2 19 years ago
bjarni f6662e056d (svn r4149) -Codechange: [OSX] rewrite of how universal binaries are compiled
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
19 years ago
Darkvater 3cc69d7b48 (svn r4123) - Forward-port the release-changes from the 0.4 branch back to trunk. This ensures an updated changelog, known-bugs, etc. 19 years ago
bjarni 85c49764e1 (svn r4084) -Documentation: [OSX] changed OSX specific docs
-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
19 years ago
tron 6b40512a3c (svn r4076) Back out r4074. It doesn't work and leads to make endlessly calling itself. NOTE: Delete Makefile.config to recover. 19 years ago
bjarni 41f4c473da (svn r4074) -Feature: [Makefile] the makefile can now detect if iconv is 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
19 years ago
bjarni e271479136 (svn r4061) -Codechange: [OSX] removed some long dead flags for universal binary building and removed an absolute path for hdiutil (I don't thin anybody will have it at a non-default place, but still) 19 years ago
bjarni 15f72ab7f4 (svn r4060) -Codechange: [OSX] made the release target (in 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)
19 years ago
matthijs 44aa29a005 (svn r4033) - Codechange: [Debian] Update debian packaging files to use debconf for user interaction. 19 years ago
bjarni 14b12efa4a (svn r4019) -Fix: [OSX] stopped using iconv for 10.2.8, since it was added 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
19 years ago
bjarni 38569fe229 (svn r3884) renamed TRIPPLE_BINARY to TRIPLE_BINARY 19 years ago
bjarni 3ebc41c9fe (svn r3882) -Codechange: [OSX] changed the way universal and tripple 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
19 years ago
matthijs 13cadd18df (svn r3801) * Update debian packaging files to the ones used for releasing 0.4.5 (see os/debian/changelog for details).
* Fix a small debconf issue which was in the 0.4.5 release.
19 years ago
tron 6305db895e (svn r3745) Fix two buffer overflows, one case of undefined behavior (the destination buffer of sprintf() may not alias with one of its arguments) and some other minor stuff introduced in r3740 19 years ago
bjarni a8a8cf7b56 (svn r3740) -Feature: [OSX] added OS version, CPU type and newGRF settings to assert window and a message to tell people to add that to a bug report
It also adds a new error window, which can be used just like assert, but it is also active when asserts are turned off
	This is useful for places where it's really important to check even if assert is turned off. It's not used in the code yet
19 years ago
bjarni 301f91c71c (svn r3682) -Fix: didn't write $ correct in G5_detector in r3673, which caused problems for tortoisesvn 19 years ago
bjarni 569b1939c6 (svn r3679) -Fix: [OSX] fixed warning introduced in r3670 about permission denied in G5_detector.c when compiling without having Makefile.config 19 years ago
bjarni 04f072c3c1 (svn r3676) -Change: [OSX] changed info about package to how to install the game
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 ;)
19 years ago
bjarni 419bd4fb89 (svn r3675) -Fix: [OSX] made the default gcc names for building universal binaries into the newest gcc for each target instead of hardcoding it for 4.0.0 19 years ago
bjarni b764f8d676 (svn r3674) -Feature: [OSX] Added support for tripple binaries (binaries 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
19 years ago
bjarni 8e7c2555fe (svn r3673) -Codechange: [OSX] changed the makefile to autodetect if it compiles on G5 and then adds flags to optimise for G5
This will not interfere with crosscompiling or universal binaries
19 years ago
bjarni 8744075a6c (svn r3596) -Codechange: [OSX] changed to use Apple's macros instead of OTTD macros for endian conversion
This increases the execution speed a lot since GCC can't detect the OTTD macro as an endian conversion
	while Apple's code uses the instruction to convert endian instead of a series of instructions to produce the same result

	Since we don't have that many endian conversions in the game, overall performance should not increase noteworthy
19 years ago
peter1138 49e51cf27f (svn r3512) Yet more whitespace fixes (mostly by Rubidium) 19 years ago
Darkvater b3e08febc6 (svn r3502) - Update appropiate files with release information for 0.4.5 19 years ago
peter1138 68fb066a64 (svn r3395) Add Id tag (and svn property) to macosx files. 19 years ago
bjarni db3d226c52 (svn r3383) -Code cleanup: [OSX] removed SDL support from FAT binaries as it caused problems for non-SDL builds
FAT binaries now need to rely on COCOA drivers. SDL didn't work properly anyway
19 years ago
bjarni a8a2b93df5 (svn r3382) -Feature: [OSX] added the flag JAGUAR to crosscompile for OSX 10.2.8 on 10.4 19 years ago
truelight a1f8309453 (svn r3375) -Add: [ FS#29 ] show an error dialog for OSX cocoa driver (egladil) 19 years ago
Darkvater a5678b9700 (svn r3324) - Codechange: set native eol-style on missing files not yet set so 19 years ago
bjarni 1adc1738f7 (svn r3286) -Fix: [OSX] 10.2 works again and universal binaries got 10.2 as target by default 19 years ago
bjarni 50a1e16943 (svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
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
19 years ago
bjarni 3923eab424 (svn r3276) reverted the last two commits. OSX 10.2 kept finding new stuff to prevent it from running OpenTTD, so now it's not supported anymore 19 years ago
bjarni 073aae307e (svn r3275) -Fix: [OSX] removed libpng support and error dialogs from jaguar crosscompiles to fix crash 19 years ago
bjarni 98ef748715 (svn r3274) -Fix: [OSX] added JAGUAR flag to crosscompile for OSX 10.2 (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
19 years ago