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

Fix misc OS X build issues, hopefully without making things even more insane. This also removes 10.4 compatibility. 

Originally committed to SVN as r5551.
This commit is contained in:
Niels Martin Hansen 2011-08-20 23:43:05 +00:00
parent b6bf91743f
commit 4be2ee900a
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aegisub/scripts/osx-fix-libs.py
View File

@ -6,7 +6,7 @@ import os
import shutil
import stat
is_bad_lib = re.compile(r'(/usr/local|/opt|/usr/lib/libexpat)').match
is_bad_lib = re.compile(r'(/usr/local|/opt)').match
is_sys_lib = re.compile(r'(/usr|/System)').match
otool_libname_extract = re.compile(r'\s+(/.*?)[\(\s:]').search
goodlist = []

5
aegisub/src/Makefile.am
View File

@ -28,11 +28,11 @@ SUBDIRS = \
$(libauto3) \
$(libosxutil_subdir)
AM_CXXFLAGS += -DAEGISUB -Iinclude @CXXFLAGS_OSX@ @WX_CPPFLAGS@ @OPENMP_CXXFLAGS@
AM_CXXFLAGS += -DAEGISUB -Iinclude @CXXFLAGS_OSX@ @WX_CXXFLAGS@ @OPENMP_CXXFLAGS@ @LIBASS_CFLAGS@
bin_PROGRAMS = aegisub-2.1
aegisub_2_1_LDADD = libresrc/libresrc.a $(libosxutil_lib)
aegisub_2_1_CPPFLAGS = @FREETYPE_CFLAGS@
aegisub_2_1_CXXFLAGS = @FREETYPE_CFLAGS@ $(AM_CXXFLAGS)
aegisub_2_1_LDFLAGS = @DEBUG_FLAGS@ @PROFILE_FLAGS@ @GL_LIBS@ @PTHREAD_LIBS@ @WX_LIBS@ @ICONV_LIBS@ $(libosxutil_ldflags) @CCMALLOC_LDFLAGS@ @EFENCE_LDFLAGS@
LIBS += @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @CCMALLOC_LIBS@
@ -98,7 +98,6 @@ aegisub_2_1_LDADD += libsubtitle_provider.a
if WITH_LIBASS
noinst_LIBRARIES += libsubtitle_ass.a
libsubtitle_ass_a_SOURCES = subtitles_provider_libass.cpp
libsubtitle_ass_a_CPPFLAGS = @LIBASS_CFLAGS@
LIBS += @LIBASS_LIBS@
aegisub_2_1_LDADD += libsubtitle_ass.a
endif