Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

static link resources

Browse source
This commit is contained in:
dante ruiz 2019-09-27 16:59:04 -07:00
parent e8205728ce
commit d5f042c361
6 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
launchers/qt/CMakeLists.txt
View file

@ -123,8 +123,6 @@ foreach(plugin ${Qt5Gui_PLUGINS})
set(plugin_libs ${plugin_libs} ${_loc})
endforeach()
qt5_add_resources(EXAMPLE_RCC_SRC build/resources.qrc)
set(src_files
src/main.cpp
src/Launcher.h
@ -143,7 +141,6 @@ set(src_files
src/CommandlineOptions.cpp
deps/miniz/miniz.h
deps/miniz/miniz.cpp
#${RES_SOURCES}
)
@ -167,13 +164,13 @@ set(TARGET_NAME ${PROJECT_NAME})
set_packaging_parameters()
if (WIN32)
add_executable(${PROJECT_NAME} ${src_files})#build/resources.qrc ${EXAMPLE_RCC_SRC})
add_executable(${PROJECT_NAME} ${src_files} ${RES_SOURCES})
elseif (APPLE)
set_target_properties(${this_target} PROPERTIES
MACOSX_BUNDLE_INFO_PLIST MacOSXBundleInfo.plist.in)
set(MACOSX_BUNDLE_ICON_FILE "interface.icns")
add_executable(${PROJECT_NAME} MACOSX_BUNDLE ${src_files})
add_executable(${PROJECT_NAME} MACOSX_BUNDLE ${src_files} ${RES_SOURCES})
set_target_properties(${PROJECT_NAME} PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
endif()
@ -222,21 +219,14 @@ if (APPLE)
${OPENSSL_INCLUDE_DIR})
endif()
set(INTERFACE_EXEC_DIR "$<TARGET_FILE_DIR:${PROJECT_NAME}>")
set(RESOURCES_DEV_DIR "${INTERFACE_EXEC_DIR}/resources")
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy_if_different
"${RESOURCES_RCC}"
"${INTERFACE_EXEC_DIR}")
if (LAUNCHER_SOURCE_TREE_RESOURCES)
target_compile_definitions(${PROJECT_NAME} PRIVATE RESOURCE_PREFIX_URL="${CMAKE_CURRENT_SOURCE_DIR}/resources/")
message("Use source tree resources path: file://${CMAKE_CURRENT_SOURCE_DIR}/resources/")
else()
target_compile_definitions(${PROJECT_NAME} PRIVATE RESOURCE_PREFIX_URL="qrc:/")
message("Use resource.rcc path: qrc:/")
endif()
if (LAUNCHER_SOURCE_TREE_RESOURCES)
target_compile_definitions(${PROJECT_NAME} PRIVATE RESOURCE_PREFIX_URL="${CMAKE_CURRENT_SOURCE_DIR}/resources/")
message("Use source tree resources path: file://${CMAKE_CURRENT_SOURCE_DIR}/resources/")
else()
target_compile_definitions(${PROJECT_NAME} PRIVATE RESOURCE_PREFIX_URL="qrc:/")
message("Use resource.rcc path: qrc:/")
endif()
target_compile_definitions(${PROJECT_NAME} PRIVATE LAUNCHER_BUILD_VERSION="${BUILD_VERSION}")

3
launchers/qt/src/Launcher.cpp
View file

@ -9,9 +9,6 @@
#include "PathUtils.h"
Launcher::Launcher(int& argc, char**argv) : QGuiApplication(argc, argv) {
QString resourceBinaryLocation = QGuiApplication::applicationDirPath() + "/resources.rcc";
qDebug() << "resources.rcc path: " << resourceBinaryLocation;
QResource::registerResource(resourceBinaryLocation);
_launcherState = std::make_shared<LauncherState>();
_launcherWindow = std::make_unique<LauncherWindow>();
_launcherWindow->rootContext()->setContextProperty("LauncherState", _launcherState.get());

2
launchers/qt/src/LauncherState.h
View file

@ -130,7 +130,7 @@ public:
Q_INVOKABLE float getDownloadProgress() const { return _downloadProgress; }
signals:
void updateSourceUrl(QString sourceUrl);
void updateSourceUrl(QUrl sourceUrl);
void uiStateChanged();
void applicationStateChanged();
void downloadProgressChanged();

4
launchers/qt/src/PathUtils.cpp
View file

@ -2,6 +2,6 @@
#include <QDebug>
QString PathUtils::resourcePath(const QString& source) {
return QString(RESOURCE_PREFIX_URL + source);
QUrl PathUtils::resourcePath(const QString& source) {
return QUrl(RESOURCE_PREFIX_URL + source);
}

4
launchers/qt/src/PathUtils.h
View file

@ -2,10 +2,12 @@
#include <QObject>
#include <QString>
#include <QFile>
#include <QUrl>
class PathUtils : public QObject {
Q_OBJECT
public:
PathUtils() = default;
~PathUtils() = default;
Q_INVOKABLE static QString resourcePath(const QString& source);
Q_INVOKABLE static QUrl resourcePath(const QString& source);
};

1
launchers/qt/src/main.cpp
View file

@ -29,6 +29,7 @@ bool hasSuffix(const std::string path, const std::string suffix) {
}
int main(int argc, char *argv[]) {
Q_INIT_RESOURCE(resources);
#ifdef Q_OS_MAC
// auto updater
if (argc == 3) {