diff --git a/aegisub/Makefile.inc.in b/aegisub/Makefile.inc.in index 3fb37a713..e9285624f 100644 --- a/aegisub/Makefile.inc.in +++ b/aegisub/Makefile.inc.in @@ -27,7 +27,6 @@ CFLAGS_DEP = -MD -MP LIBS = @LIBS@ LDFLAGS = @LDFLAGS@ INSTALL_FLAGS = -m 664 -CCACHE_ENV = CCACHE_SLOPPINESS=time_macros LIB_SHARED_LINK = -shared -Wl,-soname -Wl,$(LIB_SHARED_FULL) LIB_SHARED_LINK_OSX = -dynamiclib -Wl,-undefined -Wl,dynamic_lookup -compatibility_version $(LIB_VERSION) -current_version $(LIB_VERSION) -Wl,-single_module -mmacosx-version-min=10.7 -install_name ${CURDIR}/$(LIB_SHARED_FULL) @@ -116,14 +115,6 @@ LIBS_UCHARDET ?= ../universalchardet/libuniversalchardet.a # DEBUG / DEVELOPMENT ##################### PRECOMPILED_HEADER = @enable_gcc_prec@ -CCACHE_ENABLE = @enable_ccache@ -LDFLAGS_CCMALLOC = @CCMALLOC_LDFLAGS@ -LIBS_EFENCE = @EFENCE_LIBS@ -LIBS_GCOV = @GCOV_LIBS@ - -CFLAGS_EFENCE = @EFENCE_CFLAGS@ -CFLAGS_GCOV = @GCOV_CFLAGS@ - ENABLE_REPORTER = @ENABLE_REPORTER@ ########## diff --git a/aegisub/configure.ac b/aegisub/configure.ac index 5f4393e02..bb9b1b0e8 100644 --- a/aegisub/configure.ac +++ b/aegisub/configure.ac @@ -203,11 +203,6 @@ AS_IF([test x$with_libc__ != xno], [ ###################################### # Check Headers / Features / Libraries ###################################### -AC_HEADER_STDC -AC_HEADER_STDBOOL -AC_C_CONST -AC_C_INLINE -AC_C_VOLATILE AC_CHECK_LIB([m], [main]) AC_AGI_COMPILE([pragma once], [pragma_once], [], [],[ @@ -492,90 +487,6 @@ AC_PCH_FLAG([-Winvalid-pch]) AC_PCH_FLAG([-fpch-deps]) AC_PCH_FLAG([-fpch-preprocess]) -########### -# Profiling -########### -AC_ARG_VAR([PROFILE_FLAGS], [Profile flag(s) to use with --enable-profile [-pg]]) - -AC_MSG_CHECKING([whether to turn on profiling]) -AC_ARG_ENABLE(profile, AS_HELP_STRING([--enable-profile],[enable profiling [no]])) -AS_IF([test x$enable_profile = xyes], [ - PROFILE_FLAGS=${PROFILE_FLAGS:--pg} - AC_MSG_RESULT([yes ($PROFILE_FLAGS)]) - CFLAGS="$PROFILE_FLAGS $CFLAGS" -], [ - enable_profile="no" - AC_MSG_RESULT([no]) -]) - - -###### -# gcov -###### -AC_ARG_VAR([GCOV_CFLAGS], [gcov cflag(s) to use with --enable-gcov [-ftest-coverage -fprofile-arcs]]) -AC_ARG_VAR([GCOV_LIBS], [gcov ldflag(s) to use with --enable-gcov [-lgcov]]) - -AC_MSG_CHECKING([whether to turn on gcov]) -AC_ARG_ENABLE(gcov, AS_HELP_STRING([--enable-gcov],[enable gcov [no]])) - -AS_IF([test x$enable_gcov = xyes], [ - GCOV_CFLAGS=${GCOV_CLFAGS:--fprofile-arcs -ftest-coverage} - GCOV_LIBS=${GCOV_LIBS:--lgcov} - - AC_MSG_RESULT([yes ($GCOV_CFLAGS) ($GCOV_LIBS)]) - CFLAGS="$CFLAGS $GCOV_CFLAGS" - LIBS="$LIBS $GCOV_LIBS" -], [ - enable_gcov="no" - AC_MSG_RESULT([no]) -]) - -################ -# Electric Fence -################ -AC_ARG_VAR([EFENCE_LIBS], [Electric Fence ldflag(s) to use with --enable-profile [-lefence]]) - -AC_MSG_CHECKING([whether to turn on Electric Fence]) -AC_ARG_ENABLE(efence, AS_HELP_STRING([--enable-efence],[enable Electric Fence [no]])) -AS_IF([test x$enable_efence = xyes], [ - EFENCE_LIBS=${EFENCE_LIBS:--lefence} - AC_MSG_RESULT([yes ($EFENCE_LIBS)]) -], [ - enable_efence="no" - AC_MSG_RESULT([no]) -]) -AC_SUBST(EFENCE_LIBS) - -########## -# ccmalloc -########## -AC_ARG_VAR([CCMALLOC_LIBS], [ccmalloc libs(s) to use with --enable-ccmalloc [$prefix/lib/ccmalloc-c++.o]]) -AC_ARG_VAR([CCMALLOC_LDFLAGS], [ccmalloc ldflag(s) to use with --enable-ccmalloc [-lccmalloc]]) - -AC_MSG_CHECKING([whether to turn on ccmalloc]) -AC_ARG_ENABLE(ccmalloc, AS_HELP_STRING([--enable-ccmalloc],[enable ccmalloc [no]])) -AS_IF([test x$enable_ccmalloc = xyes], [ - CCMALLOC_LIBS=${CCMALLOC_LIBS:-$prefix/lib/ccmalloc-c++.o} - CCMALLOC_LDFLAGS=${CCMALLOC_LDFLAGS:--lccmalloc} - AC_MSG_RESULT([yes ($CCMALLOC_LIBS $CCMALLOC_LDFLAGS)]) -], [ - enable_ccmalloc="no" - AC_MSG_RESULT([no]) -]) -AC_SUBST(CCMALLOC_LDFLAGS) -AC_SUBST(CCMALLOC_LIBS) - -AS_IF([test x$enable_efence = xyes && test x$enable_ccmalloc = xyes], - [AC_MSG_FAILURE([Please enable Electric Fence _or_ ccmalloc otherwise strange things will happen.])]) - -######## -# ccache -######## -AC_MSG_CHECKING([whether to enable ccache]) -AC_ARG_ENABLE(ccache, AS_HELP_STRING([--enable-ccache],[enable ccache [no]])) -AC_MSG_RESULT(${enable_ccache:=no}) -AC_SUBST(enable_ccache) - ############################## # Internationalisation support ############################## diff --git a/aegisub/src/Makefile b/aegisub/src/Makefile index 2865598c3..02ca9a4f2 100644 --- a/aegisub/src/Makefile +++ b/aegisub/src/Makefile @@ -5,18 +5,16 @@ PROGRAM_INSTALL = yes PRECOMPILED_HEADER_NAME=agi_pre.h -AEGISUB_CFLAGS = -I. -I.. -Iinclude -I../libaegisub/include -I../build -DAEGISUB $(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_PROFILE) $(CFLAGS_ICU) +AEGISUB_CFLAGS = -I. -I.. -Iinclude -I../libaegisub/include -I../build -DAEGISUB $(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU) CFLAGS += $(AEGISUB_CFLAGS) CXXFLAGS += $(AEGISUB_CFLAGS) -D__STDC_FORMAT_MACROS $(CXXFLAGS_WX) -LIBS := -L../libaegisub -laegisub $(LIBS) $(LIBS_CCMALLOC) $(LIBS_EFENCE) +LIBS := -L../libaegisub -laegisub $(LIBS) LIBS += $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) LIBS += $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_UCHARDET) $(LIBS_BOOST) LIBS += $(LIBS_ICU) $(LIBS_LUA) -LDFLAGS += $(LDFLAGS_CCMALLOC) - ifeq (yes, $(BUILD_DARWIN)) SRC += osx_utils.mm endif