Move back to statically named mod.(ico|icns).
This simplifies early packaging attempts: showing a placeholder icon is more user friendly than throwing an error.
This commit is contained in:
parent
4f24a06be6
commit
ab69d7602f
@ -80,7 +80,7 @@ popd > /dev/null
|
|||||||
|
|
||||||
# Add mod files
|
# Add mod files
|
||||||
cp -r "${TEMPLATE_ROOT}/mods/"* "${BUILTDIR}/OpenRA.app/Contents/Resources/mods"
|
cp -r "${TEMPLATE_ROOT}/mods/"* "${BUILTDIR}/OpenRA.app/Contents/Resources/mods"
|
||||||
cp "${MOD_ID}.icns" "${BUILTDIR}/OpenRA.app/Contents/Resources/"
|
cp "mod.icns" "${BUILTDIR}/OpenRA.app/Contents/Resources/${MOD_ID}.icns"
|
||||||
|
|
||||||
pushd "${BUILTDIR}" > /dev/null
|
pushd "${BUILTDIR}" > /dev/null
|
||||||
mv "OpenRA.app" "${PACKAGING_OSX_APP_NAME}"
|
mv "OpenRA.app" "${PACKAGING_OSX_APP_NAME}"
|
||||||
|
|||||||
@ -68,12 +68,12 @@ popd > /dev/null
|
|||||||
|
|
||||||
# Add mod files
|
# Add mod files
|
||||||
cp -r "${TEMPLATE_ROOT}/mods/"* "${BUILTDIR}/mods"
|
cp -r "${TEMPLATE_ROOT}/mods/"* "${BUILTDIR}/mods"
|
||||||
cp "${MOD_ID}.ico" "${BUILTDIR}"
|
cp "mod.ico" "${BUILTDIR}/${MOD_ID}.ico"
|
||||||
cp "${SRC_DIR}/OpenRA.Game.exe.config" "${BUILTDIR}"
|
cp "${SRC_DIR}/OpenRA.Game.exe.config" "${BUILTDIR}"
|
||||||
|
|
||||||
echo "Compiling Windows launcher"
|
echo "Compiling Windows launcher"
|
||||||
sed "s|DISPLAY_NAME|${PACKAGING_DISPLAY_NAME}|" "${SRC_DIR}/packaging/windows/WindowsLauncher.cs.in" | sed "s|MOD_ID|${MOD_ID}|" | sed "s|FAQ_URL|${PACKAGING_FAQ_URL}|" > "${BUILTDIR}/WindowsLauncher.cs"
|
sed "s|DISPLAY_NAME|${PACKAGING_DISPLAY_NAME}|" "${SRC_DIR}/packaging/windows/WindowsLauncher.cs.in" | sed "s|MOD_ID|${MOD_ID}|" | sed "s|FAQ_URL|${PACKAGING_FAQ_URL}|" > "${BUILTDIR}/WindowsLauncher.cs"
|
||||||
mcs -sdk:4.5 "${BUILTDIR}/WindowsLauncher.cs" -warn:4 -codepage:utf8 -warnaserror -out:"${BUILTDIR}/${PACKAGING_WINDOWS_LAUNCHER_NAME}.exe" -t:winexe ${LAUNCHER_LIBS} -win32icon:"${MOD_ID}.ico"
|
mcs -sdk:4.5 "${BUILTDIR}/WindowsLauncher.cs" -warn:4 -codepage:utf8 -warnaserror -out:"${BUILTDIR}/${PACKAGING_WINDOWS_LAUNCHER_NAME}.exe" -t:winexe ${LAUNCHER_LIBS} -win32icon:"${BUILTDIR}/${MOD_ID}.ico"
|
||||||
rm "${BUILTDIR}/WindowsLauncher.cs"
|
rm "${BUILTDIR}/WindowsLauncher.cs"
|
||||||
mono "${SRC_DIR}/fixheader.exe" "${BUILTDIR}/${PACKAGING_WINDOWS_LAUNCHER_NAME}.exe" > /dev/null
|
mono "${SRC_DIR}/fixheader.exe" "${BUILTDIR}/${PACKAGING_WINDOWS_LAUNCHER_NAME}.exe" > /dev/null
|
||||||
|
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB |
Loading…
Reference in New Issue
Block a user