Bake rbmp_encode.c in

This commit is contained in:
twinaphex 2015-09-19 04:40:30 +02:00
parent 2945bb9f50
commit 08c0cf1ce3
3 changed files with 5 additions and 6 deletions

View File

@ -794,10 +794,9 @@ endif
ifeq ($(HAVE_RPNG), 1)
OBJ += libretro-common/formats/png/rpng.o \
libretro-common/formats/png/rpng_encode.o
else
OBJ += libretro-common/formats/bmp/rbmp_encode.o
endif
OBJ += libretro-common/formats/tga/tga_decode.o
OBJ += libretro-common/formats/bmp/rbmp_encode.o \
libretro-common/formats/tga/tga_decode.o
ifdef HAVE_COMPRESSION
DEFINES += -DHAVE_COMPRESSION

View File

@ -176,9 +176,8 @@ VIDEO IMAGE
#ifdef HAVE_RPNG
#include "../libretro-common/formats/png/rpng.c"
#include "../libretro-common/formats/png/rpng_encode.c"
#else
#include "../libretro-common/formats/bmp/rbmp_encode.c"
#endif
#include "../libretro-common/formats/bmp/rbmp_encode.c"
/*============================================================
VIDEO DRIVER

View File

@ -31,11 +31,12 @@
#include <file/file_path.h>
#include <compat/strl.h>
#include <formats/rbmp.h>
#if defined(HAVE_ZLIB_DEFLATE) && defined(HAVE_RPNG)
#include <formats/rpng.h>
#define IMG_EXT "png"
#else
#include <formats/rbmp.h>
#define IMG_EXT "bmp"
#endif