ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix libretro-ffmpeg Makefile

This commit is contained in:
twinaphex 2016-06-15 19:21:06 +02:00
parent 2f08e760ff
commit 69c983a741
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cores/libretro-ffmpeg/Makefile
View File

@ -232,12 +232,13 @@ ifeq ($(HAVE_SSA), 1)
endif endif
LIBRETROCOMM_DIR := ../../libretro-common LIBRETROCOMM_DIR := ../../libretro-common
DEPS_DIR := ../../deps
LIBAVCODEC_SOURCE := LIBAVCODEC_SOURCE :=
LIBAVFORMAT_SOURCE := LIBAVFORMAT_SOURCE :=
LIBAVUTIL_SOURCE := LIBAVUTIL_SOURCE :=
LIBRETRO_SOURCE := ffmpeg_core.c \ LIBRETRO_SOURCE := ffmpeg_core.c \
$(LIBRETROCOMM_DIR)/queues/fifo_buffer.c \ $(LIBRETROCOMM_DIR)/queues/fifo_queue.c \
$(LIBRETROCOMM_DIR)/rthreads/rthreads.c $(LIBRETROCOMM_DIR)/rthreads/rthreads.c
DEPS_SOURCE := DEPS_SOURCE :=
@ -2165,7 +2166,7 @@ else
CFLAGS += -DHAVE_INTRINSICS_NEON=0 CFLAGS += -DHAVE_INTRINSICS_NEON=0
endif endif
CFLAGS += -Ilibretro-common/include CFLAGS += -I$(LIBRETROCOMM_DIR)/include -I$(DEPS_DIR)
OBJECTS := $(DEPS_SOURCE:.c=.o) $(LIBRETRO_SOURCE:.c=.o) $(FFT_SOURCE:.cpp=.o) $(LIBAVUTIL_SOURCE:.c=.o) $(LIBAVFORMAT_SOURCE:.c=.o) $(LIBSWSCALE_SOURCE:.c=.o) $(LIBAVCODEC_SOURCE:.c=.o) $(LIBSWRESAMPLE_SOURCE:.c=.o) OBJECTS := $(DEPS_SOURCE:.c=.o) $(LIBRETRO_SOURCE:.c=.o) $(FFT_SOURCE:.cpp=.o) $(LIBAVUTIL_SOURCE:.c=.o) $(LIBAVFORMAT_SOURCE:.c=.o) $(LIBSWSCALE_SOURCE:.c=.o) $(LIBAVCODEC_SOURCE:.c=.o) $(LIBSWRESAMPLE_SOURCE:.c=.o)

8
cores/libretro-ffmpeg/fft/fft.cpp
View File

@ -4,13 +4,13 @@
#include <math.h> #include <math.h>
#include <glsym/glsym.h> #include <glsym/glsym.h>
#include "../libretro.h" #include <libretro.h>
#define GLM_SWIZZLE #define GLM_SWIZZLE
#define GLM_FORCE_RADIANS #define GLM_FORCE_RADIANS
#include "glm/glm.hpp" #include <glm/glm.hpp>
#include "glm/gtc/matrix_transform.hpp" #include <glm/gtc/matrix_transform.hpp>
#include "glm/gtc/type_ptr.hpp" #include <glm/gtc/type_ptr.hpp>
using namespace glm; using namespace glm;
#define GL_DEBUG 0 #define GL_DEBUG 0

2
cores/libretro-ffmpeg/fft/fft.h
View File

@ -1,7 +1,7 @@
#ifndef FFT_H__ #ifndef FFT_H__
#define FFT_H__ #define FFT_H__
#include "../glsym/glsym.h" #include <glsym/glsym.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {