diff options
author | twinaphex | 2014-12-11 19:12:09 +0100 |
---|---|---|
committer | twinaphex | 2014-12-11 19:12:09 +0100 |
commit | 657c7bee5cb874c17716d3597969a4cba26e2769 (patch) | |
tree | 051dcc4debb30fc4e44b91de6a6e43d9daa39966 | |
parent | 9ed950fd4e71e33d0b5fa5c3faeb0b5bf4005a65 (diff) | |
download | picogpsp-657c7bee5cb874c17716d3597969a4cba26e2769.tar.gz picogpsp-657c7bee5cb874c17716d3597969a4cba26e2769.tar.bz2 picogpsp-657c7bee5cb874c17716d3597969a4cba26e2769.zip |
Create define ARM_ARCH_BLENDING_OPTS - so that we can optionally
compile in the ARM ASM blend file
-rw-r--r-- | Makefile.common | 3 | ||||
-rw-r--r-- | video.c | 5 | ||||
-rw-r--r-- | video.h | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.common b/Makefile.common index faf0261..3a42edc 100644 --- a/Makefile.common +++ b/Makefile.common @@ -33,7 +33,10 @@ endif endif ifeq ($(CPU_ARCH), arm) +ifeq ($(CPU_ARCH_ARM_BLENDING_OPTS),1) +CFLAGS += -DARM_ARCH_BLENDING_OPTS SOURCES_ASM += $(CORE_DIR)/arm/video_blend.S endif +endif INCFLAGS := -I$(CORE_DIR) @@ -2296,8 +2296,7 @@ fill_line_builder(color32); #ifdef RENDER_COLOR16_NORMAL -#ifndef ARM_ARCH - +#ifndef ARM_ARCH_BLENDING_OPTS void expand_normal(u16 *screen_ptr, u32 start, u32 end) { u32 i, pixel_source; @@ -2328,7 +2327,7 @@ void expand_normal(u16 *screen_ptr, u32 start, u32 end) void expand_blend(u32 *screen_src_ptr, u16 *screen_dest_ptr, u32 start, u32 end); -#ifndef ARM_ARCH +#ifndef ARM_ARCH_BLENDING_OPTS void expand_blend(u32 *screen_src_ptr, u16 *screen_dest_ptr, u32 start, u32 end) @@ -20,7 +20,7 @@ #ifndef VIDEO_H #define VIDEO_H -void update_scanline(); +void update_scanline(void); void video_write_savestate(void); void video_read_savestate(void); |