feedc0de/qmsgpack
1
0
Fork 0
forked from romixlab/qmsgpack
Code Pull Requests Activity

Merge pull request #30 from KonstantinRitt/fixes/build

Browse Source 
build fixes
This commit is contained in:
Roman Isaikin
2018-03-03 22:27:20 +03:00
committed by GitHub
parent b7284725e8 5ca284052c
commit 4f1c4d3d80
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.qmake.conf
View File

@@ -1,3 +0,0 @@
TOP_SRCDIR=$$PWD
TOP_BUILDDIR=$$shadowed($$PWD)

2
src/msgpackcommon.cpp
View File

@@ -4,7 +4,7 @@
QString MsgPack::version() QString MsgPack::version()
{ {
return QString("%1.%2.%3") return QString::fromLatin1("%1.%2.%3")
.arg(MSGPACK_MAJOR) .arg(MSGPACK_MAJOR)
.arg(MSGPACK_MINOR) .arg(MSGPACK_MINOR)
.arg(MSGPACK_VERSION); .arg(MSGPACK_VERSION);

2
src/src.pro
View File

@@ -5,7 +5,7 @@ CONFIG -= app_bundle
TEMPLATE = lib TEMPLATE = lib
DEFINES += MSGPACK_MAKE_LIB DEFINES += MSGPACK_MAKE_LIB
DESTDIR = $$TOP_SRCDIR/bin DESTDIR = $$PWD/../bin
QMAKE_CXXFLAGS += -fPIC QMAKE_CXXFLAGS += -fPIC
CONFIG += debug_and_release CONFIG += debug_and_release