Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove some redundancy (Symbian/Qt). Symbian has cstdint now.

Browse Source
This commit is contained in:
Sacha 2014-06-24 08:28:20 +10:00
parent e444e21a8a
commit 946deda4b3
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/Atomic_GCC.h
View File

@ -86,7 +86,7 @@ inline void AtomicStoreRelease(volatile u32& dest, u32 value) {
#ifdef BLACKBERRY
atomic_set(&dest, value);
#elif defined(__SYMBIAN32__)
__e32_atomic_store_rel32(&dest, value);
__e32_atomic_store_rel32(&dest, value);
#else
__sync_lock_test_and_set(&dest, value); // TODO: Wrong! This function has acquire semantics.
#endif

5
Qt/PPSSPP.pro
View File

@ -48,8 +48,7 @@ contains(DEFINES, USE_FFMPEG): LIBS += -lavformat -lavcodec -lavutil -lswresampl
win32 {
#Use a fixed base-address under windows
QMAKE_LFLAGS += /FIXED /BASE:"0x00400000"
QMAKE_LFLAGS += /DYNAMICBASE:NO
QMAKE_LFLAGS += /FIXED /BASE:"0x00400000" /DYNAMICBASE:NO
LIBS += -lwinmm -lws2_32 -lShell32 -lAdvapi32
contains(QMAKE_TARGET.arch, x86_64): LIBS += $$files($$P/dx9sdk/Lib/x64/*.lib)
else: LIBS += $$files($$P/dx9sdk/Lib/x86/*.lib)
@ -69,7 +68,7 @@ macx|linux {
}
}
}
linux:!android: LIBS += -ldl -lrt -lz
linux:!android: LIBS += -ldl -lrt
macx: LIBS += -liconv
qnx: LIBS += -lscreen
symbian: LIBS += -lremconcoreapi -lremconinterfacebase

4
ext/xbrz/xbrz.h
View File

@ -20,9 +20,7 @@
#undef max
#include <cstddef> //size_t
#ifdef __SYMBIAN32__
#include <boost/cstdint.hpp>
#elif defined(IOS)
#if defined(IOS)
#include <stdint.h>
#else
#include <cstdint> //uint32_t