From 9b1893054fb9854a22f1a839d63972759ff0ced3 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Sat, 9 Apr 2011 19:13:10 +0000 Subject: [PATCH] - renamed Linux binaries launch scripts start with start_megaglest_x and binaries start with megaglest_ --- CMakeLists.txt | 1 + build-mg.sh | 4 +- mk/linux/makedeps_folder.sh | 6 +-- mk/linux/{glest => megaglest} | 5 ++- .../megaglest-installer/scripts/config.lua | 6 +-- ...figurator => start_megaglest_configurator} | 2 +- .../{g3dviewer => start_megaglest_g3dviewer} | 2 +- .../{editor => start_megaglest_mapeditor} | 2 +- source/configurator/CMakeLists.txt | 9 ++-- source/g3d_viewer/CMakeLists.txt | 9 ++-- source/glest_game/CMakeLists.txt | 10 ++--- source/glest_game/menu/menu_state_mods.cpp | 41 +++++++++++++++---- source/glest_game/menu/menu_state_mods.h | 6 +++ source/glest_map_editor/CMakeLists.txt | 11 ++--- source/shared_lib/CMakeLists.txt | 20 ++++----- 15 files changed, 87 insertions(+), 47 deletions(-) rename mk/linux/{glest => megaglest} (98%) mode change 100755 => 100644 rename mk/linux/{start_configurator => start_megaglest_configurator} (94%) mode change 100755 => 100644 rename mk/linux/{g3dviewer => start_megaglest_g3dviewer} (99%) mode change 100755 => 100644 rename mk/linux/{editor => start_megaglest_mapeditor} (99%) mode change 100755 => 100644 diff --git a/CMakeLists.txt b/CMakeLists.txt index d4a2a493..ef151e42 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,3 +147,4 @@ ADD_SUBDIRECTORY( source/tools/glexemel ) IF(APPLE) include(mk/macosx/CMakeLists.txt) ENDIF(APPLE) + diff --git a/build-mg.sh b/build-mg.sh index 70ee16a9..34161ebd 100755 --- a/build-mg.sh +++ b/build-mg.sh @@ -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/' diff --git a/mk/linux/makedeps_folder.sh b/mk/linux/makedeps_folder.sh index f25ef79f..0710e195 100755 --- a/mk/linux/makedeps_folder.sh +++ b/mk/linux/makedeps_folder.sh @@ -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 } diff --git a/mk/linux/glest b/mk/linux/megaglest old mode 100755 new mode 100644 similarity index 98% rename from mk/linux/glest rename to mk/linux/megaglest index 3ecd87b7..e8b45bbd --- a/mk/linux/glest +++ b/mk/linux/megaglest @@ -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 + diff --git a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua index da98293e..96fd8edb 100644 --- a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua +++ b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua @@ -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" }, diff --git a/mk/linux/start_configurator b/mk/linux/start_megaglest_configurator old mode 100755 new mode 100644 similarity index 94% rename from mk/linux/start_configurator rename to mk/linux/start_megaglest_configurator index b11f2d59..9da56ea6 --- a/mk/linux/start_configurator +++ b/mk/linux/start_megaglest_configurator @@ -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 diff --git a/mk/linux/g3dviewer b/mk/linux/start_megaglest_g3dviewer old mode 100755 new mode 100644 similarity index 99% rename from mk/linux/g3dviewer rename to mk/linux/start_megaglest_g3dviewer index f3d09bf1..b0f57643 --- a/mk/linux/g3dviewer +++ b/mk/linux/start_megaglest_g3dviewer @@ -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" diff --git a/mk/linux/editor b/mk/linux/start_megaglest_mapeditor old mode 100755 new mode 100644 similarity index 99% rename from mk/linux/editor rename to mk/linux/start_megaglest_mapeditor index 7f0a2d5a..c28adf97 --- a/mk/linux/editor +++ b/mk/linux/start_megaglest_mapeditor @@ -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" diff --git a/source/configurator/CMakeLists.txt b/source/configurator/CMakeLists.txt index 7591ff74..d42579a8 100644 --- a/source/configurator/CMakeLists.txt +++ b/source/configurator/CMakeLists.txt @@ -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}) + diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt index 3c96e1cf..998916db 100644 --- a/source/g3d_viewer/CMakeLists.txt +++ b/source/g3d_viewer/CMakeLists.txt @@ -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}) + diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt index b9d50093..b95bf6e6 100644 --- a/source/glest_game/CMakeLists.txt +++ b/source/glest_game/CMakeLists.txt @@ -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}) diff --git a/source/glest_game/menu/menu_state_mods.cpp b/source/glest_game/menu/menu_state_mods.cpp index 850e684e..959271a7 100644 --- a/source/glest_game/menu/menu_state_mods.cpp +++ b/source/glest_game/menu/menu_state_mods.cpp @@ -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(); - selectedTechName = ""; + 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(0,""); + safeMutexFTPProgress.ReleaseLock(); + buttonInstallTech.setEnabled(false); + } } else if(mainMessageBoxState == ftpmsg_GetScenario) { mainMessageBoxState = ftpmsg_None; @@ -1136,11 +1150,24 @@ 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) { - 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); + 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; diff --git a/source/glest_game/menu/menu_state_mods.h b/source/glest_game/menu/menu_state_mods.h index e0f3e309..9d17e4b5 100644 --- a/source/glest_game/menu/menu_state_mods.h +++ b/source/glest_game/menu/menu_state_mods.h @@ -28,6 +28,12 @@ enum FTPMessageType { ftpmsg_GetTileset, ftpmsg_GetTechtree, ftpmsg_GetScenario, + + ftpmsg_ReplaceMap, + ftpmsg_ReplaceTileset, + ftpmsg_ReplaceTechtree, + ftpmsg_ReplaceScenario, + ftpmsg_Quit }; diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt index 052e9fba..dd5a3b0e 100644 --- a/source/glest_map_editor/CMakeLists.txt +++ b/source/glest_map_editor/CMakeLists.txt @@ -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}) + diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt index 8e61791e..a19f5066 100644 --- a/source/shared_lib/CMakeLists.txt +++ b/source/shared_lib/CMakeLists.txt @@ -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()