libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-01-19 07:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better fix for the UINT_64 define issue on android

Browse Source
This commit is contained in:
Henrik Rydgard 2013-10-20 13:51:54 +02:00
parent b290b31bd8
commit f5a63d7d41
10 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Core/HLE/sceAtrac.cpp
View File

@ -73,18 +73,12 @@ static const int MAX_CONFIG_VOLUME = 8;
#ifdef USE_FFMPEG
// Urgh! Why is this needed?
#ifdef ANDROID
#ifndef UINT64_C
#define UINT64_C(c) (c ## ULL)
#endif
#endif
extern "C" {
#include <libavformat/avformat.h>
#include <libswresample/swresample.h>
#include <libavutil/samplefmt.h>
}
#endif // USE_FFMPEG
struct InputBuffer {

6
Core/HLE/sceMp3.cpp
View File

@ -29,12 +29,6 @@
#define PRId64 "%llu"
#endif
// Urgh! Why is this needed?
#ifdef ANDROID
#ifndef UINT64_C
#define UINT64_C(c) (c ## ULL)
#endif
#endif
extern "C" {
#include <libavutil/opt.h>
#include <libavformat/avformat.h>

7
Core/HW/MediaEngine.cpp
View File

@ -25,13 +25,6 @@
#ifdef USE_FFMPEG
// Urgh! Why is this needed?
#ifdef ANDROID
#ifndef UINT64_C
#define UINT64_C(c) (c ## ULL)
#endif
#endif
extern "C" {
#include "libavcodec/avcodec.h"

7
Core/HW/SimpleAT3Dec.cpp
View File

@ -21,13 +21,6 @@
#ifdef USE_FFMPEG
// TODO: Replace all these by -D__STDC_CONSTANT_MACROS
#ifdef ANDROID
#ifndef UINT64_C
#define UINT64_C(c) (c ## ULL)
#endif
#endif
extern "C" {
#include <libavformat/avformat.h>
#include <libswresample/swresample.h>

4
GPU/Software/SoftGpu.cpp
View File

@ -39,8 +39,8 @@ static GLuint program;
const int FB_WIDTH = 480;
const int FB_HEIGHT = 272;
FormatBuffer fb = {NULL};
FormatBuffer depthbuf = {NULL};
FormatBuffer fb;
FormatBuffer depthbuf;
u32 clut[4096];
GLuint OpenGL_CompileProgram(const char* vertexShader, const char* fragmentShader)

1
Windows/PPSSPP.vcxproj
View File

@ -359,6 +359,7 @@
<None Include="..\android\atlasscript.txt" />
<None Include="..\android\jni\Android.mk" />
<None Include="..\android\jni\Application.mk" />
<None Include="..\android\jni\Locals.mk" />
<None Include="..\assets\langregion.ini" />
<None Include="..\CMakeLists.txt" />
<None Include="..\README.md" />

3
Windows/PPSSPP.vcxproj.filters
View File

@ -281,6 +281,9 @@
<None Include="version.rc">
<Filter>Resource Files</Filter>
</None>
<None Include="..\android\jni\Locals.mk">
<Filter>Other Platforms</Filter>
</None>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="ppsspp.rc">

4
android/jni/Android.mk
View File

@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := native_audio
LOCAL_CFLAGS := -O3 -fsigned-char -Wall -Wno-multichar -Wno-psabi -Wno-literal-suffix
LOCAL_CFLAGS := -O3 -fsigned-char -Wall -Wno-multichar -Wno-psabi -Wno-literal-suffix -D__STDC_CONSTANT_MACROS
# yes, it's really CPPFLAGS for C++
LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti
NATIVE := ../../native
@ -26,8 +26,6 @@ SRC := ../..
include $(LOCAL_PATH)/Locals.mk
# $(SRC)/Core/EmuThread.cpp \
# http://software.intel.com/en-us/articles/getting-started-on-optimizing-ndk-project-for-multiple-cpu-architectures
ifeq ($(TARGET_ARCH_ABI),x86)

2
android/jni/Locals.mk
View File

@ -1,7 +1,7 @@
# These are definitions for LOCAL_ variables for PPSSPP.
# They are shared between ppsspp_jni (lib for Android app) and ppsspp_headless.
LOCAL_CFLAGS := -DUSE_FFMPEG -DUSE_PROFILER -DUSING_GLES2 -O3 -fsigned-char -Wall -Wno-multichar -Wno-psabi -Wno-unused-variable -fno-strict-aliasing
LOCAL_CFLAGS := -DUSE_FFMPEG -DUSING_GLES2 -O3 -fsigned-char -Wall -Wno-multichar -Wno-psabi -Wno-unused-variable -fno-strict-aliasing -D__STDC_CONSTANT_MACROS
# yes, it's really CPPFLAGS for C++
LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder -Wno-literal-suffix
LOCAL_C_INCLUDES := \

2
native

@ -1 +1 @@
Subproject commit f8cab66c8c2eadbb9c8bdba515d76e946750e08e
Subproject commit c1f05326c45a31c7e54464754c0f654cd2e2caaf