mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 09:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

(3DS) fix build to work with the latest ctrulib.

Browse Source
This commit is contained in:
aliaspider 2015-09-07 18:31:30 +01:00
parent 0f28b0cd16
commit 3b85e0dd5a
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.ctr
View File

@ -101,7 +101,7 @@ LD := $(CXX)
#---------------------------------------------------------------------------------
@echo $(notdir $<)
python $(AEMSTRO)/aemstro_as.py $< $(notdir $<).shbin
bin2s $(notdir $<).shbin | $(PREFIX)as -o $@
$(DEVKITARM)/bin/bin2s $(notdir $<).shbin | $(PREFIX)as -o $@
echo "extern const u8" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(notdir $<).shbin | tr . _)`.h
echo "extern const u8" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(notdir $<).shbin | tr . _)`.h
echo "extern const u32" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(notdir $<).shbin | tr . _)`.h

6
gfx/drivers/ctr_gfx.c
View File

@ -166,7 +166,7 @@ static void* ctr_init(const video_info_t* video,
GPU_DepthMap(-1.0f, 0.0f);
GPU_SetFaceCulling(GPU_CULL_NONE);
GPU_SetStencilTest(false, GPU_ALWAYS, 0x00, 0xFF, 0x00);
GPU_SetStencilOp(GPU_KEEP, GPU_KEEP, GPU_KEEP);
GPU_SetStencilOp(GPU_STENCIL_KEEP, GPU_STENCIL_KEEP, GPU_STENCIL_KEEP);
GPU_SetBlendingColor(0, 0, 0, 0);
// GPU_SetDepthTestAndWriteMask(true, GPU_GREATER, GPU_WRITE_ALL);
GPU_SetDepthTestAndWriteMask(false, GPU_ALWAYS, GPU_WRITE_ALL);
@ -332,7 +332,7 @@ static bool ctr_frame(void* data, const void* frame,
ctrGuSetAttributeBuffersAddress(VIRT_TO_PHYS(ctr->frame_coords));
ctrGuSetVertexShaderFloatUniform(0, (float*)&ctr->scale_vector, 1);
GPU_DrawArray(GPU_UNKPRIM, 1);
GPU_DrawArray(GPU_UNKPRIM, 0, 1);
if (ctr->menu_texture_enable)
{
@ -351,7 +351,7 @@ static bool ctr_frame(void* data, const void* frame,
ctrGuSetAttributeBuffersAddress(VIRT_TO_PHYS(ctr->menu.frame_coords));
ctrGuSetVertexShaderFloatUniform(1, (float*)&ctr->menu.scale_vector, 1);
GPU_DrawArray(GPU_UNKPRIM, 1);
GPU_DrawArray(GPU_UNKPRIM, 0, 1);
}
GPU_FinishDrawing();

2
input/drivers/ctr_input.c
View File

@ -88,7 +88,7 @@ static bool ctr_input_key_pressed(void *data, int key)
settings_t *settings = config_get_ptr();
ctr_input_t *ctr = (ctr_input_t*)data;
return (input_joypad_pressed(ctr->joypad, 0, settings->input.binds[0], key);
return input_joypad_pressed(ctr->joypad, 0, settings->input.binds[0], key);
}
static bool ctr_input_meta_key_pressed(void *data, int key)

2
libretro-common/include/memmap.h
View File

@ -23,7 +23,7 @@
#ifndef _LIBRETRO_MEMMAP_H
#define _LIBRETRO_MEMMAP_H
#if defined(__CELLOS_LV2__) || defined(PSP) || defined(GEKKO) || defined(VITA) || defined(_XBOX)
#if defined(__CELLOS_LV2__) || defined(PSP) || defined(GEKKO) || defined(VITA) || defined(_XBOX) || defined(_3DS)
/* No mman available */
#elif defined(_WIN32) && !defined(_XBOX)
#include <windows.h>