all repos — mgba @ dd81bb7783c826c34c6904ac4799c893e8c0d766

mGBA Game Boy Advance Emulator

3DS: Minor signature fixes
Jeffrey Pfau jeffrey@endrift.com
Sat, 06 Aug 2016 00:05:29 -0700
commit

dd81bb7783c826c34c6904ac4799c893e8c0d766

parent

8a68de198cd39e351ea84e040ecf5882b6234c03

3 files changed, 4 insertions(+), 4 deletions(-)

jump to
M src/platform/3ds/CMakeLists.txtsrc/platform/3ds/CMakeLists.txt

@@ -105,7 +105,7 @@ DEPENDS ${BINARY_NAME}.elf ${BINARY_NAME}.smdh)

add_custom_target(${BINARY_NAME}.cia ALL ${STRIP} -o ${BINARY_NAME}-stripped.elf ${BINARY_NAME}.elf - COMMAND ${MAKEROM} -f cia -o ${BINARY_NAME}.cia -rsf cia.rsf -target t -exefslogo -elf ${BINARY_NAME}-stripped.elf -icon ${BINARY_NAME}.smdh -banner ${BINARY_NAME}.bnr + COMMAND ${MAKEROM} -f cia -o ${BINARY_NAME}.cia -rsf cia.rsf -target t -exefslogo -elf ${BINARY_NAME}-stripped.elf -icon ${BINARY_NAME}.smdh -banner ${BINARY_NAME}.bnr -major ${LIB_VERSION_MAJOR} -minor ${LIB_VERSION_MINOR} -micro ${LIB_VERSION_PATCH} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/cia.rsf ${BINARY_NAME}.elf ${BINARY_NAME}.smdh ${BINARY_NAME}.bnr) add_custom_target(run ${3DSLINK} ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_NAME}.3dsx
M src/platform/3ds/main.csrc/platform/3ds/main.c

@@ -215,7 +215,7 @@ ctrFlushBatch();

} static void _setup(struct mGUIRunner* runner) { - bool isNew3DS; + bool isNew3DS = false; APT_CheckNew3DS(&isNew3DS); if (isNew3DS && !envIsHomebrew()) { mCoreConfigSetDefaultIntValue(&runner->core->config, "threadedVideo", 1);
M src/platform/3ds/threading.hsrc/platform/3ds/threading.h

@@ -75,7 +75,7 @@ MutexUnlock(mutex);

MutexUnlock(&cond->mutex); svcWaitSynchronization(cond->semaphore, U64_MAX); MutexLock(mutex); - return 1; + return 0; } static inline int ConditionWaitTimed(Condition* cond, Mutex* mutex, int32_t timeoutMs) {

@@ -85,7 +85,7 @@ MutexUnlock(mutex);

MutexUnlock(&cond->mutex); svcWaitSynchronization(cond->semaphore, timeoutMs * 10000000LL); MutexLock(mutex); - return 1; + return 0; } static inline int ConditionWake(Condition* cond) {