- remove configurator refs

This commit is contained in:
Mark Vejvoda 2012-10-26 00:05:44 +00:00
parent bf38a83de3
commit 478c61d18f
5 changed files with 5 additions and 33 deletions

View File

@ -109,9 +109,8 @@ Please refer to the packagers' installation guides.
3. Configuration 3. Configuration
MegaGlest can be configured in three ways: MegaGlest can be configured in two ways:
- in-game config menu: most options - in-game config menu: most options
- using the separate MegaGlest Configurator
- manual editing of glestuser.ini (options) and glestuserkeys.ini (hotkeys) - manual editing of glestuser.ini (options) and glestuserkeys.ini (hotkeys)
DO NOT directly edit glest.ini and glestkeys.ini but rather edit glestuser.ini DO NOT directly edit glest.ini and glestkeys.ini but rather edit glestuser.ini

View File

@ -45,7 +45,6 @@ svn export --force "$CURRENTDIR/../../data/glest_game/megaglest.ico" $RELEASEDIR
svn export --force "$CURRENTDIR/../../data/glest_game/g3dviewer.ico" $RELEASEDIR/g3dviewer.ico svn export --force "$CURRENTDIR/../../data/glest_game/g3dviewer.ico" $RELEASEDIR/g3dviewer.ico
svn export --force "$CURRENTDIR/../../data/glest_game/editor.ico" $RELEASEDIR/editor.ico svn export --force "$CURRENTDIR/../../data/glest_game/editor.ico" $RELEASEDIR/editor.ico
svn export --force "$CURRENTDIR/start_megaglest" $RELEASEDIR/start_megaglest svn export --force "$CURRENTDIR/start_megaglest" $RELEASEDIR/start_megaglest
svn export --force "$CURRENTDIR/start_megaglest_configurator" $RELEASEDIR/start_megaglest_configurator
svn export --force "$CURRENTDIR/start_megaglest_g3dviewer" $RELEASEDIR/start_megaglest_g3dviewer svn export --force "$CURRENTDIR/start_megaglest_g3dviewer" $RELEASEDIR/start_megaglest_g3dviewer
svn export --force "$CURRENTDIR/start_megaglest_mapeditor" $RELEASEDIR/start_megaglest_mapeditor svn export --force "$CURRENTDIR/start_megaglest_mapeditor" $RELEASEDIR/start_megaglest_mapeditor
svn export --force "$CURRENTDIR/../../CMakeLists.txt" $RELEASEDIR/CMakeLists.txt svn export --force "$CURRENTDIR/../../CMakeLists.txt" $RELEASEDIR/CMakeLists.txt

View File

@ -1,22 +0,0 @@
#!/bin/sh
# Library directory
LIBDIR="lib"
# If we are launching from a symlink, such as /usr/local/bin/runglest.sh, we need to get where
# the symlink points to
pth="`readlink $0`"
# $pth will be empty if our start path wasnt a symlink
if [ $pth ]; then
GAMEDIR="`dirname $pth`"
else
GAMEDIR="`dirname $0`"
fi
# Change to the game dir, and go!
cd $GAMEDIR
# export game library directory
test -n "${LIBDIR}" && export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${GAMEDIR}/${LIBDIR}"
./megaglest_configurator $@

View File

@ -174,7 +174,6 @@ Section "${APNAME} (required)"
; Put file there ; Put file there
File "..\..\..\data\glest_game\megaglest.exe" File "..\..\..\data\glest_game\megaglest.exe"
File "..\..\..\data\glest_game\megaglest_editor.exe" File "..\..\..\data\glest_game\megaglest_editor.exe"
File "..\..\..\data\glest_game\megaglest_configurator.exe"
File "..\..\..\data\glest_game\megaglest_g3dviewer.exe" File "..\..\..\data\glest_game\megaglest_g3dviewer.exe"
File "..\..\..\data\glest_game\7z.exe" File "..\..\..\data\glest_game\7z.exe"
File "..\..\..\data\glest_game\7z.dll" File "..\..\..\data\glest_game\7z.dll"
@ -199,7 +198,6 @@ Section "Start Menu Shortcuts"
CreateShortCut "$SMPROGRAMS\${APNAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 CreateShortCut "$SMPROGRAMS\${APNAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME}.lnk" "$INSTDIR\megaglest.exe" "" "$INSTDIR\megaglest.exe" 0 "" "" "${APNAME}" CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME}.lnk" "$INSTDIR\megaglest.exe" "" "$INSTDIR\megaglest.exe" 0 "" "" "${APNAME}"
; CreateShortCut "$SMPROGRAMS\${APNAME} ${APVER}\${APNAME} Configurator.lnk" "$INSTDIR\glest_configurator.exe" "" "$INSTDIR\glest_configurator.exe" 0 "" "" "${APNAME} Config Editor"
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} Map Editor.lnk" "$INSTDIR\megaglest_editor.exe" "" "$INSTDIR\megaglest_editor.exe" 0 "" "" "${APNAME} MegaGlest Map Editor" CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} Map Editor.lnk" "$INSTDIR\megaglest_editor.exe" "" "$INSTDIR\megaglest_editor.exe" 0 "" "" "${APNAME} MegaGlest Map Editor"
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} G3D Viewer.lnk" "$INSTDIR\megaglest_g3dviewer.exe" "" "$INSTDIR\megaglest_g3dviewer.exe" 0 "" "" "${APNAME} MegaGlest G3D Viewer" CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} G3D Viewer.lnk" "$INSTDIR\megaglest_g3dviewer.exe" "" "$INSTDIR\megaglest_g3dviewer.exe" 0 "" "" "${APNAME} MegaGlest G3D Viewer"
@ -222,9 +220,7 @@ Section "Uninstall"
Delete "$INSTDIR\megaglest.exe" Delete "$INSTDIR\megaglest.exe"
Delete "$INSTDIR\megaglest_editor.exe" Delete "$INSTDIR\megaglest_editor.exe"
Delete "$INSTDIR\megaglest_configurator.exe"
Delete "$INSTDIR\megaglest_g3dviewer.exe" Delete "$INSTDIR\megaglest_g3dviewer.exe"
Delete "$INSTDIR\configuration.xml"
Delete "$INSTDIR\megaglest.ico" Delete "$INSTDIR\megaglest.ico"
Delete "$INSTDIR\glest.ini" Delete "$INSTDIR\glest.ini"
Delete "$INSTDIR\glestkeys.ini" Delete "$INSTDIR\glestkeys.ini"

View File

@ -12,7 +12,7 @@ ENDIF()
SET(EXTERNAL_LIBS "") SET(EXTERNAL_LIBS "")
SET(TARGET_NAME "libmegaglest") SET(TARGET_NAME "libmegaglest")
IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST_CONFIGURATOR OR BUILD_MEGAGLEST) IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST)
MESSAGE(STATUS "Will try to build MegaGlest shared library") MESSAGE(STATUS "Will try to build MegaGlest shared library")
INCLUDE (CheckIncludeFiles) INCLUDE (CheckIncludeFiles)