diff --git a/.gitignore b/.gitignore index 023ea2a..717ea76 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,6 @@ # Qt project user file *.pro.user + +# Qt resource file +*.rcc diff --git a/.travis/debian_build.sh b/.travis/debian_build.sh index 4d7598b..d9d88b2 100755 --- a/.travis/debian_build.sh +++ b/.travis/debian_build.sh @@ -22,10 +22,12 @@ mkdir -p /usr/share/gta5view && \ # Starting build cd qt5 && \ qmake -qt=5 -spec linux-clang GTA5SYNC_PREFIX=/usr QMAKE_CXXFLAGS+=-std=gnu++11 ${QMAKE_FLAGS_QT5} DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"${PACKAGE_CODE}\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" DEFINES+=GTA5SYNC_QCONF DEFINES+=GTA5SYNC_TELEMETRY "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" ../../gta5view.pro && \ +make depend && \ make -j 4 && \ checkinstall -D --default --nodoc --install=no --pkgname=gta5view-qt5 --pkgversion=${PACKAGE_VERSION} --pkgrelease=${PACKAGE_BUILD} --pkggroup=utility --maintainer="Syping \" --requires=libqt5core5a,libqt5gui5,libqt5network5,libqt5widgets5,qttranslations5-l10n --conflicts=gta5view,gta5view-qt4 --replaces=gta5view,gta5view-qt4 --pakdir=${PROJECT_DIR}/assets && \ cd .. && \ cd qt4 && \ qmake -qt=4 GTA5SYNC_PREFIX=/usr QMAKE_CXXFLAGS+=-std=gnu++11 ${QMAKE_FLAGS_QT4} DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"${PACKAGE_CODE}\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" DEFINES+=GTA5SYNC_QCONF ../../gta5view.pro && \ +make depend && \ make -j 4 && \ checkinstall -D --default --nodoc --install=no --pkgname=gta5view-qt4 --pkgversion=${PACKAGE_VERSION} --pkgrelease=${PACKAGE_BUILD} --pkggroup=utility --maintainer="Syping \" --requires=libqtcore4,libqtgui4,libqt4-network,qtcore4-l10n --conflicts=gta5view,gta5view-qt5 --replaces=gta5view,gta5view-qt5 --pakdir=${PROJECT_DIR}/assets diff --git a/.travis/osx_build.sh b/.travis/osx_build.sh index 8a5663d..1fae647 100755 --- a/.travis/osx_build.sh +++ b/.travis/osx_build.sh @@ -9,6 +9,7 @@ mkdir -p assets && \ cd build && \ /usr/local/opt/qt/bin/qmake ${QMAKE_FLAGS_QT5} DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"${PACKAGE_CODE}\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" DEFINES+=GTA5SYNC_TELEMETRY "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" ../gta5view.pro && \ +make depend && \ make -j 4 && \ /usr/local/opt/qt/bin/macdeployqt gta5view.app -dmg && \ cp -Rf gta5view.dmg ../assets/gta5view-osx_${APPLICATION_VERSION}.dmg diff --git a/.travis/windows_build.sh b/.travis/windows_build.sh index e64cac3..8b03d2d 100755 --- a/.travis/windows_build.sh +++ b/.travis/windows_build.sh @@ -13,6 +13,7 @@ mkdir -p assets && \ # Starting build cd build && \ qmake-static ${QMAKE_FLAGS} DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"${PACKAGE_CODE}\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" DEFINES+=GTA5SYNC_TELEMETRY "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" ../gta5view.pro && \ +make depend && \ make -j 4 && \ cp -Rf release/*.exe ${PROJECT_DIR}/assets/${GTA5VIEW_EXECUTABLE} && \ cd ${PROJECT_DIR}/assets && \ diff --git a/.travis/wininstall_build.sh b/.travis/wininstall_build.sh index 1ca3622..4b0bb7f 100755 --- a/.travis/wininstall_build.sh +++ b/.travis/wininstall_build.sh @@ -12,6 +12,7 @@ mkdir -p assets && \ # Starting build cd build && \ qmake ${QMAKE_FLAGS} DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"${PACKAGE_CODE}\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" DEFINES+=GTA5SYNC_TELEMETRY "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" DEFINES+=GTA5SYNC_QCONF DEFINES+=GTA5SYNC_INLANG='\\\"RUNDIR:SEPARATOR:lang\\\"' DEFINES+=GTA5SYNC_LANG='\\\"RUNDIR:SEPARATOR:lang\\\"' DEFINES+=GTA5SYNC_PLUG='\\\"RUNDIR:SEPARATOR:plugins\\\"' ../gta5view.pro && \ +make depend && \ make -j 4 && \ cd ${PROJECT_DIR}/assets && \ makensis -NOCD ${PROJECT_DIR}/.travis/gta5view.nsi && \ diff --git a/gta5view.pro b/gta5view.pro index eb4ddd5..ffd2a30 100644 --- a/gta5view.pro +++ b/gta5view.pro @@ -191,6 +191,12 @@ isEqual(QT_MAJOR_VERSION, 4): RESOURCES += res/tr_qt4.qrc # QT5 ONLY STUFF isEqual(QT_MAJOR_VERSION, 5): RESOURCES += res/tr_qt5.qrc +# RESOURCE COMPILATION + +depend.depends += $$PWD/res/global.qrc +depend.commands += rcc -binary -compress 9 -threshold 0 $$PWD/res/global.qrc -o $$PWD/res/global.rcc +QMAKE_EXTRA_TARGETS += depend + # PROJECT INSTALLATION isEmpty(GTA5SYNC_PREFIX): GTA5SYNC_PREFIX = /usr/local diff --git a/res/global.rcc b/res/global.rcc deleted file mode 100644 index c064e23..0000000 Binary files a/res/global.rcc and /dev/null differ