mirror of
https://github.com/UberGames/lilium-voyager.git
synced 2024-12-14 06:01:10 +00:00
Fix macOS app bundle version/renderer_prefix
Rename baseq3 to baseEF. Don't create missionpack. Don't try to add VMs to app bundle.
This commit is contained in:
parent
6ae59a4186
commit
c5e5ec3204
1 changed files with 3 additions and 61 deletions
|
@ -129,35 +129,20 @@ fi
|
|||
|
||||
AVAILABLE_ARCHS=""
|
||||
|
||||
IOQ3_VERSION=`grep '^VERSION=' Makefile | sed -e 's/.*=\(.*\)/\1/'`
|
||||
IOQ3_RENDERER_PREFIX=`grep '^RENDERER_PREFIX=' Makefile | sed -e 's/.*=\(.*\)/\1/'`
|
||||
IOQ3_VERSION="1.39" # `grep '^VERSION=' Makefile | sed -e 's/.*=\(.*\)/\1/'`
|
||||
IOQ3_RENDERER_PREFIX="liliumvoyhm_renderer_" # `grep '^RENDERER_PREFIX=' Makefile | sed -e 's/.*=\(.*\)/\1/'`
|
||||
IOQ3_CLIENT_ARCHS=""
|
||||
IOQ3_SERVER_ARCHS=""
|
||||
IOQ3_RENDERER_GL1_ARCHS=""
|
||||
IOQ3_RENDERER_GL2_ARCHS=""
|
||||
IOQ3_CGAME_ARCHS=""
|
||||
IOQ3_GAME_ARCHS=""
|
||||
IOQ3_UI_ARCHS=""
|
||||
IOQ3_MP_CGAME_ARCHS=""
|
||||
IOQ3_MP_GAME_ARCHS=""
|
||||
IOQ3_MP_UI_ARCHS=""
|
||||
|
||||
BASEDIR="baseq3"
|
||||
MISSIONPACKDIR="missionpack"
|
||||
|
||||
CGAME="cgame"
|
||||
GAME="qagame"
|
||||
UI="ui"
|
||||
BASEDIR="baseEF"
|
||||
|
||||
RENDERER_OPENGL="${IOQ3_RENDERER_PREFIX}opengl"
|
||||
|
||||
EXECUTABLE_NAME="liliumvoyhm"
|
||||
DEDICATED_NAME="liliumvoyded"
|
||||
|
||||
CGAME_NAME="${CGAME}.dylib"
|
||||
GAME_NAME="${GAME}.dylib"
|
||||
UI_NAME="${UI}.dylib"
|
||||
|
||||
RENDERER_OPENGL1_NAME="${RENDERER_OPENGL}1.dylib"
|
||||
RENDERER_OPENGL2_NAME="${RENDERER_OPENGL}2.dylib"
|
||||
|
||||
|
@ -182,9 +167,6 @@ for ARCH in $SEARCH_ARCHS; do
|
|||
IOQ3_SERVER="${DEDICATED_NAME}.${CURRENT_ARCH}"
|
||||
IOQ3_RENDERER_GL1="${RENDERER_OPENGL}1_${CURRENT_ARCH}.dylib"
|
||||
IOQ3_RENDERER_GL2="${RENDERER_OPENGL}2_${CURRENT_ARCH}.dylib"
|
||||
IOQ3_CGAME="${CGAME}${CURRENT_ARCH}.dylib"
|
||||
IOQ3_GAME="${GAME}${CURRENT_ARCH}.dylib"
|
||||
IOQ3_UI="${UI}${CURRENT_ARCH}.dylib"
|
||||
|
||||
if [ ! -d ${BUILT_PRODUCTS_DIR} ]; then
|
||||
CURRENT_ARCH=""
|
||||
|
@ -211,27 +193,6 @@ for ARCH in $SEARCH_ARCHS; do
|
|||
IOQ3_RENDERER_GL2_ARCHS="${BUILT_PRODUCTS_DIR}/${IOQ3_RENDERER_GL2} ${IOQ3_RENDERER_GL2_ARCHS}"
|
||||
fi
|
||||
|
||||
# game
|
||||
if [ -e ${BUILT_PRODUCTS_DIR}/${BASEDIR}/${IOQ3_CGAME} ]; then
|
||||
IOQ3_CGAME_ARCHS="${BUILT_PRODUCTS_DIR}/${BASEDIR}/${IOQ3_CGAME} ${IOQ3_CGAME_ARCHS}"
|
||||
fi
|
||||
if [ -e ${BUILT_PRODUCTS_DIR}/${BASEDIR}/${IOQ3_GAME} ]; then
|
||||
IOQ3_GAME_ARCHS="${BUILT_PRODUCTS_DIR}/${BASEDIR}/${IOQ3_GAME} ${IOQ3_GAME_ARCHS}"
|
||||
fi
|
||||
if [ -e ${BUILT_PRODUCTS_DIR}/${BASEDIR}/${IOQ3_UI} ]; then
|
||||
IOQ3_UI_ARCHS="${BUILT_PRODUCTS_DIR}/${BASEDIR}/${IOQ3_UI} ${IOQ3_UI_ARCHS}"
|
||||
fi
|
||||
# missionpack
|
||||
if [ -e ${BUILT_PRODUCTS_DIR}/${MISSIONPACKDIR}/${IOQ3_CGAME} ]; then
|
||||
IOQ3_MP_CGAME_ARCHS="${BUILT_PRODUCTS_DIR}/${MISSIONPACKDIR}/${IOQ3_CGAME} ${IOQ3_MP_CGAME_ARCHS}"
|
||||
fi
|
||||
if [ -e ${BUILT_PRODUCTS_DIR}/${MISSIONPACKDIR}/${IOQ3_GAME} ]; then
|
||||
IOQ3_MP_GAME_ARCHS="${BUILT_PRODUCTS_DIR}/${MISSIONPACKDIR}/${IOQ3_GAME} ${IOQ3_MP_GAME_ARCHS}"
|
||||
fi
|
||||
if [ -e ${BUILT_PRODUCTS_DIR}/${MISSIONPACKDIR}/${IOQ3_UI} ]; then
|
||||
IOQ3_MP_UI_ARCHS="${BUILT_PRODUCTS_DIR}/${MISSIONPACKDIR}/${IOQ3_UI} ${IOQ3_MP_UI_ARCHS}"
|
||||
fi
|
||||
|
||||
#echo "valid arch: ${ARCH}"
|
||||
done
|
||||
|
||||
|
@ -273,9 +234,6 @@ echo ""
|
|||
if [ ! -d "${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}/$BASEDIR" ]; then
|
||||
mkdir -p "${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}/$BASEDIR" || exit 1;
|
||||
fi
|
||||
if [ ! -d "${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}/$MISSIONPACKDIR" ]; then
|
||||
mkdir -p "${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}/$MISSIONPACKDIR" || exit 1;
|
||||
fi
|
||||
if [ ! -d "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" ]; then
|
||||
mkdir -p "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" || exit 1;
|
||||
fi
|
||||
|
@ -358,19 +316,3 @@ action "${BUNDLEBINDIR}/${RENDERER_OPENGL1_NAME}" "${IOQ3_RENDERER_GL1_ARCHS}"
|
|||
action "${BUNDLEBINDIR}/${RENDERER_OPENGL2_NAME}" "${IOQ3_RENDERER_GL2_ARCHS}"
|
||||
symlinkArch "${RENDERER_OPENGL}1" "${RENDERER_OPENGL}1" "_" "${BUNDLEBINDIR}"
|
||||
symlinkArch "${RENDERER_OPENGL}2" "${RENDERER_OPENGL}2" "_" "${BUNDLEBINDIR}"
|
||||
|
||||
# game
|
||||
action "${BUNDLEBINDIR}/${BASEDIR}/${CGAME_NAME}" "${IOQ3_CGAME_ARCHS}"
|
||||
action "${BUNDLEBINDIR}/${BASEDIR}/${GAME_NAME}" "${IOQ3_GAME_ARCHS}"
|
||||
action "${BUNDLEBINDIR}/${BASEDIR}/${UI_NAME}" "${IOQ3_UI_ARCHS}"
|
||||
symlinkArch "${CGAME}" "${CGAME}" "" "${BUNDLEBINDIR}/${BASEDIR}"
|
||||
symlinkArch "${GAME}" "${GAME}" "" "${BUNDLEBINDIR}/${BASEDIR}"
|
||||
symlinkArch "${UI}" "${UI}" "" "${BUNDLEBINDIR}/${BASEDIR}"
|
||||
|
||||
# missionpack
|
||||
action "${BUNDLEBINDIR}/${MISSIONPACKDIR}/${CGAME_NAME}" "${IOQ3_MP_CGAME_ARCHS}"
|
||||
action "${BUNDLEBINDIR}/${MISSIONPACKDIR}/${GAME_NAME}" "${IOQ3_MP_GAME_ARCHS}"
|
||||
action "${BUNDLEBINDIR}/${MISSIONPACKDIR}/${UI_NAME}" "${IOQ3_MP_UI_ARCHS}"
|
||||
symlinkArch "${CGAME}" "${CGAME}" "" "${BUNDLEBINDIR}/${MISSIONPACKDIR}"
|
||||
symlinkArch "${GAME}" "${GAME}" "" "${BUNDLEBINDIR}/${MISSIONPACKDIR}"
|
||||
symlinkArch "${UI}" "${UI}" "" "${BUNDLEBINDIR}/${MISSIONPACKDIR}"
|
||||
|
|
Loading…
Reference in a new issue