epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes #2938 unbreak make install and SharpFont on Mac

Browse Source
This commit is contained in:
Matthias Mailänder
2013-04-03 13:58:27 +02:00
parent 270296f64b
commit e8c43eae92
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -257,7 +257,7 @@ install: all
@$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll $(INSTALL_DIR)
@$(INSTALL_PROGRAM) thirdparty/FuzzyLogicLibrary.dll $(INSTALL_DIR)
@$(INSTALL_PROGRAM) thirdparty/SharpFont.dll $(INSTALL_DIR)
@cp thirdparty/SharpFont.config.dll $(INSTALL_DIR)
@cp thirdparty/SharpFont.dll.config $(INSTALL_DIR)
@echo "#!/bin/sh" > openra
@echo 'BINDIR=$$(dirname $$(readlink -f $$0))' >> openra

8
thirdparty/SharpFont.dll.config vendored
View File

@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<dllmap os="linux" dll="freetype.dll" target="libfreetype.so" />
<dllmap os="osx" dll="freetype.dll" target="libfreetype.6.dylib" />
<dllmap os="windows" dll="freetype.dll" target="freetype6.dll" />
<dllmap dll="freetype.dll">
<dllentry os="linux" dll="libfreetype.so.6" />
<dllentry os="windows" dll="freetype6.dll" />
<dllentry os="osx" dll="/usr/X11/lib/libfreetype.6.dylib" />
</dllmap>
</configuration>