libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-23 16:19:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Buildfix Symbian and Blackberry from the ffmpeg merge.

Browse Source 
Fix a header issue on Blackberry.
Fix a UINT64_C define issue.
FFMPEG is no longer 'beta'.
This commit is contained in:
Sacha 2013-10-20 16:41:34 +10:00
parent 023dbbc967
commit 40da2f7f5b
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -11,6 +11,7 @@ endif()
if(BLACKBERRY)
set(CMAKE_SYSTEM_NAME "QNX")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
endif()
if (IOS OR BLACKBERRY)
@ -36,7 +37,7 @@ endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(LINUX ON)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
if (NOT USING_GLES2)
set(USE_FFMPEG ON)
endif()
@ -63,7 +64,7 @@ option(IOS "Set to ON if targeting an iOS device" ${IOS})
option(USING_GLES2 "Set to ON if target device uses OpenGL ES 2.0" ${USING_GLES2})
option(USING_QT_UI "Set to ON if you wish to use the Qt frontend wrapper" ${USING_QT_UI})
option(HEADLESS "Set to OFF to not generate the PPSSPPHeadless target" ${HEADLESS})
option(USE_FFMPEG "Build with FFMPEG support (beta)" ${USE_FFMPEG})
option(USE_FFMPEG "Build with FFMPEG support" ${USE_FFMPEG})
if(ANDROID)
if(NOT ANDROID_ABI)

13
Core/HW/SimpleAT3Dec.cpp
View File

@ -15,9 +15,13 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "Core/HW/SimpleAT3Dec.h"
#include "Core/HW/MediaEngine.h"
#include "Core/HW/BufferQueue.h"
#ifdef USE_FFMPEG
// Urgh! Why is this needed?
// TODO: Replace all these by -D__STDC_CONSTANT_MACROS
#ifdef ANDROID
#ifndef UINT64_C
#define UINT64_C(c) (c ## ULL)
@ -29,13 +33,6 @@ extern "C" {
#include <libswresample/swresample.h>
#include <libavutil/samplefmt.h>
}
#endif // USE_FFMPEG
#include "Core/HW/SimpleAT3Dec.h"
#include "Core/HW/MediaEngine.h"
#include "Core/HW/BufferQueue.h"
#ifdef USE_FFMPEG
struct SimpleAT3 {
public:

2
Core/HW/SimpleAT3Dec.h
View File

@ -17,6 +17,8 @@
#pragma once
#include <cmath>
#include "base/basictypes.h"
// Wraps FFMPEG in a nice interface that's drop-in compatible with

2
native

@ -1 +1 @@
Subproject commit 6f32546357ce4d9cc4fea5624f35781c3068558a
Subproject commit 06a7ad40b298d815acbd5839a0e77258358ce015