Skip to content

Commit

Permalink
Merge pull request scummvm#212 from aquadran/master
Browse files Browse the repository at this point in the history 
OSX: fix making bundle when freetype2 is enabled
  • Loading branch information
@aquadran
aquadran committed Mar 22, 2012
2 parents 57abb8f + fb3ac5a commit 47c72db
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion configure
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3501,7 +3501,7 @@ fi
echocheck "FreeType2" echocheck "FreeType2"
echo "$_freetype2" echo "$_freetype2"


define_in_config_h_if_yes "$_freetype2" "USE_FREETYPE2" define_in_config_if_yes "$_freetype2" "USE_FREETYPE2"


# #
# Check for OpenGL (ES) # Check for OpenGL (ES)
Expand Down
3 changes: 3 additions & 0 deletions ports.mk
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ endif
ifneq ($(BACKEND), iphone) ifneq ($(BACKEND), iphone)
# Static libaries, used for the scummvm-static and iphone targets # Static libaries, used for the scummvm-static and iphone targets
OSX_STATIC_LIBS := `$(STATICLIBPATH)/bin/sdl-config --static-libs` OSX_STATIC_LIBS := `$(STATICLIBPATH)/bin/sdl-config --static-libs`
ifdef USE_FREETYPE2
OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libfreetype.a $(STATICLIBPATH)/lib/libbz2.a
endif
endif endif


ifdef USE_VORBIS ifdef USE_VORBIS
Expand Down

0 comments on commit 47c72db

Please sign in to comment.