mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

* Add target platform detection, at the moment this only uses OS info.

Browse source 
* Fix font_file_lister to use fontconfig for unix, freetype for OS X
* Set bevelbutton to be conditional for Darwin only. (this fixes the header
  missing header as well)

Originally committed to SVN as r2152.
This commit is contained in:
Amar Takhar 2008-03-29 22:30:30 +00:00
parent d6e76cee4f
commit 0fb1fee1a8
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
aegisub/Makefile.am
View file

@ -104,9 +104,12 @@ UNIVCHARSET = charset_detect.cpp text_file_reader.cpp
endif endif
if BUILD_DARWIN if BUILD_DARWIN
font_lister = font_file_lister_freetype.cpp FONT_LISTER = font_file_lister_freetype.cpp
else BEVEL_BUTTON = macosx/bevelButton.cpp
font_lister = font_file_lister_fontconfig.cpp endif
if BUILD_DEFAULT
FONT_LISTER = font_file_lister_fontconfig.cpp
endif endif
@ -114,7 +117,7 @@ endif
## 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_file_lister.cpp \
$(font_lister) \ $(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 \
@ -132,6 +135,7 @@ EXTRA_aegisub_SOURCES = \
dialog_associations.cpp \ dialog_associations.cpp \
lavc_file.cpp \ lavc_file.cpp \
lavc_keyframes.cpp \ lavc_keyframes.cpp \
macosx/bevelButton.cpp \
setup.cpp \ setup.cpp \
spellchecker_hunspell.cpp \ spellchecker_hunspell.cpp \
stdwx.cpp \ stdwx.cpp \
@ -141,12 +145,16 @@ EXTRA_aegisub_SOURCES = \
video_provider_dshow.cpp \ video_provider_dshow.cpp \
video_provider_lavc.cpp video_provider_lavc.cpp
aegisub_SOURCES = \ aegisub_SOURCES = \
$(AUTO3_LUA) \ $(AUTO3_LUA) \
$(FFMPEG) \ $(FFMPEG) \
$(HUNSPELL) \ $(HUNSPELL) \
$(LIBASS) \ $(LIBASS) \
$(UNIVCHARSET) \ $(UNIVCHARSET) \
$(BEVEL_BUTTON) \
font_file_lister.cpp \
$(FONT_LISTER) \
MatroskaParser.c \ MatroskaParser.c \
aegisublocale.cpp \ aegisublocale.cpp \
ass_attachment.cpp \ ass_attachment.cpp \
@ -222,7 +230,6 @@ aegisub_SOURCES = \
idle_field_event.cpp \ idle_field_event.cpp \
kana_table.cpp \ kana_table.cpp \
keyframe.cpp \ keyframe.cpp \
macosx/bevelButton.cpp \
main.cpp \ main.cpp \
md5.c \ md5.c \
mkv_wrap.cpp \ mkv_wrap.cpp \
@ -289,7 +296,8 @@ aegisub_SOURCES += \
noinst_HEADERS = \ noinst_HEADERS = \
$(srcdir)/boost/*.hpp \ $(srcdir)/boost/*.hpp \
gl/glext.h \ gl/glext.h \
$(srcdir)/*.hxx $(srcdir)/*.hxx \
macosx/bevelButton.h
EXTRA_DIST = \ EXTRA_DIST = \
auto4_perldata.inc \ auto4_perldata.inc \

3
configure.in
View file

@ -53,10 +53,13 @@ case "$target_or_host" in
;; ;;
*) *)
build_default="yes"
;; ;;
esac esac
AM_CONDITIONAL([BUILD_DARWIN], [test "$build_darwin" = "yes"]) AM_CONDITIONAL([BUILD_DARWIN], [test "$build_darwin" = "yes"])
AM_CONDITIONAL([BUILD_DEFAULT], [test "$build_default" = "yes"])
######################## ########################