Commit graph

222 commits

Author SHA1 Message Date
Marcoen Hirschberg
5825b2c84f rearrange compiler options to avoid conflicts with header files on FreeBSD
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11317 a1c6a512-1295-4272-9138-f99709370657
2006-10-23 14:09:28 +00:00
Jens Arnold
0cc8b7113c Speed up build process in general by using internal functions of make instead of spawning sub-shells where possible.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11307 a1c6a512-1295-4272-9138-f99709370657
2006-10-22 00:21:57 +00:00
Karl Kurbjun
4caa676a9c Deboost under all exits for rockdoom thanks to patch 5851 by David Dent
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11100 a1c6a512-1295-4272-9138-f99709370657
2006-10-01 01:07:45 +00:00
Barry Wardell
ce74dc0743 Cleaner implementation of the recent OSX simulator build fix. No need to define SHARED_FLAG in each Makefile. Just have configure create it in the root Makefile instead.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11095 a1c6a512-1295-4272-9138-f99709370657
2006-09-29 20:04:36 +00:00
Barry Wardell
64f949f295 Allow UI simulator to be build on OS (Slightly updated version of FS5767)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11094 a1c6a512-1295-4272-9138-f99709370657
2006-09-29 16:15:11 +00:00
Barry Wardell
cf7600d2d2 Fix sound in Doom on H10 - we don't support 11025Hz so use 44100Hz instead.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10895 a1c6a512-1295-4272-9138-f99709370657
2006-09-05 23:41:34 +00:00
Barry Wardell
d939663ee9 Fix not being able to exit Doom on the H10.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10887 a1c6a512-1295-4272-9138-f99709370657
2006-09-05 00:23:06 +00:00
Jens Arnold
59d1952693 Make doom work with sound on X5.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10758 a1c6a512-1295-4272-9138-f99709370657
2006-08-26 15:03:48 +00:00
Daniel Stenberg
871be001f7 Convert the "short ciruit operator madness" to plain and simple code that
doesn't cause warnings in gcc 4.1.x.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10613 a1c6a512-1295-4272-9138-f99709370657
2006-08-16 13:31:40 +00:00
Jens Arnold
8062f9184c Correct calculation of necessary buffer size to give maximum number of shades on iPod Mini.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10514 a1c6a512-1295-4272-9138-f99709370657
2006-08-10 18:34:43 +00:00
Jens Arnold
ad9c9cc651 Use striped buffering for grayscale targets to make the buffer fit on iPod g3/g4. Also slightly faster (at least on H1x0) with the buffer in IRAM.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10470 a1c6a512-1295-4272-9138-f99709370657
2006-08-07 02:44:18 +00:00
Jens Arnold
e6ff242184 Fix red iPod g3 build.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10469 a1c6a512-1295-4272-9138-f99709370657
2006-08-07 01:57:29 +00:00
Jens Arnold
c214e7bb0c Grayscale library ported to the grayscale iPods, first version. Added C reference versions of gray_update_rect() for both horizontal and vertical pixel packing. gray_update_rect() and gray_ub_gray_bitmap_part() not yet assembler optimised. Grayscale screendump doesn't work yet. * Fixed button assignments for iPod in grayscale.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10468 a1c6a512-1295-4272-9138-f99709370657
2006-08-07 01:46:42 +00:00
Daniel Stenberg
1e88be518a Barry Wardell's keymappings for H10
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10446 a1c6a512-1295-4272-9138-f99709370657
2006-08-03 20:17:25 +00:00
Jens Arnold
628d20a610 Grayscale library: LCD linearisation and gamma correction.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10402 a1c6a512-1295-4272-9138-f99709370657
2006-08-02 00:22:01 +00:00
Linus Nielsen Feltzing
c849219370 Moved the X5 button driver to the target tree
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10339 a1c6a512-1295-4272-9138-f99709370657
2006-07-27 13:27:31 +00:00
Karl Kurbjun
26dd5c5e9c Fix the menu start for rockdoom
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10097 a1c6a512-1295-4272-9138-f99709370657
2006-06-10 18:47:11 +00:00
Dave Chapman
830ec63b4b Stop playback before starting to use IRAM
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9947 a1c6a512-1295-4272-9138-f99709370657
2006-05-15 21:25:43 +00:00
Karl Kurbjun
65c15eb50b Better video update, add options to startup menu, change default screensize
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9754 a1c6a512-1295-4272-9138-f99709370657
2006-04-22 03:48:15 +00:00
Karl Kurbjun
29ab31e8f1 Optimizations for doom: coldfire asm drawspan routine = not much, fixed point multiply changes = not much, H300 asm lcd update = some, IRAM sound updates and simplifications = more
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9747 a1c6a512-1295-4272-9138-f99709370657
2006-04-20 19:39:56 +00:00
Karl Kurbjun
6b90467f69 Add better error message for messed up graphics.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9707 a1c6a512-1295-4272-9138-f99709370657
2006-04-17 19:54:18 +00:00
Karl Kurbjun
08b417f149 Properly cache animations at level start. Switches still need some caching code. Added a debug cache flag for use in the sim to w_wad.c. Should be taken out when switches are handled.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9706 a1c6a512-1295-4272-9138-f99709370657
2006-04-17 19:42:08 +00:00
Karl Kurbjun
9f2be9b17f Add in error return if appropriate.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9702 a1c6a512-1295-4272-9138-f99709370657
2006-04-17 05:01:33 +00:00
Karl Kurbjun
b0722d11c1 Changed the way the addons and demos menus are displayed and built. Should be a good setup for adding multiple wad files as addons. Need to add some status feedback to let the user know what has been selected previously.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9701 a1c6a512-1295-4272-9138-f99709370657
2006-04-17 04:38:26 +00:00
Karl Kurbjun
c87f98ce7f Finally add support for unlimited number of addons and demos. Also cleaned up the code and made a general function to handle the addons and demos.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9700 a1c6a512-1295-4272-9138-f99709370657
2006-04-17 03:09:29 +00:00
Zakk Roberts
cc8f80ad9b Temporary fix for the high-pitched sounds on iPod: they should sound correct now, but the real problem (frequency adjustment) still needs fixing; this is merely a workaround.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9698 a1c6a512-1295-4272-9138-f99709370657
2006-04-17 01:35:09 +00:00
Karl Kurbjun
6f8af215b9 Some code cleanup. Adds Always run to configuration options.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9697 a1c6a512-1295-4272-9138-f99709370657
2006-04-17 00:37:51 +00:00
Karl Kurbjun
295c226ed5 Fix run so that it stays enabled across level loads. Removed some unused code and added some back in for hopeful future use.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9692 a1c6a512-1295-4272-9138-f99709370657
2006-04-16 23:14:04 +00:00
Karl Kurbjun
f7872ac61b Decrease doom's code size and some code cleanup.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9690 a1c6a512-1295-4272-9138-f99709370657
2006-04-16 21:16:09 +00:00
Dave Chapman
75a1426004 Disable some unused code (code used in network play) to bring the plugin size back down to under 512KB on the ipod video - more work needs to be done to further decrease the plugin size.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9683 a1c6a512-1295-4272-9138-f99709370657
2006-04-16 00:59:41 +00:00
Karl Kurbjun
4e2a74c2b4 Slight code cleanups, fixed sound parameter - now it saves. Old configurations will be reset.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9682 a1c6a512-1295-4272-9138-f99709370657
2006-04-15 22:08:36 +00:00
Karl Kurbjun
993545b4fb Start of profiling support for doom.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9667 a1c6a512-1295-4272-9138-f99709370657
2006-04-14 21:07:56 +00:00
Karl Kurbjun
22a81d7c76 Prevent non-standard wads (most notably GP32 wads) that should not run from ever making it into game (avoid freezes, data aborts, memory corruption, etc..)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9647 a1c6a512-1295-4272-9138-f99709370657
2006-04-13 18:36:11 +00:00
Christian Gmeiner
a91b794cb2 use #ifdef x instead of #if defined(x)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9581 a1c6a512-1295-4272-9138-f99709370657
2006-04-09 15:00:30 +00:00
Christian Gmeiner
eb7d4f88ea HAVE_ADJUSTABLE_CPU_FREQ isn't defined for simulators, so we don't have to check for simulator builds before using cpu_boost()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9580 a1c6a512-1295-4272-9138-f99709370657
2006-04-09 14:50:43 +00:00
Dave Chapman
2ee282396f Add a simple header and version number to the default.dfg config file
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9570 a1c6a512-1295-4272-9138-f99709370657
2006-04-08 22:53:26 +00:00
Karl Kurbjun
b41cf31e2c Fix warning
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9543 a1c6a512-1295-4272-9138-f99709370657
2006-04-06 21:35:34 +00:00
Karl Kurbjun
0242912a2d Scaling code fixed by clamping down the width to a max of SCREENWIDTH. Removed some #ifdefs for glprboom
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9542 a1c6a512-1295-4272-9138-f99709370657
2006-04-06 21:31:49 +00:00
Thom Johansen
cf23618980 Fix GCC trying to use memcpy for GCC 4.1 and allow Doom to compile.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9539 a1c6a512-1295-4272-9138-f99709370657
2006-04-06 20:44:33 +00:00
Thom Johansen
63b3b0c024 Remove workaround for broken ARM memset.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9520 a1c6a512-1295-4272-9138-f99709370657
2006-04-05 15:43:42 +00:00
Karl Kurbjun
45f2df0eba Fix finale text and try and prevent some data corruption due to the scaling code. Also allows the non-standard GP32 mods to work with some bounds checking. More comments are in v_video.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9511 a1c6a512-1295-4272-9138-f99709370657
2006-04-05 06:37:37 +00:00
Karl Kurbjun
4ff8744e55 Fix automap coordinates
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9509 a1c6a512-1295-4272-9138-f99709370657
2006-04-05 00:20:32 +00:00
Karl Kurbjun
36259dafe9 Make savegame strings more informative
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9508 a1c6a512-1295-4272-9138-f99709370657
2006-04-04 23:58:37 +00:00
Karl Kurbjun
8ae6802697 Fix up configurable keys, edit exit string, more work needs to be done on menu keys
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9506 a1c6a512-1295-4272-9138-f99709370657
2006-04-04 23:13:50 +00:00
Jens Arnold
d0136ed145 Doom on H1x0: Don't waste memory, the grayscale lib doesn't need that much, but properly tell the lib how much memory it may use.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9503 a1c6a512-1295-4272-9138-f99709370657
2006-04-04 19:39:31 +00:00
Karl Kurbjun
0926f64e44 Add configurable keys to Doom, enter, escape and run still need to be handled. More game keys need to be added to the options.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9494 a1c6a512-1295-4272-9138-f99709370657
2006-04-04 17:53:29 +00:00
Dave Chapman
4dc76573f0 iPod: Make the hold switch bring up the in-game menu.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9487 a1c6a512-1295-4272-9138-f99709370657
2006-04-04 12:00:53 +00:00
Dave Chapman
bb322695b9 Correct the #ifdef logic for timer_unregister() and add a comment describing why we need to surround the use of the user timer with #ifdefs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9486 a1c6a512-1295-4272-9138-f99709370657
2006-04-04 11:16:44 +00:00
Dave Chapman
ec5f783988 Make the core key mappings more logical - e.g. map KEY_UPARROW to "key_up". This makes the ipod work as expected, but will change the H300 behaviour - future changes to key bindings should be made in i_video.c.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9477 a1c6a512-1295-4272-9138-f99709370657
2006-04-04 00:04:48 +00:00
Dave Chapman
e59a050509 Workaround for Rockbox's broken memset on ARM
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9476 a1c6a512-1295-4272-9138-f99709370657
2006-04-03 22:57:39 +00:00
Karl Kurbjun
1123ab64cd Updates doom menu w/ new graphics, now requires rockdoom.wad: http://alamode.mines.edu/~kkurbjun/rockdoom.wad
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9468 a1c6a512-1295-4272-9138-f99709370657
2006-04-03 20:03:02 +00:00
Dave Chapman
484c1584c6 Prevent a potential unaligned memory access
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9462 a1c6a512-1295-4272-9138-f99709370657
2006-04-03 17:38:18 +00:00
Dave Chapman
1d51dce70b Clean up the (incorrect) #ifdef spaghetti for the timer. We now have a user timer on the ipods, so we use it.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9461 a1c6a512-1295-4272-9138-f99709370657
2006-04-03 17:32:46 +00:00
Karl Kurbjun
6e3371110e Finishing touches
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9460 a1c6a512-1295-4272-9138-f99709370657
2006-04-03 17:11:42 +00:00
Dave Chapman
9f4898a3f2 Doom can't use the user timer at the same time as using the grayscale lib.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9459 a1c6a512-1295-4272-9138-f99709370657
2006-04-03 17:00:56 +00:00
Karl Kurbjun
ee80e003b3 Fix #if
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9458 a1c6a512-1295-4272-9138-f99709370657
2006-04-03 16:30:12 +00:00
Karl Kurbjun
50b4d12d7a Add grayscale lib for the H100's
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9456 a1c6a512-1295-4272-9138-f99709370657
2006-04-03 16:13:15 +00:00
Hristo Kovachev
38deb8f13a Patch #4864 by Jonathan Gordon: text editor plugin, with some changes by me.
Also correct a var clash between the rockbox's gui api and doom plugin


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9451 a1c6a512-1295-4272-9138-f99709370657
2006-04-03 08:51:08 +00:00
Karl Kurbjun
e06f706d7b Fix warning
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9446 a1c6a512-1295-4272-9138-f99709370657
2006-04-03 00:37:27 +00:00
Karl Kurbjun
9dde7b272e Fixes graphic errors in scaling code, note sure about the fix in hu_lib.c though. I havn't seen any corrupted text but it may still need a proper fix.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9445 a1c6a512-1295-4272-9138-f99709370657
2006-04-03 00:28:13 +00:00
Karl Kurbjun
546d96c46f Properly ifdef H300 video code, fix commented line handling rockbox volume
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9439 a1c6a512-1295-4272-9138-f99709370657
2006-04-02 20:45:24 +00:00
Jens Arnold
1be25a4d71 Use TIMER_FREQ for timers in plugins. Fixes timer speed on iPod.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9427 a1c6a512-1295-4272-9138-f99709370657
2006-04-02 12:45:30 +00:00
Karl Kurbjun
51db2d3f2c Update adds prboom's high resolution support, also makes the scaling for platforms w/ resolution less then 320x200 much nicer. IDoom's lookup table code has been removed. Also fixed a pallete bug. Some graphic errors are present in menu and status bar. Also updates some headers and output formatting.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9418 a1c6a512-1295-4272-9138-f99709370657
2006-04-02 01:52:44 +00:00
Karl Kurbjun
4ed232df5e Use rockbox endian defines
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9351 a1c6a512-1295-4272-9138-f99709370657
2006-03-29 21:16:45 +00:00
Dave Chapman
22593f4ace Change the type of the P_SectorActive() function to boolean - that's how it is being used.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9323 a1c6a512-1295-4272-9138-f99709370657
2006-03-28 19:04:56 +00:00
Dave Chapman
f81c192b3a More 64-bit fixes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9322 a1c6a512-1295-4272-9138-f99709370657
2006-03-28 19:04:48 +00:00
Dave Chapman
5293ea1dac More 64-bit fixes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9321 a1c6a512-1295-4272-9138-f99709370657
2006-03-28 17:42:57 +00:00
Christian Gmeiner
d1b587a659 added good (tm) button mappings for x5, and added ifdef for HAS_BUTTON_HOLD
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9319 a1c6a512-1295-4272-9138-f99709370657
2006-03-28 17:20:49 +00:00
Dave Chapman
cd88582478 64-bit sim fixes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9316 a1c6a512-1295-4272-9138-f99709370657
2006-03-28 16:46:10 +00:00
Dave Chapman
59a248c8c6 Fix uninitialised variable warning
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9314 a1c6a512-1295-4272-9138-f99709370657
2006-03-28 16:08:52 +00:00
Dave Chapman
39876971a8 Do not export load_main_backdrop() via the plugin API. Plugins should allocate their own buffer and use lcd_set_backdrop()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9313 a1c6a512-1295-4272-9138-f99709370657
2006-03-28 16:04:11 +00:00
Dave Chapman
47f4a458d6 Patch #2969 - Doom! Currently only working on the H300.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9312 a1c6a512-1295-4272-9138-f99709370657
2006-03-28 15:44:01 +00:00