easthighNerd/qcma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation under 64bit Windows and standarize the format of the thread ID.

Browse Source
This commit is contained in:
codestation
2013-12-19 00:03:13 -04:30
parent 0fc2198436
commit d6831fc6c6
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qcma.pro
View File

@@ -64,7 +64,7 @@ INCLUDEPATH += src/
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
PKGCONFIG += libvitamtp libavformat libavcodec libavutil libswscale PKGCONFIG += libvitamtp libavformat libavcodec libavutil libswscale
QMAKE_CXXFLAGS += -Wno-write-strings -Wall -D__STDC_CONSTANT_MACROS QMAKE_CXXFLAGS += -Wno-write-strings -Wall -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS
RESOURCES += qcmares.qrc RESOURCES += qcmares.qrc

4
src/cmaclient.cpp
View File

@@ -53,7 +53,7 @@ void CmaClient::connectUsb()
{ {
vita_device_t *vita; vita_device_t *vita;
qDebug("Starting usb_thread: %lu", (unsigned long)QThread::currentThreadId()); qDebug("Starting usb_thread: 0x%016" PRIxPTR, (quintptr)QThread::currentThreadId());
setActive(true); setActive(true);
@@ -84,7 +84,7 @@ void CmaClient::connectWireless()
QTime now = QTime::currentTime(); QTime now = QTime::currentTime();
qsrand(now.msec()); qsrand(now.msec());
qDebug("Starting wireless_thread: %lu", (unsigned long)QThread::currentThreadId()); qDebug("Starting wireless_thread: 0x%016" PRIxPTR, (quintptr)QThread::currentThreadId());
setActive(true); setActive(true);

4
src/cmaevent.cpp
View File

@@ -26,7 +26,6 @@
#include <QSettings> #include <QSettings>
#include <QUrl> #include <QUrl>
#define __STDC_FORMAT_MACROS
#include <inttypes.h> #include <inttypes.h>
Database *CmaEvent::db = NULL; Database *CmaEvent::db = NULL;
@@ -40,7 +39,8 @@ CmaEvent::CmaEvent(vita_device_t *s_device) :
void CmaEvent::process() void CmaEvent::process()
{ {
qDebug("Starting event_thread: %lu", (unsigned long)QThread::currentThreadId()); qDebug("Starting event_thread: 0x%016" PRIxPTR, (quintptr)QThread::currentThreadId());
while(true) { while(true) {
sema.acquire(); sema.acquire();
if(!isActive()) { if(!isActive()) {

4
src/main.cpp
View File

@@ -26,6 +26,8 @@
#include <QThread> #include <QThread>
#include <QTranslator> #include <QTranslator>
#include <inttypes.h>
#include "singleapplication.h" #include "singleapplication.h"
#include "mainwidget.h" #include "mainwidget.h"
@@ -87,7 +89,7 @@ int main(int argc, char *argv[])
app.installTranslator(&translator); app.installTranslator(&translator);
} }
qDebug("Starting main thread: %lu", (unsigned long)QThread::currentThreadId()); qDebug("Starting main thread: 0x%016" PRIxPTR, (quintptr)QThread::currentThreadId());
// set the organization/application for QSettings to work properly // set the organization/application for QSettings to work properly
app.setOrganizationName("qcma"); app.setOrganizationName("qcma");