Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-21 18:22:29 +01:00
Code Issues Projects Releases Activity

Merge branch 'feature/sysinfo-revamp' of https://gitlab.com/aimber/ScreenPlay into HEAD

Browse Source 
# Conflicts:
#	ScreenPlay.pro
#	ScreenPlaySysInfoSDK/SysInfoSDK/cpu_generic.h
#	ScreenPlaySysInfoSDK/SysInfoSDK/ram_generic.h
This commit is contained in:
JeJo 2019-04-20 16:13:09 +02:00
parent 8ca6418923
commit 273a4cbaca
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ScreenPlay.pro
View File

@ -4,7 +4,7 @@ SUBDIRS += \
ScreenPlaySDK/ScreenPlaySDK.pro \
ScreenPlayWindow/ScreenPlayWindow.pro \
ScreenPlayWidget/ScreenPlayWidget.pro \
ScreenPlay/ThirdParty/stomt-qt-sdk/sdk/stomt-qt-sdk.pro \
#ScreenPlay/ThirdParty/stomt-qt-sdk/sdk/stomt-qt-sdk.pro \
ScreenPlayWindow.depends = ScreenPlaySDK
ScreenPlayWidget.depends = ScreenPlaySDK
@ -14,3 +14,4 @@ win32 {
SUBDIRS += \
ScreenPlaySysInfo/ScreenPlaySysInfo.pro \
}