iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Actually use FFTW3_CFLAGS and FFTW3_LDFLAGS 

Originally committed to SVN as r6057.
This commit is contained in:
Thomas Goyne 2011-12-22 21:18:26 +00:00
parent 3a069b7f60
commit 51d88c675f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aegisub/Makefile.inc.in
View File

@ -88,6 +88,7 @@ CFLAGS_FONTCONFIG = @FONTCONFIG_CFLAGS@
CFLAGS_FREETYPE = @FREETYPE_CFLAGS@ CFLAGS_FREETYPE = @FREETYPE_CFLAGS@
CFLAGS_GL = @GL_CFLAGS@ CFLAGS_GL = @GL_CFLAGS@
CFLAGS_FFMS = @FFMS_CFLAGS@ CFLAGS_FFMS = @FFMS_CFLAGS@
CFLAGS_FFTW3 = @FFTW3_CFLAGS@
CFLAGS_HUNSPELL = @HUNSPELL_CFLAGS@ CFLAGS_HUNSPELL = @HUNSPELL_CFLAGS@
CFLAGS_ICONV = @ICONV_CFLAGS@ CFLAGS_ICONV = @ICONV_CFLAGS@
CFLAGS_LIBASS = @LIBASS_CFLAGS@ CFLAGS_LIBASS = @LIBASS_CFLAGS@
@ -105,6 +106,7 @@ LDFLAGS_FONTCONFIG = @FONTCONFIG_LIBS@
LDFLAGS_FREETYPE = @FREETYPE_LIBS@ LDFLAGS_FREETYPE = @FREETYPE_LIBS@
LDFLAGS_GL = @GL_LIBS@ LDFLAGS_GL = @GL_LIBS@
LDFLAGS_FFMS = @FFMS_LIBS@ LDFLAGS_FFMS = @FFMS_LIBS@
LDFLAGS_FFTW3 = @FFTW3_LIBS@
LDFLAGS_HUNSPELL = @HUNSPELL_LIBS@ LDFLAGS_HUNSPELL = @HUNSPELL_LIBS@
LDFLAGS_ICONV = @ICONV_LDFLAGS@ LDFLAGS_ICONV = @ICONV_LDFLAGS@
LDFLAGS_LIBASS = @LIBASS_LIBS@ LDFLAGS_LIBASS = @LIBASS_LIBS@

7
aegisub/src/Makefile
View File

@ -7,11 +7,12 @@ PRECOMPILED_HEADER_NAME=agi_pre.h
SUBDIRS = command libresrc SUBDIRS = command libresrc
CXXFLAGS += -DAEGISUB -D__STDC_FORMAT_MACROS -I. -I.. -Iinclude -I../libaegisub/include $(CFLAGS_PTHREAD) $(CPPFLAGS_WX) CXXFLAGS += -DAEGISUB -D__STDC_FORMAT_MACROS -I. -I.. -Iinclude -I../libaegisub/include $(CFLAGS_PTHREAD) $(CPPFLAGS_WX) $(CFLAGS_FFTW3)
LDFLAGS += -L../libaegisub -laegisub-3.0 LDFLAGS += -L../libaegisub -laegisub-3.0
LDFLAGS += $(CFLAGS_DEBUG) $(CFLAGS_PROFILE) $(LDFLAGS_CCMALLOC) $(LDFLAGS_EFENCE) LDFLAGS += $(CFLAGS_DEBUG) $(CFLAGS_PROFILE) $(LDFLAGS_CCMALLOC)
LDFLAGS += $(LDFLAGS_GL) $(LDFLAGS_PTHREAD) $(LDFLAGS_WX) $(LDFLAGS_FREETYPE) $(LDFLAGS_FONTCONFIG) LDFLAGS += $(LDFLAGS_EFENCE) $(LDFLAGS_GL) $(LDFLAGS_PTHREAD) $(LDFLAGS_WX)
LDFLAGS += $(LDFLAGS_FREETYPE) $(LDFLAGS_FONTCONFIG) $(LDFLAGS_FFTW3)
LDFLAGS_POST += libresrc/libresrc.a $(LDFLAGS_UCHARDET) command/aegisub_command.a LDFLAGS_POST += libresrc/libresrc.a $(LDFLAGS_UCHARDET) command/aegisub_command.a
ifdef BUILD_DARWIN ifdef BUILD_DARWIN