diff options
| author | Matthew Hoops | 2012-04-02 10:07:45 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-04-02 10:07:45 -0400 |
| commit | b6374a3103787415eaad1eb2ea29559bd4c7d372 (patch) | |
| tree | 05defd71f9cd141917e2c36b7fab215718763063 /ports.mk | |
| parent | 47ae65e49577b1f881c2f5956ad8550f0089a4fe (diff) | |
| parent | d50e34c1bd1152170737bea6bd85c08566426eb6 (diff) | |
| download | scummvm-rg350-b6374a3103787415eaad1eb2ea29559bd4c7d372.tar.gz scummvm-rg350-b6374a3103787415eaad1eb2ea29559bd4c7d372.tar.bz2 scummvm-rg350-b6374a3103787415eaad1eb2ea29559bd4c7d372.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'ports.mk')
| -rw-r--r-- | ports.mk | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -76,6 +76,9 @@ endif ifneq ($(BACKEND), iphone) # Static libaries, used for the scummvm-static and iphone targets 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 ifdef USE_VORBIS @@ -147,7 +150,9 @@ osxsnap: bundle $(srcdir)/devtools/credits.pl --text > $(srcdir)/AUTHORS cp $(srcdir)/AUTHORS ./ScummVM-snapshot/Authors cp $(srcdir)/COPYING ./ScummVM-snapshot/License\ \(GPL\) + cp $(srcdir)/COPYING.BSD ./ScummVM-snapshot/License\ \(BSD\) cp $(srcdir)/COPYING.LGPL ./ScummVM-snapshot/License\ \(LGPL\) + cp $(srcdir)/COPYING.FREEFONT ./ScummVM-snapshot/License\ \(FREEFONT\) cp $(srcdir)/COPYRIGHT ./ScummVM-snapshot/Copyright\ Holders cp $(srcdir)/NEWS ./ScummVM-snapshot/News cp $(srcdir)/README ./ScummVM-snapshot/ScummVM\ ReadMe @@ -214,6 +219,7 @@ ifdef DIST_FILES_ENGINEDATA endif cp $(srcdir)/AUTHORS $(WIN32PATH)/AUTHORS.txt cp $(srcdir)/COPYING $(WIN32PATH)/COPYING.txt + cp $(srcdir)/COPYING.BSD $(WIN32PATH)/COPYING.BSD.txt cp $(srcdir)/COPYING.LGPL $(WIN32PATH)/COPYING.LGPL.txt cp $(srcdir)/COPYING.FREEFONT $(WIN32PATH)/COPYING.FREEFONT.txt cp $(srcdir)/COPYRIGHT $(WIN32PATH)/COPYRIGHT.txt |