The-Homebrew-Cloud/launchiine
2
0
Fork 0
mirror of https://github.com/wiiu-env/launchiine.git synced 2024-11-21 17:29:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiling with the latest devkitppc

Browse Source
This commit is contained in:
Maschell 2020-07-05 13:24:22 +02:00
parent 815fa32304
commit c183141e3d
5 changed files with 7 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
filelist.sh
View File

@ -32,7 +32,7 @@ then
echo "Generating filelist.h for $count files." >&2
cat <<EOF > $outFile
/****************************************************************************
* Loadiine resource files.
* Resource files.
* This file is generated automatically.
* Includes $count files.
*
@ -57,11 +57,10 @@ for i in ${files[@]}
do
filename=${i%.*}
extension=${i##*.}
echo 'extern const unsigned char '$filename'_'$extension'[];' >> $outFile
echo 'extern const unsigned int '$filename'_'$extension'_size;' >> $outFile
echo '' >> $outFile
echo '#include "'$filename'_'$extension'.h"' >> $outFile
done
echo '' >> $outFile
echo 'static RecourceFile RecourceList[] =' >> $outFile
echo '{' >> $outFile

2
src/resources/Resources.cpp
View File

@ -1,5 +1,6 @@
#include <malloc.h>
#include <string.h>
#include <string>
#include "Resources.h"
#include "filelist.h"
#include <gui/GuiSound.h>
@ -11,6 +12,7 @@
#include <future>
#include <iostream>
#include <thread>
#include <strings.h>
Resources * Resources::instance = NULL;

7
src/resources/Resources.h
View File

@ -1,5 +1,4 @@
#ifndef RECOURCES_H_
#define RECOURCES_H_
#pragma once
#include <map>
#include <stdint.h>
@ -28,6 +27,4 @@ private:
std::map<std::string, std::pair<uint32_t, GuiImageData *> > imageDataMap;
std::map<std::string, std::pair<uint32_t, GuiSound *> > soundDataMap;
};
#endif
};

184
src/utils/strings.c
View File

@ -1,184 +0,0 @@
#include "strings.h"
void* m_memcpy(void *dst, const void *src, uint32_t len) {
const unsigned char *src_ptr = (const unsigned char *)src;
unsigned char *dst_ptr = (unsigned char *)dst;
while(len) {
*dst_ptr++ = *src_ptr++;
--len;
}
return dst;
}
void* m_memset(void *dst, int32_t val, uint32_t bytes) {
unsigned char *dst_ptr = (unsigned char *)dst;
uint32_t i = 0;
while(i < bytes) {
dst_ptr[i] = val;
++i;
}
return dst;
}
int32_t m_memcmp(const void * ptr1, const void * ptr2, uint32_t num) {
const unsigned char *ptr1_cpy = (const unsigned char *)ptr1;
const unsigned char *ptr2_cpy = (const unsigned char *)ptr2;
while(num) {
int32_t diff = (int32_t)*ptr1_cpy - (int32_t)*ptr2_cpy;
if(diff != 0) {
return diff;
}
ptr1_cpy++;
ptr2_cpy++;
--num;
}
return 0;
}
int32_t m_strnlen(const char* str, uint32_t max_len) {
uint32_t i = 0;
while (str[i] && (i < max_len)) {
i++;
}
return i;
}
int32_t m_strlen(const char* str) {
uint32_t i = 0;
while (str[i]) {
i++;
}
return i;
}
int32_t m_strlcpy(char *s1, const char *s2, uint32_t max_size) {
if(!s1 || !s2 || !max_size)
return 0;
uint32_t len = 0;
while(s2[len] && (len < (max_size-1))) {
s1[len] = s2[len];
len++;
}
s1[len] = 0;
return len;
}
int32_t m_strncpy(char *dst, const char *src, uint32_t max_size) {
return m_strlcpy(dst, src, max_size); // this is not correct, but mostly we need a terminating zero
}
int32_t m_strncasecmp(const char *s1, const char *s2, uint32_t max_len) {
if(!s1 || !s2) {
return -1;
}
uint32_t len = 0;
while(*s1 && *s2 && len < max_len) {
int32_t diff = m_toupper(*s1) - m_toupper(*s2);
if(diff != 0) {
return diff;
}
s1++;
s2++;
len++;
}
if(len == max_len) {
return 0;
}
int32_t diff = m_toupper(*s1) - m_toupper(*s2);
if(diff != 0) {
return diff;
}
return 0;
}
int32_t m_strncmp(const char *s1, const char *s2, uint32_t max_len) {
if(!s1 || !s2) {
return -1;
}
uint32_t len = 0;
while(*s1 && *s2 && len < max_len) {
int32_t diff = *s1 - *s2;
if(diff != 0) {
return diff;
}
s1++;
s2++;
len++;
}
if(len == max_len) {
return 0;
}
int32_t diff = *s1 - *s2;
if(diff != 0) {
return diff;
}
return 0;
}
const char *m_strcasestr(const char *str, const char *pattern) {
if(!str || !pattern) {
return 0;
}
int32_t len = m_strnlen(pattern, 0x1000);
while(*str) {
if(m_strncasecmp(str, pattern, len) == 0) {
return str;
}
str++;
}
return 0;
}
long long m_strtoll(const char *str, char **end, int32_t base) {
long long value = 0;
int32_t sign = 1;
// skip initial spaces only
while(*str == ' ')
str++;
if(*str == '-') {
sign = -1;
str++;
}
while(*str) {
if(base == 16 && m_toupper(*str) == 'X') {
str++;
continue;
}
if(!(*str >= '0' && *str <= '9') && !(base == 16 && m_toupper(*str) >= 'A' && m_toupper(*str) <= 'F'))
break;
value *= base;
if(m_toupper(*str) >= 'A' && m_toupper(*str) <= 'F')
value += m_toupper(*str) - 'A' + 10;
else
value += *str - '0';
str++;
}
if(end)
*end = (char*) str;
return value * sign;
}

24
src/utils/strings.h
View File

@ -1,24 +0,0 @@
#ifndef __STRINGS_H_
#define __STRINGS_H_
#include <stdint.h>
static inline int32_t m_toupper(int32_t c) {
return (c >= 'a' && c <= 'z') ? (c - 0x20) : c;
}
void* m_memcpy(void *dst, const void *src, uint32_t len);
void* m_memset(void *dst, int32_t val, uint32_t len);
int32_t m_memcmp (const void * ptr1, const void * ptr2, uint32_t num);
/* string functions */
int32_t m_strncasecmp(const char *s1, const char *s2, uint32_t max_len);
int32_t m_strncmp(const char *s1, const char *s2, uint32_t max_len);
int32_t m_strncpy(char *dst, const char *src, uint32_t max_size);
int32_t m_strlcpy(char *s1, const char *s2, uint32_t max_size);
int32_t m_strnlen(const char* str, uint32_t max_size);
int32_t m_strlen(const char* str);
const char *m_strcasestr(const char *str, const char *pattern);
long long m_strtoll(const char *str, char **end, int32_t base);
#endif // __STRINGS_H_