Commit Graph

141 Commits

Author SHA1 Message Date
Darkvater
3fce857f1c (svn r7973) - Forward-port the release-changes from the 0.5 branch back to trunk. This ensures an updated changelog, readme, et. 2007-01-08 00:16:03 +00:00
Darkvater
9961e309ea (svn r7934) -Cleanup: [win32] Remove unused and totally useless files. 2007-01-06 23:47:59 +00:00
rubidium
e0c46049df (svn r7768) -Fix (r7765): use $(MAKE) instead of make in the debian rules. 2007-01-02 21:29:11 +00:00
rubidium
30635a98ef (svn r7765) -Fix (r7759): forgot to update the os/debian files. 2007-01-02 20:35:16 +00:00
rubidium
013df98f79 (svn r7759) -Merge: makefile rewrite. This merge features:
- 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.
2007-01-02 19:19:48 +00:00
Darkvater
1319954a5d (svn r7695) - Forward-port the release-changes from the 0.5 branch back to trunk. This ensures an updated changelog, readme, et. 2006-12-31 11:36:11 +00:00
bjarni
06852337c8 (svn r7626) -Fix r7600: [OSX] building release dmg files no longer includes 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
2006-12-29 21:46:21 +00:00
matthijs
ba670cb9bd (svn r7625) * Change debian packaging version to support proper upgrading from/to release versions. 2006-12-29 21:30:31 +00:00
bjarni
13f2a34396 (svn r7588) -Change: [OSX] removed the flag JAGUAR since it didn't work 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)
2006-12-28 01:24:00 +00:00
Darkvater
dd6c97e4f4 (svn r7577) -Fix (r7565): Missed out some OSX files (Bjarni) 2006-12-27 14:27:30 +00:00
matthijs
e71e1fd044 (svn r7533) -Codechange [Debian]: Update debian packaging files
- Update to latest standards version.
	- Fix rules to compile only once.
2006-12-21 14:44:19 +00:00
Darkvater
85da0eb990 (svn r7527) -Update appropiate files with release information for 0.5.0-RC1 2006-12-21 14:23:47 +00:00
bjarni
dcad28dd22 (svn r6432) -Fix r4987: [OSX] added CCFLAGS to OSX targets as well 2006-09-08 20:00:19 +00:00
bjarni
54ff6ac968 (svn r6357) -Cleanup: [OSX] corrected some info for the bundle (info window in finder) 2006-09-03 15:45:48 +00:00
rubidium
86dc219b4b (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc. 2006-08-28 18:53:03 +00:00
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
2006-08-19 10:00:30 +00:00
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. 2006-08-12 17:33:05 +00:00
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
2006-08-04 22:26:44 +00:00
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. 2006-07-31 22:40:55 +00:00
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 2006-07-01 10:32:46 +00:00
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. 2006-06-28 23:05:00 +00:00
tron
020721565a (svn r5136) Fix various style bugs:
- Trailing whitespace
- Trailing empty lines
- Missing newline at EOF
- Missing svn:eol-style native
2006-06-05 18:10:43 +00:00
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
2006-05-27 23:16:37 +00:00
truelight
7bd65117af (svn r4994) -Fix: changed the stripping parts a bit. OSX is no longer an exeption 2006-05-27 20:51:57 +00:00
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!!
2006-05-27 18:17:10 +00:00
truelight
ca7bbd262b (svn r4990) -Fix: use CXX to link MacOSX OpenTTD, not CC 2006-05-27 17:53:31 +00:00
truelight
a887a529a0 (svn r4989) -Fix: make the OSX Makefile stuff to work with the compile-farm 2006-05-27 17:51:11 +00:00
KUDr
308f27a3de (svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing. 2006-05-27 16:12:16 +00:00
orudge
ff3c61b011 (svn r4204) - Get trunk compiling again on OS/2 2006-03-31 16:01:59 +00:00
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
2006-03-29 16:28:41 +00:00
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. 2006-03-26 21:07:56 +00:00
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
2006-03-24 10:53:49 +00:00
tron
6b40512a3c (svn r4076) Back out r4074. It doesn't work and leads to make endlessly calling itself. NOTE: Delete Makefile.config to recover. 2006-03-24 06:40:49 +00:00
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
2006-03-23 23:54:43 +00:00
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) 2006-03-23 13:40:33 +00:00
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)
2006-03-23 13:29:58 +00:00
matthijs
44aa29a005 (svn r4033) - Codechange: [Debian] Update debian packaging files to use debconf for user interaction. 2006-03-22 21:08:05 +00:00
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
2006-03-22 13:06:50 +00:00
bjarni
38569fe229 (svn r3884) renamed TRIPPLE_BINARY to TRIPLE_BINARY 2006-03-15 14:11:17 +00:00
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
2006-03-15 14:03:09 +00:00
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.
2006-03-08 23:12:38 +00:00
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 2006-03-03 07:51:41 +00:00
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
2006-03-02 21:43:09 +00:00
bjarni
301f91c71c (svn r3682) -Fix: didn't write $ correct in G5_detector in r3673, which caused problems for tortoisesvn 2006-02-27 19:49:53 +00:00
bjarni
569b1939c6 (svn r3679) -Fix: [OSX] fixed warning introduced in r3670 about permission denied in G5_detector.c when compiling without having Makefile.config 2006-02-27 16:58:26 +00:00
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 ;)
2006-02-26 19:02:09 +00:00
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 2006-02-25 22:03:30 +00:00
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
2006-02-25 21:25:23 +00:00
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
2006-02-25 18:11:11 +00:00
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
2006-02-12 14:31:33 +00:00