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

Merge pull request #153 from Salz/pullreq/agg 

revert to agg >= 2.4
This commit is contained in:
zeromus 2018-07-06 13:54:50 -04:00 committed by GitHub
parent a17bafa652 cebbb262d1
commit f79e24dba8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/src/frontend/modules/osd/agg/agg2d.h
View File

@ -242,7 +242,6 @@ public:
BlendDstAtop = agg::comp_op_dst_atop, BlendDstAtop = agg::comp_op_dst_atop,
BlendXor = agg::comp_op_xor, BlendXor = agg::comp_op_xor,
BlendAdd = agg::comp_op_plus, BlendAdd = agg::comp_op_plus,
BlendSub = agg::comp_op_minus,
BlendMultiply = agg::comp_op_multiply, BlendMultiply = agg::comp_op_multiply,
BlendScreen = agg::comp_op_screen, BlendScreen = agg::comp_op_screen,
BlendOverlay = agg::comp_op_overlay, BlendOverlay = agg::comp_op_overlay,
@ -253,8 +252,7 @@ public:
BlendHardLight = agg::comp_op_hard_light, BlendHardLight = agg::comp_op_hard_light,
BlendSoftLight = agg::comp_op_soft_light, BlendSoftLight = agg::comp_op_soft_light,
BlendDifference = agg::comp_op_difference, BlendDifference = agg::comp_op_difference,
BlendExclusion = agg::comp_op_exclusion, BlendExclusion = agg::comp_op_exclusion
BlendContrast = agg::comp_op_contrast
}; };
enum Direction enum Direction

2
desmume/src/frontend/posix/configure.ac
View File

@ -205,7 +205,7 @@ if test ! "x$HAVE_OPENAL" = "xyes" ; then
fi fi
AM_CONDITIONAL([HAVE_ALSA], [test "${HAVE_ALSA}" = "yes"]) AM_CONDITIONAL([HAVE_ALSA], [test "${HAVE_ALSA}" = "yes"])
PKG_CHECK_MODULES(LIBAGG, libagg >= 2.5.0, FOUND_LIBAGG=yes, FOUND_LIBAGG=no) PKG_CHECK_MODULES(LIBAGG, libagg >= 2.4.0, FOUND_LIBAGG=yes, FOUND_LIBAGG=no)
AM_CONDITIONAL([HAVE_LIBAGG], [test "x$libagg" = "xyes" -a "${FOUND_LIBAGG}" = "yes"]) AM_CONDITIONAL([HAVE_LIBAGG], [test "x$libagg" = "xyes" -a "${FOUND_LIBAGG}" = "yes"])
if test "x$libagg" = "xyes" ; then if test "x$libagg" = "xyes" ; then
if test "x$FOUND_LIBAGG" = "xyes" ; then if test "x$FOUND_LIBAGG" = "xyes" ; then