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

Set CXXFLAGS_OSX to lock us in for 10.4 support. 

Originally committed to SVN as r4031.
This commit is contained in:
Amar Takhar 2010-01-22 00:14:05 +00:00
parent 4a6e3d832d
commit 55e24552eb
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
aegisub/configure.in
View File

@ -101,6 +101,9 @@ if test "$build_darwin" = "yes"; then
DARWIN_ARCH="ppc"
fi
AC_SUBST(DARWIN_ARCH)
CXXFLAGS_OSX="-I/Developer/SDKs/MacOSX10.4u.sdk/usr/include -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
AC_SUBST(CXXFLAGS_OSX)
fi
# Used for universalchardet.

2
aegisub/libass/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LIBRARIES = libass_aegisub.a
AM_CPPFLAGS = @FREETYPE_CFLAGS@ -DCONFIG_ICONV -DCONFIG_FONTCONFIG @FONTCONFIG_CFLAGS@ @ICONV_CFLAGS@
AM_CPPFLAGS = @CXXFLAGS_OSX@ @FREETYPE_CFLAGS@ -DCONFIG_ICONV -DCONFIG_FONTCONFIG @FONTCONFIG_CFLAGS@ @ICONV_CFLAGS@
if BUILD_DARWIN
AM_CPPFLAGS += -DBUILD_DARWIN

2
aegisub/libffms/Makefile.am
View File

@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects
noinst_LIBRARIES = libffmpegsource_aegisub.a
AM_CPPFLAGS = -Icore -Iinclude -D__UNIX__ -DFFMS_EXPORTS -DHAVE_STRLCPY @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ @LIBPOSTPROC_CFLAGS@
AM_CPPFLAGS = @CXXFLAGS_OSX@ -Icore -Iinclude -D__UNIX__ -DFFMS_EXPORTS -DHAVE_STRLCPY @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ @LIBPOSTPROC_CFLAGS@
libffmpegsource_aegisub_a_SOURCES = \

2
aegisub/src/Makefile.am
View File

@ -26,7 +26,7 @@ SUBDIRS = \
$(libauto3) \
$(libosxutil_subdir)
AM_CXXFLAGS += -DAEGISUB -Iinclude -I../libffms/include @WX_CPPFLAGS@ @OPENMP_CXXFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@
AM_CXXFLAGS += -DAEGISUB -Iinclude -I../libffms/include @CXXFLAGS_OSX@ @WX_CPPFLAGS@ @OPENMP_CXXFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@
bin_PROGRAMS = aegisub-2.1
aegisub_2_1_LDADD = libresrc/libresrc.a $(libosxutil_lib)

2
aegisub/src/libosxutil/Makefile.am
View File

@ -2,7 +2,7 @@ noinst_LIBRARIES = libosxutil.a
libosxutil_a_SOURCES = bundledirs.c launch.c
libosxutil_a_CFLAGS = -I/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Headers/
libosxutil_a_CFLAGS = @CXXFLAGS_OSX@
noinst_HEADERS = libosxutil.h
CLEANFILES = bundledirs-test