From 51d88c675f2946596420e91ec5a24bc6334f2407 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Thu, 22 Dec 2011 21:18:26 +0000 Subject: [PATCH] Actually use FFTW3_CFLAGS and FFTW3_LDFLAGS Originally committed to SVN as r6057. --- aegisub/Makefile.inc.in | 2 ++ aegisub/src/Makefile | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/aegisub/Makefile.inc.in b/aegisub/Makefile.inc.in index c87a7c483..089e9b579 100644 --- a/aegisub/Makefile.inc.in +++ b/aegisub/Makefile.inc.in @@ -88,6 +88,7 @@ CFLAGS_FONTCONFIG = @FONTCONFIG_CFLAGS@ CFLAGS_FREETYPE = @FREETYPE_CFLAGS@ CFLAGS_GL = @GL_CFLAGS@ CFLAGS_FFMS = @FFMS_CFLAGS@ +CFLAGS_FFTW3 = @FFTW3_CFLAGS@ CFLAGS_HUNSPELL = @HUNSPELL_CFLAGS@ CFLAGS_ICONV = @ICONV_CFLAGS@ CFLAGS_LIBASS = @LIBASS_CFLAGS@ @@ -105,6 +106,7 @@ LDFLAGS_FONTCONFIG = @FONTCONFIG_LIBS@ LDFLAGS_FREETYPE = @FREETYPE_LIBS@ LDFLAGS_GL = @GL_LIBS@ LDFLAGS_FFMS = @FFMS_LIBS@ +LDFLAGS_FFTW3 = @FFTW3_LIBS@ LDFLAGS_HUNSPELL = @HUNSPELL_LIBS@ LDFLAGS_ICONV = @ICONV_LDFLAGS@ LDFLAGS_LIBASS = @LIBASS_LIBS@ diff --git a/aegisub/src/Makefile b/aegisub/src/Makefile index 0f87ae60d..f962e0c96 100644 --- a/aegisub/src/Makefile +++ b/aegisub/src/Makefile @@ -7,11 +7,12 @@ PRECOMPILED_HEADER_NAME=agi_pre.h 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 += $(CFLAGS_DEBUG) $(CFLAGS_PROFILE) $(LDFLAGS_CCMALLOC) $(LDFLAGS_EFENCE) -LDFLAGS += $(LDFLAGS_GL) $(LDFLAGS_PTHREAD) $(LDFLAGS_WX) $(LDFLAGS_FREETYPE) $(LDFLAGS_FONTCONFIG) +LDFLAGS += $(CFLAGS_DEBUG) $(CFLAGS_PROFILE) $(LDFLAGS_CCMALLOC) +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 ifdef BUILD_DARWIN