diff --git a/wii/app_booter/string.h b/libretro-sdk/crt/include/string.h similarity index 62% rename from wii/app_booter/string.h rename to libretro-sdk/crt/include/string.h index 4df2aed86c..25fbfc4926 100644 --- a/wii/app_booter/string.h +++ b/libretro-sdk/crt/include/string.h @@ -1,9 +1,10 @@ -#ifndef STRING_H_ -#define STRING_H_ +#ifndef __LIBRETRO_SDK_CRT_STRING_H_ +#define __LIBRETRO_SDK_CRT_STRING_H_ #include void *memcpy(void *dst, const void *src, size_t len); + void *memset(void *b, int c, size_t len); #endif diff --git a/libretro-sdk/crt/string.c b/libretro-sdk/crt/string.c index d09e900da9..4114de11d9 100644 --- a/libretro-sdk/crt/string.c +++ b/libretro-sdk/crt/string.c @@ -23,16 +23,12 @@ void *memset(void *dst, int val, size_t count) return start; } -void *memcpy(void *dst, const void *src, size_t count) +void *memcpy(void *dst, const void *src, size_t len) { - void *ret = dst; + size_t i; - while (count--) - { - *(char *)dst = *(char *)src; - dst = (char*)dst + 1; - src = (char*)src + 1; - } + for (i = 0; i < len; i++) + ((unsigned char *)dst)[i] = ((unsigned char *)src)[i]; return dst; } diff --git a/wii/app_booter/Makefile b/wii/app_booter/Makefile index 4b4e44c035..3e1596b893 100644 --- a/wii/app_booter/Makefile +++ b/wii/app_booter/Makefile @@ -21,7 +21,7 @@ OBJCOPY = $(DEVKITPPC)/bin/powerpc-eabi-objcopy$(EXE_EXT) BIN_TARGET := app_booter.bin ELF_TARGET := app_booter.elf -INCLUDE := -I. -I$(DEVKITPRO)/libogc/include +INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -I../../libretro-sdk/crt/include LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii MACHDEP := -DHW_RVL -DGEKKO -mno-eabi -mno-sdata -mcpu=750