mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-02 04:22:32 +02:00
Code Issues Projects Releases Wiki Activity

- bugfixes found during testing of cmake builds

Browse Source
This commit is contained in:
Mark Vejvoda
2011-05-04 22:30:32 +00:00
parent de40d84ebd
commit f8e1a5c8cb
4 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mk/linux/makedata.sh
View File

@@ -16,6 +16,7 @@ echo '----In mk/linux'
find megaglest.bmp \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';' find megaglest.bmp \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
find megaglest.desktop \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';' find megaglest.desktop \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
find megaglest.png \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';' find megaglest.png \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
find glest.ico \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
popd popd
#ls $RELEASEDIR #ls $RELEASEDIR
@@ -29,6 +30,7 @@ find editor.ico \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
find servers.ini \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';' find servers.ini \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
find glest.ini \( -name "*" \) -exec cp -p "{}" $RELEASEDIR/glest_linux.ini ';' find glest.ini \( -name "*" \) -exec cp -p "{}" $RELEASEDIR/glest_linux.ini ';'
find glestkeys.ini \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';' find glestkeys.ini \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
find configuration.xml \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
find data/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $RELEASEDIR ';' find data/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $RELEASEDIR ';'
find docs/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $RELEASEDIR ';' find docs/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $RELEASEDIR ';'
@@ -38,7 +40,7 @@ find techs/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -pru
find tilesets/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $RELEASEDIR ';' find tilesets/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $RELEASEDIR ';'
find tutorials/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $RELEASEDIR ';' find tutorials/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $RELEASEDIR ';'
cp -p ../../CMake* $RELEASEDIR cp -p CMakeLists.txt $RELEASEDIR
popd popd
pushd $RELEASEDIR pushd $RELEASEDIR

18
source/configurator/CMakeLists.txt
View File

@@ -127,16 +127,16 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH}) DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
# Installation of the program config and image files # Installation of the program config and image files
INSTALL(FILES #INSTALL(FILES
"${PROJECT_SOURCE_DIR}/mk/linux/glest.ini" # "${PROJECT_SOURCE_DIR}/mk/linux/glest.ini"
"${PROJECT_SOURCE_DIR}/mk/linux/glestkeys.ini" # "${PROJECT_SOURCE_DIR}/mk/linux/glestkeys.ini"
"${PROJECT_SOURCE_DIR}/mk/linux/configuration.xml" # "${PROJECT_SOURCE_DIR}/mk/linux/configuration.xml"
"${PROJECT_SOURCE_DIR}/mk/linux/glest.ico" # "${PROJECT_SOURCE_DIR}/mk/linux/glest.ico"
DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}) # DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
# Installation of the program desktop icon file # Installation of the program desktop icon file
INSTALL(FILES #INSTALL(FILES
"${PROJECT_SOURCE_DIR}/mk/linux/glest.ico" # "${PROJECT_SOURCE_DIR}/mk/linux/glest.ico"
DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH}) # DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
ENDIF() ENDIF()

16
source/g3d_viewer/CMakeLists.txt
View File

@@ -128,15 +128,15 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH}) DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
# Installation of the program config and image files # Installation of the program config and image files
INSTALL(FILES #INSTALL(FILES
"${PROJECT_SOURCE_DIR}/mk/linux/glest.ini" # "${PROJECT_SOURCE_DIR}/mk/linux/glest.ini"
"${PROJECT_SOURCE_DIR}/mk/linux/glestkeys.ini" # "${PROJECT_SOURCE_DIR}/mk/linux/glestkeys.ini"
"${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico" # "${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico"
DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}) # DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
# Installation of the program desktop icon file # Installation of the program desktop icon file
INSTALL(FILES #INSTALL(FILES
"${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico" # "${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico"
DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH}) # DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
ENDIF() ENDIF()

16
source/glest_map_editor/CMakeLists.txt
View File

@@ -129,15 +129,15 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH}) DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
# Installation of the program config and image files # Installation of the program config and image files
INSTALL(FILES #INSTALL(FILES
"${PROJECT_SOURCE_DIR}/mk/linux/glest.ini" # "${PROJECT_SOURCE_DIR}/mk/linux/glest.ini"
"${PROJECT_SOURCE_DIR}/mk/linux/glestkeys.ini" # "${PROJECT_SOURCE_DIR}/mk/linux/glestkeys.ini"
"${PROJECT_SOURCE_DIR}/data/glest_game/editor.ico" # "${PROJECT_SOURCE_DIR}/data/glest_game/editor.ico"
DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}) # DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
# Installation of the program desktop icon file # Installation of the program desktop icon file
INSTALL(FILES #INSTALL(FILES
"${PROJECT_SOURCE_DIR}/data/glest_game/editor.ico" # "${PROJECT_SOURCE_DIR}/data/glest_game/editor.ico"
DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH}) # DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
ENDIF() ENDIF()