Fix building with both LTO and VPX support enabled. Specifically, don't use

the 'optimize' function attribute if LTO is enabled.

git-svn-id: https://svn.eduke32.com/eduke32@2107 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2011-11-10 21:47:03 +00:00
parent e1e09cd978
commit 63805a025b
2 changed files with 5 additions and 3 deletions

View file

@ -84,7 +84,7 @@ ifneq (0,$(RELEASE))
endif endif
ifneq (0,$(LTO)) ifneq (0,$(LTO))
LIBS+= -flto LIBS+= -flto
debug+= -flto debug+= -DUSING_LTO -flto
endif endif
else else
# Debugging enabled # Debugging enabled

View file

@ -208,10 +208,12 @@ const char *animvpx_nextpic_errmsg[] = {
// retrieves one picture-frame from the stream // retrieves one picture-frame from the stream
// pic format: lines of [Y U V 0] pixels // pic format: lines of [Y U V 0] pixels
// *picptr==NULL means EOF has been reached // *picptr==NULL means EOF has been reached
#ifdef DEBUGGINGAIDS #ifndef USING_LTO
# ifdef DEBUGGINGAIDS
ATTRIBUTE((optimize("O1"))) ATTRIBUTE((optimize("O1")))
#else # else
ATTRIBUTE((optimize("O3"))) ATTRIBUTE((optimize("O3")))
# endif
#endif #endif
int32_t animvpx_nextpic(animvpx_codec_ctx *codec, uint8_t **picptr) int32_t animvpx_nextpic(animvpx_codec_ctx *codec, uint8_t **picptr)
{ {