Commit Graph

250 Commits (9953b6a2f1bcda2849644a0558dddb06231f75b8)

Author SHA1 Message Date
Darkvater 317bd06971 (svn r3622) - Partly revert r3214. The patch setting max_num_autosaves stays 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 :) 19 years ago
bjarni 3161c5973e (svn r3611) -Feature: [OSX profiling] Shark (Xcode's profiling tool) can now 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
19 years ago
Darkvater 3d1fa51e69 (svn r3574) - [Merge] [GPMI] -Fix: finally OTTD doesn't compile if you do a 'make mrproper' (TrueLight) 19 years ago
peter1138 50ff85428b (svn r3525) - Rename station_newgrf.[ch] to newgrf_station.[ch], and update project files. 19 years ago
peter1138 6c28b1cec7 (svn r3524) - Split newgrf features from engine.[ch] into newgrf_engine.[ch], and add the new files to project files. 19 years ago
matthijs a893361692 (svn r3507) - Fix: [Makefile] Make sure the ICON_DIR gets created before copying files there.
- Fix: Fix small syntactic error in the manpage.
19 years ago
truelight 38b9d233af (svn r3474) -Fix: don't use CXXFLAGS for DEP and CFLAGS for Compile, gives funny results ;) 19 years ago
Darkvater 4014e36aec (svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it 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.
19 years ago
matthijs 5e2c06752f (svn r3456) - Feature: [Makefile] Icons can now be installed in a seperate directory. 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
tron c6ea133746 (svn r3348) Dependency checking didn't include all compile parameters, which lead to wrong results 19 years ago
tron 0e12ad7d99 (svn r3340) Fix dependency calculation: dependencies didn't get recalculated if a header file changed
Also really automagically create the dependency directories by deriving the directory names from $(DEPS)
19 years ago
Darkvater 97521e3fdd (svn r3326) - Fix: [ 1226832 ] Build fails if SDL is built without pthread support (dst) 19 years ago
tron d5aa95b87e (svn r3313) Remove GPMI related changes from trunk
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
19 years ago
tron ae624ee690 (svn r3296) Warn about testing an undefined macro with #if - should most probably be #ifdef 19 years ago
tron 0d1c598833 (svn r3287) Turn the winres.o: openttd.rc special case into a normal %.o: %.rc rule 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
tron c0218be57a (svn r3280) Merge the seperate (C|CXX|OBJC)_SOURCES variables into a single variable SRCS
Now adding a new file to compile is just adding a line like SRCS += $(FIILE), regardless of type
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
bjarni 79b76e2397 (svn r3273) -Fix: [OSX] PPC part of universal binaries now target 10.3 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)
19 years ago
bjarni 967abb24e4 (svn r3267) -Codechange: [OSX] universal binary makefile code cleanup
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
19 years ago
bjarni 20e20000f2 (svn r3264) -Codechange: [OSX] OSX targets will now always use the 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
19 years ago
bjarni c2153e7419 (svn r3262) -Fix: [OSX] universal binaries can now include the dynamic SDL lib into the bundle 19 years ago
bjarni cfc4753ba6 (svn r3259) -Fix: [OSX] fixed that universal binaries did not make a bundle 19 years ago
bjarni e273fe2f33 (svn r3258) -Feature: [OSX] added support for universal binaries
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
19 years ago
bjarni 4550c2361d (svn r3257) -Codechange: [OSX] removed the dynamic lib in bundle option (introduced in rev 3230)
it caused way more problems than it solved
19 years ago
truelight 062d654df1 (svn r3231) Fix: update the GPMI implementation to the latest GPMI-API version 19 years ago
bjarni 97b3afe9ae (svn r3230) -Feature: [OSX] OSX builds can now change where it searches for 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
19 years ago
bjarni 8b4d7f97da (svn r3214) -Feature: openttd.cfg can now set how many autosaves to keep 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
19 years ago
peter1138 12009af1c5 (svn r3167) - NewGRF: Start moving custom station code to separate files.
Rewrite handling of station classes.
          Allow for more than 8 station tile layouts.
          Start of code to unload custom stations.
19 years ago
truelight 35b8ada5f8 (svn r3113) -Fix: The Makefile had 64bit code which was obsolete, not to say wrong.
This removes all the 64bit stuff from the Makefile. Everything should 
  work just fine. Also removed the warning on amd64, 64bit OpenTTD is 
  stable. Tnx to dst for commenting and testing on this subject.
19 years ago
bjarni 85002131fe (svn r3088) -Fix: [OSX] fixed issue where OSX could not dynamic link to quicktime [ 1334917 ] 19 years ago
bjarni a949e6d3d0 (svn r3031) forgot 1 file and two lines in rev 3029 (mac midi stuff) 19 years ago
bjarni 4eb7a0ac6b (svn r3029) -Change: [OSX] removed the buggy java midi player, which was rendered obsolite by r3022 19 years ago
bjarni 354320527a (svn r3026) -Fix: [OSX] fixed bug that prevented dedicated servers from compiling (introduced in r3022) 19 years ago
bjarni 488db23ed8 (svn r3023) -Fix [BeOS] fixed compilation on BeOS R5 (MYOB) 19 years ago
bjarni cebca8e61b (svn r3022) -feature: [OSX] OSX now uses quicktime to play midi files
this eliminates the long pauses between songs and the "leaving process hehind" bug (moebius_)
19 years ago
truelight 6145b99c22 (svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
-Fix: removed the ability for the oldAI to cheat (this will criple him somewhat)
-Add: base-code for many improvements to come in the AI-system
-Add: added base-code for multiplayer AIs (DOES NOT WORK YET!)
19 years ago
truelight 620f36acb6 (svn r2907) -Codechange: splitted the AIs to their own directory. AINew becomes 'trolly', AIOld becomes 'default', both in their own dir in the 'ai' dir. More AIs to come. 19 years ago
Darkvater bb05a9a504 (svn r2904) Stupid editors, and renaming files with the same name just different casing is not really possible, so here comes another commit 19 years ago
Darkvater d37cb0eb78 (svn r2903) Fix case mismatch for ottdmidi java file (moebius) 19 years ago
tron 1e862e9da8 (svn r2895) Remove unused variables and bring a comment closer to reality 19 years ago
tron c7a6af38fe (svn r2882) Some fixes for MorphOS (by tokai)
- Don't track dependencies on system headers
- Add an include path
- Silence a warning regarding a bad signal prototype
- Remove executable flag from pictures
- Add proper OTTD icon
19 years ago
tron a7d6b41c6a (svn r2866) Move all functions and tables which aren't directly involved in managing the sprite heap to a new file gfxinit.c.
This doesn't ease the global variable mess, but makes the distinction between sprite heap and gfx loading routines easier.
19 years ago
tron 2aebbaeecd (svn r2853) Add missing dependencies and flags to the dependency targets and make the info target more informative 19 years ago
tron 8d3afd666b (svn r2843) OSX doesn't like OBJC, so give it back its beloved CC, because it's the only ObjectiveC consumer 19 years ago
tron 69eb13c504 (svn r2841) Pimp the Makefile: Determining the header dependencies is now a separate step.
This should fix the dependency related problems and reduce the number of recompiled files when table/strings.h changes
19 years ago
tron 080c62526d (svn r2826) Remove another write-only variable, thanks glx 19 years ago
truelight 01f9cec6df (svn r2825) -Fix: GCC that put deps in the wrong dirs can now compile OTTD again 19 years ago
truelight 36d717d77a (svn r2824) -Fix: OSX can now also produce dedicated servers 19 years ago
truelight 48d8f9da3f (svn r2823) -Fix: MorphOS doesn't have pthread either! 19 years ago
truelight 479b98980c (svn r2822) -Fix: don't compile pthread for win32 dedicated servers 19 years ago
tron b62887b973 (svn r2815) Store the currency information in one central place instead of scattering it in several unrelated files 19 years ago
tron f315c95fa1 (svn r2809) Implement more generic threading functions, which allow more than one thread 19 years ago
tron 3c916a2dfe (svn r2760) Remove stale comments, long unused stuff and simplify some checks 19 years ago
ludde b8c9194b7c (svn r2756) Renamed railtypes into _railtypes
Renamed railtypes.c into railtypes.h, all other tables are in .h files. (It should be in the tables dir but I couldn't figure out how to get it there without deleting it first).
Added const and extern.
19 years ago
celestar f287f2ff8d (svn r2753) -Codechange: Introduced a new struct "RailtypeInfo" to store rail type specific information. Begun populating it with a bunch of sprites, more to come later. This should result in cleaner, more compact code which allows easy introduction of new railtypes. 19 years ago
tron 81be08bc21 (svn r2712) Overhaul DirectMusic MIDI backend:
- Merge the .c and .cpp part into one file
- Properly deinitialize at the end
- Remove "experimental" status
- Miscellaneous smaller changes
-Fix: Volume control works now
19 years ago
tron 2faf06f4cd (svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build 19 years ago
bjarni f1c254befa (svn r2703) - Feature: [OSX] Added a native alert window to show whatever error() needs to print (Tobin made this, while I fixed some issued in it)
- As a bonus, we now have an objective C file (os/macosx/macos.m) to use the functions Apple made to interact with OS stuff
19 years ago
tron 1492a04844 (svn r2700) Insert Id tag into the Makefile 19 years ago
tron 393f4b2149 (svn r2691) Separate dedicated video driver and fix bemidi declarations 19 years ago
tron 9bb81b8eef (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my... 19 years ago
tron 126fed74d6 (svn r2685) -Codechange: Split the music/sound/video drivers into separate files and move them into subfolders.
This results in shorter and hopefully easier to maintain files.
Note: I had to change paths in #include statements of some unrelated files, because I added the ottd base directory to the include path (-I.)
19 years ago
tron f3c14486be (svn r2616) Don't stop when compiling a language fails, just delete the defective .lng 19 years ago
truelight a28295b394 (svn r2606) -Codechange: renamed ai.c to ai_old.c, and ai.h to ai_new.h to make room
for a global AI-handler
19 years ago
Darkvater bc11fe03ee (svn r2585) - Fix [Makefile]: some small cleanups, remove warnings, and add mersenne to makefile (Luca) 19 years ago
truelight 48b3b8699d (svn r2542) -Add: [GPMI] Added GPMI (http://sourceforge.net/projects/libgpmi/)
support to OpenTTD in preperation of AIScripts (long term). It is OFF 
  by default. Add GPMI:=1 to Makefile.config to enable.
19 years ago
hackykid ab9c6f126d (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
- Feature: [pbs] Implement autoplacement of pbs blocks, when a block has an entry and an exit pbs signal, covert the entire block to pbs. Can be turned off in the patch settings.
 - Feature: [pbs] Allow showing of reserved status by making the tracks darker, when the pbs debug level is at least 1.
19 years ago
celestar 48ff5e39dc (svn r2491) -Fix: Solved a performance problem introduced in r2467. While busy
committing, restore the sort order in the Makefile
19 years ago
bjarni 83943cd246 (svn r2461) -Feature [Makefile] libpng-config can now be called something else in Makefile.config
useful if you for some reason got a libpng-config, which is called something else
19 years ago
truelight fc2f5b79ef (svn r2458) -Fix: Quickfix to make dedicated-server compile again. We need a more ellegant way to fix this... 20 years ago
truelight d6cd0bdcac (svn r2457) -Fix: typo in Makefile for OSX builds 20 years ago
matthijs 1876744744 (svn r2448) General cleanup of rail related code, more to follow.
* Add: rail.[ch] for rail-related enums and wrapper functions.
* Codechange: Removed dozens of magic numbers with below enums.
* Codechange: Rewrote CheckTrackCombination().
* Add: TILE_SIZE, TILE_PIXELS and TILE_HEIGHT constants.
* Add: enums RailTileType, RailTileSubtype, SignalType to mask against the map arrays.
* Add: enums Track, TrackBits, Trackdir, TrackdirBits for railway track data. (Note that the old RAIL_BIT constants are replaced by TRACK_BIT ones).
* Add: enums Direction and DiagDirection
* Codechange: Moved a bunch of track(dir) related lookup arrays from npf.[ch] to rail.[ch].
* Codechange: move RailType enum from tile.h to rail.h.
* Add: Wrapper functions for masking signal status in the map arrays: SignalAlongTrackdir, SignalAgainstTrackdir and SignalOnTrack.
* Add: Wrapper functions to access rail tiles, using above enums
* Add: Wrapper functions to modify tracks, trackdirs, directions, etc.
* Add: Wrapper functions for all lookup arrays in rail.[ch] (Arrays are still used in parts of the code)
* Codechange: Renamed some variables and arguments to better represent what they contain (railbit -> track, bits -> trackdirbits, etc.). 
* Codechange: Don't use FindLandscapeHeight() in CmdRemoveSingleRail(), since it returns way too much info. Use GetTileSlope() instead.
* Codechange: [NPF] Removed some unused globals and code from npf.c.
20 years ago
Darkvater ba8c649fac (svn r2397) - CodeChange: rename all "ttd" files to "openttd" files. 20 years ago
matthijs 457434ea59 (svn r2371) - Fix: [ 1144510 ] make install tries to install scenarios in the (non-existing) personal dir when USE_HOMEDIR is specified.
This fix solves the issue for now by installing scenarios in the system-wide data dir.
- Add: 32x32 xpm format icon, used for debian packaging.
- Some minor updates to the os/debian directory.
20 years ago
Darkvater 6b794ede3b (svn r2334) - Fix (regression): moved togglefullscreen into the video-driver, now windows works, dedicated works and sdl works. Also reverted the change to the makefile. 20 years ago
Darkvater 21b99af344 (svn r2330) - Fix: link error when compiling as dedicated. Add sdl.c to always compile in makefile as it is always protected by WITH_SDL and add a stub for ToggleFullScreen() 20 years ago
tron 14f482aeb5 (svn r2328) There's no need for extra magic to detect libpng on FreeBSD 20 years ago
bjarni fd9d6e2fc6 (svn r2327) -fix [MacOSX] default path for midi player on mac is now correct again 20 years ago
Darkvater ed5cf7b28f (svn r2314) - Feature: [ 1187490 ] Patches for building on IRIX (jgilje) 20 years ago
truelight e58773e6ce (svn r2226) -Fix: 2 other capital problems for the OSX part of the Makefile 20 years ago
truelight 27f80e09e3 (svn r2225) -Fix: split the endian-detection to target/host. Now cross-compiling
on i386-linux for MacOSX should also work for the language-files (strgen issues)
20 years ago
truelight b195b77906 (svn r2224) -Fix: capital-correctness for OSX-dir-names 20 years ago
bjarni 9bd93a1148 (svn r2198) renamed MacOS to MacOSX where it was written wrong. Made myself MacOSX porter as well as coder 20 years ago
bjarni dadec920a0 (svn r2197) -fix [Makefile]: SDL_CONFIG from makefile.config is now not always overwritten
-fix [OSX]: fixed issue where OSX could not compile the java MIDI app if SHOW_WARNINGS was on (introduced in r1917)
-fix [OSX]: the midi class file is now also deleted with make clear
20 years ago
TrueLight 6ff14a99cb (svn r2196) -Change: updated the Makefile, now it works for crossplatform compiling
(and distcc compiling via Makefile.config). Wiki is coming up soon! Big
tnx to Bjarni and Lucaspiller.
20 years ago
tron c75d699b02 (svn r2133) Fix dependency tracking for C++ files 20 years ago
pasky 68da823951 (svn r2088) - Fix: [ 1155158 ] Make extmidi command a config option in addition to the compile-time MIDI switch. Patch by macbaine. 20 years ago
truelight d1e158d6f7 (svn r2046) -Codechange: moved all waypoint code to waypoint.c/waypoint.h
-Codechange: rewrote some functions while moving waypoint-stuff
-Add: added support for 64k waypoints
-Fix: made the waypoint struct a bit more logic (no bit-fucking)
20 years ago
tron b40a2fcd0d (svn r2000) Split the sound system into backend (mixer.[ch]) and frontend (sound.[ch]) 20 years ago
pasky 2a35773a1b (svn r1996) makefile.config -> Makefile.config, that's its name. 20 years ago
pasky 935da8cabb (svn r1995) Makefile: Use the install tool instead of mkdir+cp for installing the system-wide stuff, more secure. Based on Peter Brett's patch 1152428. 20 years ago
tron 54a40903e3 (svn r1983) Introduce multiple compile time debug levels 20 years ago
pasky d89be97a83 (svn r1980) Check $DESTDIR if $DEST_DIR was not set. 20 years ago
tron 29521b0a59 (svn r1939) Revert part of r1938 which accidently crept in 20 years ago
tron 12b223b3f9 (svn r1938) Miscellaneous cleanups: const correctness, kill a goto, ... 20 years ago