games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-22 03:39:45 +02:00
Code Issues Releases Activity

fix building launcher

Browse Source
This commit is contained in:
Andrey Filipenkov 2022-07-29 09:52:39 +03:00
parent cd4b68c034
commit ad256cd11f
6 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure_ios.sh
View File

@ -2,7 +2,7 @@
platform=OS64 platform=OS64
globalPrefix=~/dev/vcmi/vcmi-ios-depends/build/iphoneos globalPrefix=~/dev/vcmi/vcmi-ios-depends/build/iphoneos
qtDir=~/dev/Qt-libs/5.15.2/ios qtDir=~/dev/Qt-libs/5.15.5/ios10-widgets
if [[ "$1" ]]; then if [[ "$1" ]]; then
platform=SIMULATOR64 platform=SIMULATOR64
globalPrefix=~/dev/vcmi/vcmi-ios-depends/build/iphonesimulator globalPrefix=~/dev/vcmi/vcmi-ios-depends/build/iphonesimulator
@ -24,7 +24,7 @@ cmake "$srcDir" -G Xcode \
-DBUNDLE_IDENTIFIER_PREFIX=com.kambala \ -DBUNDLE_IDENTIFIER_PREFIX=com.kambala \
-Wno-dev \ -Wno-dev \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DCMAKE_TOOLCHAIN_FILE="$srcDir/ios.toolchain.cmake" \ --toolchain "$srcDir/ios.toolchain.cmake" \
-DPLATFORM=$platform \ -DPLATFORM=$platform \
-DDEPLOYMENT_TARGET=12.0 \ -DDEPLOYMENT_TARGET=12.0 \
-DENABLE_BITCODE=OFF \ -DENABLE_BITCODE=OFF \

7
launcher/CMakeLists.txt
View File

@ -123,7 +123,12 @@ if(APPLE_IOS)
set_source_files_properties(ios/Images.xcassets PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") set_source_files_properties(ios/Images.xcassets PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
endif() endif()
target_link_libraries(vcmilauncher vcmi Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Network) if(BUILD_SINGLE_APP)
set(VCMI_LIB_TARGET vcmi_lib_client)
else()
set(VCMI_LIB_TARGET vcmi)
endif()
target_link_libraries(vcmilauncher ${VCMI_LIB_TARGET} Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Network)
target_include_directories(vcmilauncher target_include_directories(vcmilauncher
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
) )

2
launcher/StdInc.h
View File

@ -10,6 +10,8 @@
#include <QString> #include <QString>
#include <QFile> #include <QFile>
VCMI_LIB_USING_NAMESPACE
inline QString pathToQString(const boost::filesystem::path & path) inline QString pathToQString(const boost::filesystem::path & path)
{ {
#ifdef VCMI_WINDOWS #ifdef VCMI_WINDOWS

4
launcher/jsonutils.cpp
View File

@ -51,6 +51,8 @@ static JsonMap VariantToMap(QVariantMap variant)
return map; return map;
} }
VCMI_LIB_NAMESPACE_BEGIN
namespace JsonUtils namespace JsonUtils
{ {
@ -123,3 +125,5 @@ void JsonToFile(QString filename, QVariant object)
} }
} }
VCMI_LIB_NAMESPACE_END

4
launcher/jsonutils.h
View File

@ -12,6 +12,8 @@
#include <QVariant> #include <QVariant>
#include "../lib/JsonNode.h" #include "../lib/JsonNode.h"
VCMI_LIB_NAMESPACE_BEGIN
namespace JsonUtils namespace JsonUtils
{ {
QVariant toVariant(const JsonNode & node); QVariant toVariant(const JsonNode & node);
@ -20,3 +22,5 @@ QVariant JsonFromFile(QString filename);
JsonNode toJson(QVariant object); JsonNode toJson(QVariant object);
void JsonToFile(QString filename, QVariant object); void JsonToFile(QString filename, QVariant object);
} }
VCMI_LIB_NAMESPACE_END

4
launcher/modManager/cmodlist.h
View File

@ -13,8 +13,12 @@
#include <QVariant> #include <QVariant>
#include <QVector> #include <QVector>
VCMI_LIB_NAMESPACE_BEGIN
class JsonNode; class JsonNode;
VCMI_LIB_NAMESPACE_END
namespace ModStatus namespace ModStatus
{ {
enum EModStatus enum EModStatus