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

Move shared font files to the common mod directory.

Browse Source
This commit is contained in:
Paul Chote
2014-10-19 13:19:20 +13:00
parent 10923d6438
commit 9aab4b2be6
10 changed files with 37 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -324,7 +324,6 @@ install-core: default
@$(CP_R) glsl "$(DATA_INSTALL_DIR)" @$(CP_R) glsl "$(DATA_INSTALL_DIR)"
@$(CP_R) lua "$(DATA_INSTALL_DIR)" @$(CP_R) lua "$(DATA_INSTALL_DIR)"
@$(CP) *.ttf "$(DATA_INSTALL_DIR)"
@$(CP) SDL2-CS* "$(DATA_INSTALL_DIR)" @$(CP) SDL2-CS* "$(DATA_INSTALL_DIR)"
@$(CP) Eluant* "$(DATA_INSTALL_DIR)" @$(CP) Eluant* "$(DATA_INSTALL_DIR)"
@$(INSTALL_PROGRAM) ICSharpCode.SharpZipLib.dll "$(DATA_INSTALL_DIR)" @$(INSTALL_PROGRAM) ICSharpCode.SharpZipLib.dll "$(DATA_INSTALL_DIR)"

16
mods/cnc/mod.yaml
View File

@@ -171,28 +171,28 @@ ChromeMetrics:
Fonts: Fonts:
Small: Small:
Font:./FreeSans.ttf Font:./mods/common/FreeSans.ttf
Size:12 Size:12
Regular: Regular:
Font:./FreeSans.ttf Font:./mods/common/FreeSans.ttf
Size:14 Size:14
Bold: Bold:
Font:./FreeSansBold.ttf Font:./mods/common/FreeSansBold.ttf
Size:14 Size:14
Title: Title:
Font:./FreeSansBold.ttf Font:./mods/common/FreeSansBold.ttf
Size:32 Size:32
MediumBold: MediumBold:
Font:./FreeSansBold.ttf Font:./mods/common/FreeSansBold.ttf
Size:18 Size:18
BigBold: BigBold:
Font:./FreeSansBold.ttf Font:./mods/common/FreeSansBold.ttf
Size:24 Size:24
Tiny: Tiny:
Font:./FreeSans.ttf Font:./mods/common/FreeSans.ttf
Size:10 Size:10
TinyBold: TinyBold:
Font:./FreeSansBold.ttf Font:./mods/common/FreeSansBold.ttf
Size:10 Size:10
LuaScripts: LuaScripts:

0
FreeSans.ttf → mods/common/FreeSans.ttf
View File

0
FreeSansBold.ttf → mods/common/FreeSansBold.ttf
View File

14
mods/d2k/mod.yaml
View File

@@ -152,28 +152,28 @@ ChromeMetrics:
Fonts: Fonts:
Regular: Regular:
Font:./FreeSans.ttf Font:./mods/common/FreeSans.ttf
Size:14 Size:14
Bold: Bold:
Font:./FreeSansBold.ttf Font:./mods/common/FreeSansBold.ttf
Size:14 Size:14
Title: Title:
Font:./mods/d2k/Dune2k.ttf Font:./mods/d2k/Dune2k.ttf
Size:32 Size:32
MediumBold: MediumBold:
Font:./FreeSansBold.ttf Font:./mods/common/FreeSansBold.ttf
Size:18 Size:18
BigBold: BigBold:
Font:./FreeSansBold.ttf Font:./mods/common/FreeSansBold.ttf
Size:24 Size:24
Small: Small:
Font:./FreeSans.ttf Font:./mods/common/FreeSans.ttf
Size:12 Size:12
Tiny: Tiny:
Font:./FreeSans.ttf Font:./mods/common/FreeSans.ttf
Size:10 Size:10
TinyBold: TinyBold:
Font:./FreeSansBold.ttf Font:./mods/common/FreeSansBold.ttf
Size:10 Size:10
LuaScripts: LuaScripts:

12
mods/modchooser/mod.yaml
View File

@@ -31,22 +31,22 @@ ChromeMetrics:
Fonts: Fonts:
Regular: Regular:
Font:./FreeSans.ttf Font:./mods/common/FreeSans.ttf
Size:14 Size:14
Bold: Bold:
Font:./FreeSansBold.ttf Font:./mods/common/FreeSansBold.ttf
Size:14 Size:14
BigBold: BigBold:
Font:./FreeSansBold.ttf Font:./mods/common/FreeSansBold.ttf
Size:24 Size:24
MediumBold: MediumBold:
Font:./FreeSansBold.ttf Font:./mods/common/FreeSansBold.ttf
Size:18 Size:18
Tiny: Tiny:
Font:./FreeSans.ttf Font:./mods/common/FreeSans.ttf
Size:10 Size:10
TinyBold: TinyBold:
Font:./FreeSansBold.ttf Font:./mods/common/FreeSansBold.ttf
Size:10 Size:10
LobbyDefaults: LobbyDefaults:

14
mods/ra/mod.yaml
View File

@@ -168,28 +168,28 @@ ChromeMetrics:
Fonts: Fonts:
Regular: Regular:
Font:./FreeSans.ttf Font:./mods/common/FreeSans.ttf
Size:14 Size:14
Bold: Bold:
Font:./FreeSansBold.ttf Font:./mods/common/FreeSansBold.ttf
Size:14 Size:14
Title: Title:
Font:./mods/ra/ZoodRangmah.ttf Font:./mods/ra/ZoodRangmah.ttf
Size:48 Size:48
MediumBold: MediumBold:
Font:./FreeSansBold.ttf Font:./mods/common/FreeSansBold.ttf
Size:18 Size:18
BigBold: BigBold:
Font:./FreeSansBold.ttf Font:./mods/common/FreeSansBold.ttf
Size:24 Size:24
Small: Small:
Font:./FreeSans.ttf Font:./mods/common/FreeSans.ttf
Size:12 Size:12
Tiny: Tiny:
Font:./FreeSans.ttf Font:./mods/common/FreeSans.ttf
Size:10 Size:10
TinyBold: TinyBold:
Font:./FreeSansBold.ttf Font:./mods/common/FreeSansBold.ttf
Size:10 Size:10
LuaScripts: LuaScripts:

14
mods/ts/mod.yaml
View File

@@ -196,25 +196,25 @@ ChromeMetrics:
Fonts: Fonts:
Regular: Regular:
Font:./FreeSans.ttf Font:./mods/common/FreeSans.ttf
Size:14 Size:14
Bold: Bold:
Font:./FreeSansBold.ttf Font:./mods/common/FreeSansBold.ttf
Size:14 Size:14
Title: Title:
Font:./FreeSansBold.ttf Font:./mods/common/FreeSansBold.ttf
Size:32 Size:32
BigBold: BigBold:
Font:./FreeSansBold.ttf Font:./mods/common/FreeSansBold.ttf
Size:24 Size:24
Small: Small:
Font:./FreeSans.ttf Font:./mods/common/FreeSans.ttf
Size:12 Size:12
Tiny: Tiny:
Font:./FreeSans.ttf Font:./mods/common/FreeSans.ttf
Size:10 Size:10
TinyBold: TinyBold:
Font:./FreeSansBold.ttf Font:./mods/common/FreeSansBold.ttf
Size:10 Size:10
LuaScripts: LuaScripts:

6
packaging/package-all.sh
View File

@@ -32,10 +32,8 @@ markdown Lua-API.md > Lua-API.html
# List of files that are packaged on all platforms # List of files that are packaged on all platforms
FILES=('OpenRA.Game.exe' 'OpenRA.Editor.exe' 'OpenRA.Utility.exe' 'OpenRA.CrashDialog.exe' \ FILES=('OpenRA.Game.exe' 'OpenRA.Editor.exe' 'OpenRA.Utility.exe' 'OpenRA.CrashDialog.exe' \
'OpenRA.Renderer.Sdl2.dll' 'OpenRA.Renderer.Null.dll' \ 'OpenRA.Renderer.Sdl2.dll' 'OpenRA.Renderer.Null.dll' \
'FreeSans.ttf' 'FreeSansBold.ttf' 'lua' \ 'lua' 'glsl' 'mods/common' 'mods/ra' 'mods/cnc' 'mods/d2k' 'mods/modchooser' \
'glsl' 'mods/common' 'mods/ra' 'mods/cnc' 'mods/d2k' 'mods/modchooser' \ 'AUTHORS' 'COPYING' 'README.html' 'CONTRIBUTING.html' 'DOCUMENTATION.html' 'CHANGELOG.html' \
'AUTHORS' 'COPYING' \
'README.html' 'CONTRIBUTING.html' 'DOCUMENTATION.html' 'CHANGELOG.html' \
'global mix database.dat' 'GeoLite2-Country.mmdb') 'global mix database.dat' 'GeoLite2-Country.mmdb')
echo "Copying files..." echo "Copying files..."

2
packaging/windows/OpenRA.nsi
View File

@@ -79,7 +79,6 @@ Section "Game" GAME
File "${SRCDIR}\CHANGELOG.html" File "${SRCDIR}\CHANGELOG.html"
File "${SRCDIR}\CONTRIBUTING.html" File "${SRCDIR}\CONTRIBUTING.html"
File "${SRCDIR}\DOCUMENTATION.html" File "${SRCDIR}\DOCUMENTATION.html"
File "${SRCDIR}\*.ttf"
File "${SRCDIR}\OpenRA.ico" File "${SRCDIR}\OpenRA.ico"
File "${SRCDIR}\SharpFont.dll" File "${SRCDIR}\SharpFont.dll"
File "${SRCDIR}\SDL2-CS.dll" File "${SRCDIR}\SDL2-CS.dll"
@@ -200,7 +199,6 @@ Function ${UN}Clean
Delete $INSTDIR\CONTRIBUTING.html Delete $INSTDIR\CONTRIBUTING.html
Delete $INSTDIR\DOCUMENTATION.html Delete $INSTDIR\DOCUMENTATION.html
Delete $INSTDIR\OpenRA.ico Delete $INSTDIR\OpenRA.ico
Delete $INSTDIR\*.ttf
Delete "$INSTDIR\global mix database.dat" Delete "$INSTDIR\global mix database.dat"
Delete $INSTDIR\MaxMind.Db.dll Delete $INSTDIR\MaxMind.Db.dll
Delete $INSTDIR\MaxMind.GeoIP2.dll Delete $INSTDIR\MaxMind.GeoIP2.dll