mirror of https://github.com/odrling/Aegisub
* Add a detection for platform/arch.
* Add a new condtitional BUILD_DARWIN for fontconfig/freetype font listing support. Originally committed to SVN as r2150.
This commit is contained in:
parent
abeaf06776
commit
b7af0a06d5
|
@ -103,11 +103,18 @@ else
|
||||||
UNIVCHARSET = charset_detect.cpp text_file_reader.cpp
|
UNIVCHARSET = charset_detect.cpp text_file_reader.cpp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if BUILD_DARWIN
|
||||||
|
font_lister = font_file_lister_freetype.cpp
|
||||||
|
else
|
||||||
|
font_lister = font_file_lister_fontconfig.cpp
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
## These aren't built, but are listed here so 'make dist' can always find all the sources
|
## These aren't built, but are listed here so 'make dist' can always find all the sources
|
||||||
## This should also list all Win32 specific files
|
## This should also list all Win32 specific files
|
||||||
EXTRA_aegisub_SOURCES = \
|
EXTRA_aegisub_SOURCES = \
|
||||||
|
font_file_lister.cpp \
|
||||||
|
$(font_lister) \
|
||||||
audio_player_dsound.cpp \
|
audio_player_dsound.cpp \
|
||||||
audio_player_portaudio.cpp \
|
audio_player_portaudio.cpp \
|
||||||
audio_player_pulse.cpp \
|
audio_player_pulse.cpp \
|
||||||
|
@ -205,8 +212,6 @@ aegisub_SOURCES = \
|
||||||
export_framerate.cpp \
|
export_framerate.cpp \
|
||||||
export_visible_lines.cpp \
|
export_visible_lines.cpp \
|
||||||
fft.cpp \
|
fft.cpp \
|
||||||
font_file_lister.cpp \
|
|
||||||
font_file_lister_fontconfig.cpp \
|
|
||||||
frame_main.cpp \
|
frame_main.cpp \
|
||||||
frame_main_events.cpp \
|
frame_main_events.cpp \
|
||||||
gl_text.cpp \
|
gl_text.cpp \
|
||||||
|
|
24
configure.in
24
configure.in
|
@ -34,6 +34,30 @@ AC_CONFIG_HEADER([aegisub/posix/acconf.h])
|
||||||
AC_GNU_SOURCE
|
AC_GNU_SOURCE
|
||||||
AC_CANONICAL_HOST
|
AC_CANONICAL_HOST
|
||||||
|
|
||||||
|
###########################
|
||||||
|
# Check target architecture
|
||||||
|
###########################
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([for target architecture])
|
||||||
|
case x"$target" in
|
||||||
|
xNONE | x)
|
||||||
|
target_or_host="$host" ;;
|
||||||
|
*)
|
||||||
|
target_or_host="$target" ;;
|
||||||
|
esac
|
||||||
|
AC_MSG_RESULT([$target_or_host])
|
||||||
|
|
||||||
|
case "$target_or_host" in
|
||||||
|
*-*-darwin*)
|
||||||
|
build_darwin="yes"
|
||||||
|
;;
|
||||||
|
|
||||||
|
*)
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
AM_CONDITIONAL([BUILD_DARWIN], [test "$build_darwin" = "yes"])
|
||||||
|
|
||||||
|
|
||||||
########################
|
########################
|
||||||
# Configurable variables
|
# Configurable variables
|
||||||
|
|
Loading…
Reference in New Issue