diff options
Diffstat (limited to 'apps/plugins/lua')
-rw-r--r-- | apps/plugins/lua/Makefile | 5 | ||||
-rw-r--r-- | apps/plugins/lua/lua.make | 8 | ||||
-rw-r--r-- | apps/plugins/lua/rocklib.c | 7 |
3 files changed, 3 insertions, 17 deletions
diff --git a/apps/plugins/lua/Makefile b/apps/plugins/lua/Makefile index 8568d79c4c..dcf2910c36 100644 --- a/apps/plugins/lua/Makefile +++ b/apps/plugins/lua/Makefile | |||
@@ -28,13 +28,8 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) | |||
28 | DIRS = . | 28 | DIRS = . |
29 | 29 | ||
30 | ifndef APP_TYPE | 30 | ifndef APP_TYPE |
31 | ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET))))) | ||
32 | LDS := archos.lds | ||
33 | OUTPUT = $(OUTDIR)/lua.ovl | ||
34 | else ## iRiver/iPod/... targets | ||
35 | LDS := ../plugin.lds | 31 | LDS := ../plugin.lds |
36 | OUTPUT = $(OUTDIR)/lua.rock | 32 | OUTPUT = $(OUTDIR)/lua.rock |
37 | endif | ||
38 | else ## simulators | 33 | else ## simulators |
39 | OUTPUT = $(OUTDIR)/lua.rock | 34 | OUTPUT = $(OUTDIR)/lua.rock |
40 | endif | 35 | endif |
diff --git a/apps/plugins/lua/lua.make b/apps/plugins/lua/lua.make index ebdef1e24e..61decb5605 100644 --- a/apps/plugins/lua/lua.make +++ b/apps/plugins/lua/lua.make | |||
@@ -23,15 +23,7 @@ LUA_INCLUDELIST := $(addprefix $(LUA_BUILDDIR)/,audio.lua blit.lua color.lua dra | |||
23 | 23 | ||
24 | 24 | ||
25 | ifndef APP_TYPE | 25 | ifndef APP_TYPE |
26 | ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET))))) | ||
27 | ### lowmem targets | ||
28 | ROCKS += $(LUA_BUILDDIR)/lua.ovl | ||
29 | LUA_OUTLDS = $(LUA_BUILDDIR)/lua.link | ||
30 | LUA_OVLFLAGS = -T$(LUA_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(basename $@).map | ||
31 | else | ||
32 | ### all other targets | ||
33 | ROCKS += $(LUA_BUILDDIR)/lua.rock | 26 | ROCKS += $(LUA_BUILDDIR)/lua.rock |
34 | endif | ||
35 | else | 27 | else |
36 | ### simulator | 28 | ### simulator |
37 | ROCKS += $(LUA_BUILDDIR)/lua.rock | 29 | ROCKS += $(LUA_BUILDDIR)/lua.rock |
diff --git a/apps/plugins/lua/rocklib.c b/apps/plugins/lua/rocklib.c index a33fdf7170..4fa989da46 100644 --- a/apps/plugins/lua/rocklib.c +++ b/apps/plugins/lua/rocklib.c | |||
@@ -39,7 +39,7 @@ | |||
39 | * from Lua in its stack in direct order (the first argument is pushed first). To return values to Lua, | 39 | * from Lua in its stack in direct order (the first argument is pushed first). To return values to Lua, |
40 | * a C function just pushes them onto the stack, in direct order (the first result is pushed first), | 40 | * a C function just pushes them onto the stack, in direct order (the first result is pushed first), |
41 | * and returns the number of results. Any other value in the stack below the results will be properly | 41 | * and returns the number of results. Any other value in the stack below the results will be properly |
42 | * discarded by Lua. Like a Lua function, a C function called by Lua can also return many results. | 42 | * discarded by Lua. Like a Lua function, a C function called by Lua can also return many results. |
43 | * | 43 | * |
44 | * When porting new functions, don't forget to check rocklib_aux.pl whether it automatically creates | 44 | * When porting new functions, don't forget to check rocklib_aux.pl whether it automatically creates |
45 | * wrappers for the function and if so, add the function names to @forbidden_functions. This is to | 45 | * wrappers for the function and if so, add the function names to @forbidden_functions. This is to |
@@ -487,8 +487,7 @@ RB_WRAP(sound) | |||
487 | lua_pushstring (L, rb->sound_unit(setting)); | 487 | lua_pushstring (L, rb->sound_unit(setting)); |
488 | return 1; | 488 | return 1; |
489 | break; | 489 | break; |
490 | #if ((CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) || \ | 490 | #if ((CONFIG_CODEC == SWCODEC) && defined (HAVE_PITCHCONTROL)) |
491 | (CONFIG_CODEC == SWCODEC)) && defined (HAVE_PITCHCONTROL) | ||
492 | case SOUND_SET_PITCH: | 491 | case SOUND_SET_PITCH: |
493 | rb->sound_set_pitch(setting); | 492 | rb->sound_set_pitch(setting); |
494 | return 1;/*nil*/ | 493 | return 1;/*nil*/ |
@@ -496,7 +495,7 @@ RB_WRAP(sound) | |||
496 | #endif | 495 | #endif |
497 | case SOUND_VAL2PHYS: | 496 | case SOUND_VAL2PHYS: |
498 | value = luaL_checkint(L, 3); | 497 | value = luaL_checkint(L, 3); |
499 | result = rb->sound_val2phys(setting, value); | 498 | result = rb->sound_val2phys(setting, value); |
500 | break; | 499 | break; |
501 | 500 | ||
502 | default: | 501 | default: |