Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Define vasprintf in native for Blackberry instead (as it is also used there). Remove some redundancy in Settings.pri.

Browse source
This commit is contained in:
Sacha 2013-04-22 14:23:13 +10:00
parent 192d868893
commit 12d50f25bf
4 changed files with 3 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Common/StringUtil.h
View file

@ -18,51 +18,11 @@
#ifndef _STRINGUTIL_H_
#define _STRINGUTIL_H_
#include <stdarg.h>
#include <vector>
#include <string>
#include <sstream>
#include <iomanip>
#include <base/stringutil.h>
#include "Common.h"
#ifdef BLACKBERRY
// QNX Does not have an implementation of vasprintf
static inline int vasprintf(char **rResult, const char *aFormat, va_list aAp)
{
int rVal;
char *result;
va_list ap;
result = (char *) malloc(16);
if (result == NULL) return -1;
va_copy(ap, aAp);
rVal = vsnprintf(result, 16, aFormat, ap);
va_end(ap);
if (rVal == -1)
{
free(result);
return rVal;
}
else if (rVal >= 16)
{
free(result);
result = (char *) malloc(rVal + 1);
if (result == NULL) return -1;
va_copy(ap, aAp);
rVal = vsnprintf(result, rVal + 1, aFormat, aAp);
va_end(ap);
}
*rResult = result;
return rVal;
}
#endif
std::string StringFromFormat(const char* format, ...);
// Cheap!
bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list args);

2
Qt/Settings.pri
View file

@ -45,6 +45,4 @@ symbian {
MMP_RULES += "ARMFPU vfpv2"
QMAKE_CXXFLAGS += -marm -Wno-parentheses -Wno-comment
INCLUDEPATH += $$EPOCROOT/epoc32/include/stdapis/glib-2.0
DEFINES += __MARM_ARMV6__
CONFIG += 4.6.3
}

2
README.md
View file

@ -150,7 +150,7 @@ You will need to add the GCCE 4.6.3 variant to Symbian\tools\sbs\lib\config\vari
<set name="ARMMACROS.VAR" value="__GCCE_4__ __GCCE_4_6__"/>
<set name="LINKER_DEFAULT_LIBS" value="-lsupc++ -lgcc -lgcc_eh"/>
<set name="PLATMACROS.CONFIG" value="ARMV6"/>
<set name="ARMMACROS.CONFIG" value="__ARMV6__"/>
<set name="ARMMACROS.CONFIG" value="__MARM_ARMV6__ __ARMV6__"/>
<set name="LINKER_GROUP_END_OPTION" value="-Wl,--end-group"/>
<set name="LINKER_GROUP_START_OPTION" value="-Wl,--start-group"/>
<set name="CC.ARMV5" value="-march=armv6"/>

2
native

@ -1 +1 @@
Subproject commit 25e03c243c271b921d3e65de47504efc22387ce3
Subproject commit e584a005ac06fb3af48cff9f4d9ed352de60fea3