- renamed Linux binaries launch scripts start with start_megaglest_x and binaries start with megaglest_
This commit is contained in:
parent
c11a3de8f0
commit
9b1893054f
|
@ -147,3 +147,4 @@ ADD_SUBDIRECTORY( source/tools/glexemel )
|
|||
IF(APPLE)
|
||||
include(mk/macosx/CMakeLists.txt)
|
||||
ENDIF(APPLE)
|
||||
|
||||
|
|
|
@ -8,4 +8,6 @@ make
|
|||
|
||||
cd ..
|
||||
echo 'You may now launch mega-glest from this directory like this:'
|
||||
echo 'mk/linux/glest.bin --ini-path=mk/linux/ --data-path=mk/linux/'
|
||||
echo 'mk/linux/megaglest.bin --ini-path=mk/linux/ --data-path=mk/linux/'
|
||||
echo 'or from within the build folder:'
|
||||
echo '../mk/linux/megaglest.bin --ini-path=../mk/linux/ --data-path=../mk/linux/'
|
||||
|
|
|
@ -6,7 +6,7 @@ set -e
|
|||
# (c) 2006 nixCraft under GNU GPL v2.0+
|
||||
# Last updated on: Apr/06/2010 by Vivek Gite
|
||||
# ----------------------------------------------------------------------------
|
||||
# + Modified for glest deployment - Softcoder
|
||||
# + Modified for megaglest deployment - Softcoder
|
||||
# + Added ld-linux support
|
||||
# + Added error checking support
|
||||
# + Added for loop so that we can process all files on cmd
|
||||
|
@ -86,8 +86,8 @@ sync_support_libs(){
|
|||
}
|
||||
|
||||
usage(){
|
||||
echo "Syntax : $0 glest.bin
|
||||
echo "Example: $0 glest.bin
|
||||
echo "Syntax : $0 megaglest.bin
|
||||
echo "Example: $0 megaglest.bin
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
|
|
@ -178,5 +178,6 @@ findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${ICUUC_LINKEDLIBNAME}" "$ICUUC_LIBL
|
|||
# rm -r techs/megapack/factions/norsemen/upgrades/training_field
|
||||
#fi
|
||||
|
||||
./bin/glest.bin $@
|
||||
# ./bin/glest.bin $@ 2>&1 | tee -a /tmp/`date +"%F_%k-%M-%S"`.glest.log 2>&1
|
||||
./bin/megaglest.bin $@
|
||||
# ./bin/megaglest.bin $@ 2>&1 | tee -a /tmp/`date +"%F_%k-%M-%S"`.glest.log 2>&1
|
||||
|
|
@ -58,7 +58,7 @@ Setup.Package
|
|||
tooltip = _("A real time strategy game."),
|
||||
builtin_icon = false,
|
||||
icon = "megaglest.ico",
|
||||
commandline = "%0/glest",
|
||||
commandline = "%0/megaglest",
|
||||
category = "Game;StrategyGame"
|
||||
},
|
||||
|
||||
|
@ -70,7 +70,7 @@ Setup.Package
|
|||
tooltip = _("A real time strategy game."),
|
||||
builtin_icon = false,
|
||||
icon = "editor.ico",
|
||||
commandline = "%0/editor",
|
||||
commandline = "%0/start_megaglest_editor",
|
||||
category = "Game;StrategyGame"
|
||||
},
|
||||
|
||||
|
@ -82,7 +82,7 @@ Setup.Package
|
|||
tooltip = _("A real time strategy game."),
|
||||
builtin_icon = false,
|
||||
icon = "g3dviewer.ico",
|
||||
commandline = "%0/g3dviewer",
|
||||
commandline = "%0/start_megaglest_g3dviewer",
|
||||
category = "Game;StrategyGame"
|
||||
},
|
||||
|
||||
|
|
|
@ -19,5 +19,5 @@ cd $GAMEDIR
|
|||
# export game library directory
|
||||
test -n "${LIBDIR}" && export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${GAMEDIR}/${LIBDIR}"
|
||||
|
||||
./bin/glest_configurator
|
||||
./bin/megaglest_configurator
|
||||
|
|
@ -124,5 +124,5 @@ findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${DIRECTFB_LINKEDLIBNAME}" "$DIRECTF
|
|||
findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${FUSION_LINKEDLIBNAME}" "$FUSION_LIBLOOKUP1" "$FUSION_LIBLOOKUP2"
|
||||
findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${DIRECT_LINKEDLIBNAME}" "$DIRECT_LIBLOOKUP1" "$DIRECT_LIBLOOKUP2"
|
||||
|
||||
./bin/glest_g3dviewer "$1"
|
||||
./bin/megaglest_g3dviewer "$1"
|
||||
|
|
@ -124,6 +124,6 @@ findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${DIRECTFB_LINKEDLIBNAME}" "$DIRECTF
|
|||
findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${FUSION_LINKEDLIBNAME}" "$FUSION_LIBLOOKUP1" "$FUSION_LIBLOOKUP2"
|
||||
findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${DIRECT_LINKEDLIBNAME}" "$DIRECT_LIBLOOKUP1" "$DIRECT_LIBLOOKUP2"
|
||||
|
||||
./bin/glest_editor "$1"
|
||||
./bin/megaglest_editor "$1"
|
||||
|
||||
|
|
@ -53,7 +53,7 @@ ELSE()
|
|||
ENDIF()
|
||||
|
||||
#########################################################################################
|
||||
# glest configurator
|
||||
# megaglest configurator
|
||||
|
||||
SET(DIRS_WITH_SRC
|
||||
.
|
||||
|
@ -94,7 +94,7 @@ FOREACH(DIR IN LISTS DIRS_WITH_SRC)
|
|||
ENDIF(APPLE)
|
||||
ENDFOREACH(DIR)
|
||||
|
||||
SET(TARGET_NAME "glest_configurator")
|
||||
SET(TARGET_NAME "megaglest_configurator")
|
||||
|
||||
IF(UNIX AND NOT APPLE)
|
||||
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/mk/linux)
|
||||
|
@ -107,9 +107,10 @@ SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1)
|
|||
ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop)
|
||||
IF(WIN32)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} glest)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} megaglest)
|
||||
ELSE()
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} libglest)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} libmegaglest)
|
||||
ENDIF()
|
||||
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})
|
||||
|
||||
|
|
|
@ -53,7 +53,7 @@ ELSE()
|
|||
ENDIF()
|
||||
|
||||
#########################################################################################
|
||||
# glest G3d Model Viewer
|
||||
# megaglest G3D Model Viewer
|
||||
|
||||
SET(DIRS_WITH_SRC
|
||||
.
|
||||
|
@ -101,7 +101,7 @@ FOREACH(DIR IN LISTS DIRS_WITH_SRC)
|
|||
ENDIF(APPLE)
|
||||
ENDFOREACH(DIR)
|
||||
|
||||
SET(TARGET_NAME "glest_g3dviewer")
|
||||
SET(TARGET_NAME "megaglest_g3dviewer")
|
||||
|
||||
IF(UNIX AND NOT APPLE)
|
||||
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/mk/linux)
|
||||
|
@ -114,8 +114,9 @@ SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1)
|
|||
ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop)
|
||||
IF(WIN32)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} glest)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} megaglest)
|
||||
ELSE()
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} libglest)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} libmegaglest)
|
||||
ENDIF()
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})
|
||||
|
||||
|
|
|
@ -81,7 +81,7 @@ IF(UNIX)
|
|||
ENDIF()
|
||||
|
||||
#########################################################################################
|
||||
# glest game
|
||||
# megaglest game
|
||||
|
||||
SET(DIRS_WITH_SRC
|
||||
ai
|
||||
|
@ -167,9 +167,9 @@ IF(WIN32)
|
|||
ENDIF()
|
||||
|
||||
IF(WIN32)
|
||||
SET(TARGET_NAME "glest_game")
|
||||
SET(TARGET_NAME "megaglest")
|
||||
ELSE()
|
||||
SET(TARGET_NAME "glest.bin")
|
||||
SET(TARGET_NAME "megaglest.bin")
|
||||
ENDIF()
|
||||
|
||||
IF(UNIX AND NOT APPLE)
|
||||
|
@ -182,11 +182,11 @@ SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1)
|
|||
|
||||
ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
|
||||
IF(WIN32)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 streflop glest stdc++ moldname mingwex msvcrt user32 kernel32)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 streflop megaglest stdc++ moldname mingwex msvcrt user32 kernel32)
|
||||
ENDIF()
|
||||
IF(NOT WIN32)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} libglest)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} libmegaglest)
|
||||
ENDIF()
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})
|
||||
|
||||
|
|
|
@ -1026,7 +1026,9 @@ void MenuStateMods::mouseClick(int x, int y, MouseButton mouseButton) {
|
|||
refreshTilesets();
|
||||
}
|
||||
}
|
||||
else if(mainMessageBoxState == ftpmsg_GetTechtree) {
|
||||
else if(mainMessageBoxState == ftpmsg_GetTechtree ||
|
||||
mainMessageBoxState == ftpmsg_ReplaceTechtree) {
|
||||
bool getItemAfterRemoval = (mainMessageBoxState == ftpmsg_ReplaceTechtree);
|
||||
mainMessageBoxState = ftpmsg_None;
|
||||
|
||||
Config &config = Config::getInstance();
|
||||
|
@ -1064,9 +1066,21 @@ void MenuStateMods::mouseClick(int x, int y, MouseButton mouseButton) {
|
|||
clearFolderTreeContentsCheckSumList(paths, pathSearchString, filterFileExt);
|
||||
safeMutexFTPProgress.ReleaseLock();
|
||||
|
||||
if(getItemAfterRemoval == false) {
|
||||
selectedTechName = "";
|
||||
}
|
||||
refreshTechs();
|
||||
}
|
||||
|
||||
if(getItemAfterRemoval == true) {
|
||||
string techName = selectedTechName;
|
||||
string techURL = techCacheList[techName].url;
|
||||
ftpClientThread->addTechtreeToRequests(techName,techURL);
|
||||
MutexSafeWrapper safeMutexFTPProgress((ftpClientThread != NULL ? ftpClientThread->getProgressMutex() : NULL),string(__FILE__) + "_" + intToStr(__LINE__));
|
||||
fileFTPProgressList[techName] = pair<int,string>(0,"");
|
||||
safeMutexFTPProgress.ReleaseLock();
|
||||
buttonInstallTech.setEnabled(false);
|
||||
}
|
||||
}
|
||||
else if(mainMessageBoxState == ftpmsg_GetScenario) {
|
||||
mainMessageBoxState = ftpmsg_None;
|
||||
|
@ -1136,12 +1150,25 @@ void MenuStateMods::mouseClick(int x, int y, MouseButton mouseButton) {
|
|||
if(selectedTechName != "") {
|
||||
bool alreadyHasTech = (std::find(techTreeFiles.begin(),techTreeFiles.end(),selectedTechName) != techTreeFiles.end());
|
||||
if(alreadyHasTech == true) {
|
||||
ModInfo &modInfo = techCacheList[selectedTechName];
|
||||
|
||||
Config &config = Config::getInstance();
|
||||
if( strToInt(modInfo.crc) != 0 &&
|
||||
strToInt(modInfo.crc) != getFolderTreeContentsCheckSumRecursively(config.getPathListForType(ptTechs,""), string("/") + selectedTechName + string("/*"), ".xml", NULL)) {
|
||||
mainMessageBoxState = ftpmsg_ReplaceTechtree;
|
||||
mainMessageBox.init(lang.get("Yes"),lang.get("No"));
|
||||
char szBuf[1024]="";
|
||||
sprintf(szBuf,lang.get("ModLocalRemoteMismatch").c_str(),selectedTechName.c_str());
|
||||
showMessageBox(szBuf, lang.get("Notice"), true);
|
||||
}
|
||||
else {
|
||||
mainMessageBoxState = ftpmsg_None;
|
||||
mainMessageBox.init(lang.get("Ok"));
|
||||
char szBuf[1024]="";
|
||||
sprintf(szBuf,lang.get("ModTechAlreadyInstalled").c_str(),selectedTechName.c_str());
|
||||
showMessageBox(szBuf, lang.get("Notice"), true);
|
||||
}
|
||||
}
|
||||
else {
|
||||
string techName = selectedTechName;
|
||||
string techURL = techCacheList[techName].url;
|
||||
|
|
|
@ -28,6 +28,12 @@ enum FTPMessageType {
|
|||
ftpmsg_GetTileset,
|
||||
ftpmsg_GetTechtree,
|
||||
ftpmsg_GetScenario,
|
||||
|
||||
ftpmsg_ReplaceMap,
|
||||
ftpmsg_ReplaceTileset,
|
||||
ftpmsg_ReplaceTechtree,
|
||||
ftpmsg_ReplaceScenario,
|
||||
|
||||
ftpmsg_Quit
|
||||
};
|
||||
|
||||
|
|
|
@ -55,7 +55,7 @@ ELSE()
|
|||
ENDIF()
|
||||
|
||||
#########################################################################################
|
||||
# glest map editor
|
||||
# megaglest map editor
|
||||
|
||||
SET(DIRS_WITH_SRC
|
||||
. )
|
||||
|
@ -98,7 +98,7 @@ FOREACH(DIR IN LISTS DIRS_WITH_SRC)
|
|||
ENDIF(APPLE)
|
||||
ENDFOREACH(DIR)
|
||||
|
||||
SET(TARGET_NAME "glest_editor")
|
||||
SET(TARGET_NAME "megaglest_editor")
|
||||
|
||||
IF(UNIX AND NOT APPLE)
|
||||
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/mk/linux)
|
||||
|
@ -110,13 +110,14 @@ SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1)
|
|||
|
||||
ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
|
||||
IF(WIN32)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 streflop glest stdc++ moldname mingwex msvcrt user32 kernel32)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 streflop megaglest stdc++ moldname mingwex msvcrt user32 kernel32)
|
||||
ENDIF()
|
||||
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop)
|
||||
IF(WIN32)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} glest)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} megaglest)
|
||||
ELSE()
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} libglest)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} libmegaglest)
|
||||
ENDIF()
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})
|
||||
|
||||
|
|
|
@ -125,7 +125,7 @@ IF(UNIX)
|
|||
ENDIF()
|
||||
|
||||
#########################################################################################
|
||||
# glest lib
|
||||
# megaglest lib
|
||||
|
||||
SET(DIRS_WITH_SRC
|
||||
feathery_ftp
|
||||
|
@ -234,25 +234,25 @@ SET_SOURCE_FILES_PROPERTIES(${MG_SOURCE_FILES} PROPERTIES COMPILE_FLAGS
|
|||
SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1)
|
||||
|
||||
IF(NOT WIN32)
|
||||
ADD_LIBRARY(libglest STATIC ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
|
||||
ADD_LIBRARY(libmegaglest STATIC ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
|
||||
MESSAGE(STATUS "Building shared game library as a STATIC library and saving to [${LIBRARY_OUTPUT_PATH}]")
|
||||
ELSE()
|
||||
SET(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game)
|
||||
ADD_LIBRARY(glest STATIC ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
|
||||
ADD_LIBRARY(megaglest STATIC ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
|
||||
MESSAGE(STATUS "Building shared game library as a SHARED library and saving to [${LIBRARY_OUTPUT_PATH}]")
|
||||
ENDIF()
|
||||
|
||||
#ADD_LIBRARY(libglest SHARED ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
|
||||
#ADD_LIBRARY(libglest STATIC ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
|
||||
#ADD_LIBRARY(libmegaglest SHARED ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
|
||||
#ADD_LIBRARY(libmegaglest STATIC ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
|
||||
IF(WIN32)
|
||||
TARGET_LINK_LIBRARIES(glest stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 streflop stdc++ moldname mingwex msvcrt user32 kernel32)
|
||||
TARGET_LINK_LIBRARIES(megaglest stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 streflop stdc++ moldname mingwex msvcrt user32 kernel32)
|
||||
|
||||
TARGET_LINK_LIBRARIES(glest streflop)
|
||||
TARGET_LINK_LIBRARIES(glest ${EXTERNAL_LIBS})
|
||||
TARGET_LINK_LIBRARIES(megaglest streflop)
|
||||
TARGET_LINK_LIBRARIES(megaglest ${EXTERNAL_LIBS})
|
||||
|
||||
ELSE()
|
||||
|
||||
TARGET_LINK_LIBRARIES(libglest streflop)
|
||||
TARGET_LINK_LIBRARIES(libglest ${EXTERNAL_LIBS})
|
||||
TARGET_LINK_LIBRARIES(libmegaglest streflop)
|
||||
TARGET_LINK_LIBRARIES(libmegaglest ${EXTERNAL_LIBS})
|
||||
|
||||
ENDIF()
|
||||
|
|
Loading…
Reference in New Issue