mirror of
https://github.com/vcmi/vcmi.git
synced 2026-06-19 22:57:37 +02:00
- some effords to get rid of bottlenecks in AI code
- fixes, probably partially #1577 - enabled code for reading map object templates from json, still not used - disabled PCH for launcher due to speed issues.
This commit is contained in:
@@ -56,8 +56,9 @@ add_executable(vcmilauncher ${launcher_SRCS} ${launcher_UI_HEADERS})
|
||||
# The Qt5Widgets_LIBRARIES variable also includes QtGui and QtCore
|
||||
target_link_libraries(vcmilauncher vcmi ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES})
|
||||
|
||||
set_target_properties(vcmilauncher PROPERTIES ${PCH_PROPERTIES})
|
||||
cotire(vcmilauncher)
|
||||
# temporary(?) disabled - generation of PCH takes too much time since cotire is trying to collect all Qt headers
|
||||
#set_target_properties(vcmilauncher PROPERTIES ${PCH_PROPERTIES})
|
||||
#cotire(vcmilauncher)
|
||||
|
||||
if (NOT APPLE) # Already inside bundle
|
||||
install(TARGETS vcmilauncher DESTINATION ${BIN_DIR})
|
||||
|
||||
@@ -581,7 +581,9 @@ void CModListView::installMods(QStringList archives)
|
||||
for (int i=0; i<modNames.size(); i++)
|
||||
manager->installMod(modNames[i], archives[i]);
|
||||
|
||||
std::function<void(QString)> enableMod = [&](QString modName)
|
||||
std::function<void(QString)> enableMod;
|
||||
|
||||
enableMod = [&](QString modName)
|
||||
{
|
||||
auto mod = modModel->getMod(modName);
|
||||
if (mod.isInstalled() && !mod.getValue("keepDisabled").toBool())
|
||||
|
||||
Reference in New Issue
Block a user