CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-18 00:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Exclude rbmp_encode.c for now if HAVE_RPNG is defined

Browse Source
This commit is contained in:
twinaphex 2015-09-19 02:52:23 +02:00
parent 5e71c31748
commit 0160a0a5af
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.common
View File

@ -794,9 +794,10 @@ 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/bmp/rbmp_encode.o \
libretro-common/formats/tga/tga_decode.o
OBJ += libretro-common/formats/tga/tga_decode.o
ifdef HAVE_COMPRESSION
DEFINES += -DHAVE_COMPRESSION

4
griffin/griffin.c
View File

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

11
screenshot.c
View File

@ -33,8 +33,11 @@
#if defined(HAVE_ZLIB_DEFLATE) && defined(HAVE_RPNG)
#include <formats/rpng.h>
#endif
#define IMG_EXT "png"
#else
#include <formats/rbmp.h>
#define IMG_EXT "bmp"
#endif
#include "general.h"
#include "msg_hash.h"
@ -48,12 +51,6 @@
#include "config.h"
#endif
#if defined(HAVE_ZLIB_DEFLATE) && defined(HAVE_RPNG)
#define IMG_EXT "png"
#else
#define IMG_EXT "bmp"
#endif
static bool take_screenshot_viewport(void)
{
char screenshot_path[PATH_MAX_LENGTH] = {0};