Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- renamed megalgest.bin to megaglest and megaglest to start_megaglest

This commit is contained in:
Mark Vejvoda 2011-05-05 03:31:18 +00:00
parent f8e1a5c8cb
commit 6db2b394bf
8 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build-mg.sh
View File

@ -8,6 +8,6 @@ make
cd ..
echo 'You may now launch MegaGlest from this directory like this:'
echo 'mk/linux/megaglest.bin --ini-path=mk/linux/ --data-path=mk/linux/'
echo 'mk/linux/megaglest --ini-path=mk/linux/ --data-path=mk/linux/'
echo 'or from within the build directory:'
echo '../mk/linux/megaglest.bin --ini-path=../mk/linux/ --data-path=../mk/linux/'
echo '../mk/linux/megaglest --ini-path=../mk/linux/ --data-path=../mk/linux/'

4
mk/linux/makedeps_folder.sh
View File

@ -86,8 +86,8 @@ sync_support_libs(){
}
usage(){
echo "Syntax : $0 megaglest.bin
echo "Example: $0 megaglest.bin
echo "Syntax : $0 megaglest
echo "Example: $0 megaglest
exit 1
}

2
mk/linux/makerelease.sh
View File

@ -34,7 +34,7 @@ cp -p servers.ini $RELEASEDIR
cp -p glest.ico $RELEASEDIR
cp -p megaglest.png $RELEASEDIR
cp -p megaglest.desktop $RELEASEDIR
cp -p megaglest $RELEASEDIR
cp -p start_megaglest $RELEASEDIR
cp -p start_megaglest_configurator $RELEASEDIR
cp -p start_megaglest_mapeditor $RELEASEDIR
cp -p start_megaglest_g3dviewer $RELEASEDIR

8
mk/linux/mojosetup/megaglest-installer/make.sh
View File

@ -145,8 +145,8 @@ if [ $REPACKONLY -eq 0 ]; then
pushd "`pwd`/$megaglest_linux_path"
find megaglest -exec cp -p --parents "{}" $INSTALLDATADIR ';'
find megaglest.bin -exec cp -p --parents "{}" ${INSTALLDATADIR}bin ';'
find start_megaglest -exec cp -p --parents "{}" $INSTALLDATADIR ';'
find megaglest -exec cp -p --parents "{}" ${INSTALLDATADIR}bin ';'
find glest.ini -exec cp -p --parents "{}" $INSTALLDATADIR ';'
find megaglest.bmp -exec cp -p --parents "{}" $INSTALLDATADIR ';'
find glestkeys.ini -exec cp -p --parents "{}" $INSTALLDATADIR ';'
@ -211,9 +211,9 @@ if [ $REPACKONLY -eq 0 ]; then
find data/ -name "*~" -exec rm -rf {} \;
find data/ -name "*.bak" -exec rm -rf {} \;
# Copy shared lib dependencies for megaglest.bin
# Copy shared lib dependencies for megaglest
cd data
copyGlestDeptsCmd="${INSTALL_ROOTDIR}makedeps_folder.sh bin/megaglest.bin"
copyGlestDeptsCmd="${INSTALL_ROOTDIR}makedeps_folder.sh bin/megaglest"
$copyGlestDeptsCmd
cd ..
fi

4
mk/linux/mojosetup/megaglest-installer/makedeps_folder.sh
View File

@ -86,8 +86,8 @@ sync_support_libs(){
}
usage(){
echo "Syntax : $0 megaglest.bin
echo "Example: $0 megaglest.bin
echo "Syntax : $0 megaglest
echo "Example: $0 megaglest
exit 1
}

2
mk/linux/mojosetup/megaglest-installer/scripts/config.lua
View File

@ -102,7 +102,7 @@ Setup.Package
tooltip = _("A real time strategy game."),
builtin_icon = false,
icon = "megaglest.ico",
commandline = "%0/megaglest",
commandline = "%0/start_megaglest",
category = "Game;StrategyGame"
},

0
mk/linux/megaglest → mk/linux/start_megaglest
View File

27
source/glest_game/CMakeLists.txt
View File

@ -169,7 +169,7 @@ ENDIF()
IF(WIN32)
SET(TARGET_NAME "megaglest")
ELSE()
SET(TARGET_NAME "megaglest.bin")
SET(TARGET_NAME "megaglest")
ENDIF()
IF(UNIX AND NOT APPLE)
@ -192,20 +192,21 @@ TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})
# Requires an install prefix for the items below to work
IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
IF(NOT WIN32)
#IF(NOT WIN32)
#set_target_properties(megaglest.bin PROPERTIES OUTPUT_NAME "megaglest")
# rename the binary for installation
MESSAGE(STATUS "Copying [${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}] to [${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_BIN_INSTALL_PATH}/megaglest]")
install(CODE
"EXECUTE_PROCESS(COMMAND \"cmake\" \"-E\" \"copy\" \"${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}\" \"${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_BIN_INSTALL_PATH}/megaglest\")")
# MESSAGE(STATUS "Copying [${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}] to [${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_BIN_INSTALL_PATH}/megaglest]")
# install(CODE
# "EXECUTE_PROCESS(COMMAND \"cmake\" \"-E\" \"copy\" \"${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}\" \"${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_BIN_INSTALL_PATH}/megaglest\")")
install(CODE
"EXECUTE_PROCESS(COMMAND \"chmod\" \"+x\" \"${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_BIN_INSTALL_PATH}/megaglest\")")
# install(CODE
# "EXECUTE_PROCESS(COMMAND \"chmod\" \"+x\" \"${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_BIN_INSTALL_PATH}/megaglest\")")
ELSE()
# Installation of the program
INSTALL(TARGETS
${TARGET_NAME}
DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
ENDIF()
#ELSE()
# Installation of the program
INSTALL(TARGETS
${TARGET_NAME}
DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
#ENDIF()
ENDIF()