Commit 2d1663e2 authored by Armin Felder's avatar Armin Felder

win destkop compat

parent 10573a3f
......@@ -17,3 +17,16 @@ contains(ANDROID_TARGET_ARCH,) {
$$PWD/../openssl/android-arm64/libssl.so \
$$PWD/../openssl/android-arm64/libcrypto.so
}
win32{
!contains(QMAKE_TARGET.arch, x86_64) {
message("x86 build")
## Windows x86 (32bit) specific build here
} else {
message("x86_64 build")
## Windows x64 (64bit) specific build here
}
}
Subproject commit 026a42e136f6f1901a6ed74ea72987a5de55f186
Subproject commit 980cb3778fee4d2fe4c7a174454664d6d78ce5bf
......@@ -15,13 +15,30 @@ RESOURCES += qml.qrc\
QMAKE_RPATHDIR += $ORIGIN/../engine/
INCLUDEPATH += $$PWD/../engine/
QMAKE_RPATHDIR += $ORIGIN
LIBS += -L../engine -lengine
win32:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../engine/release/engine.lib
else:win32:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../engine/debug/engine.lib
else:unix: PRE_TARGETDEPS += $$OUT_PWD/../engine/libengine.a
win64:CONFIG(release, debug|release){
PRE_TARGETDEPS += ../engine/release/engine.lib
LIBS += -L../engine/release/ -lengine
}
else:win64:CONFIG(debug, debug|release){
PRE_TARGETDEPS += ../engine/debug/engine.lib
LIBS += -L../engine/debug/ -lengine
}
else:win32:CONFIG(release, debug|release){
PRE_TARGETDEPS += ../engine/release/engine.lib
LIBS += -L../engine/release/ -lengine
}
else:win32:CONFIG(debug, debug|release){
PRE_TARGETDEPS += ../engine/debug/engine.lib
LIBS += -L../engine/debug/ -lengine
}
else:unix{
PRE_TARGETDEPS += $$OUT_PWD/../engine/libengine.a
LIBS += -L../engine -lengine
}
message($$PRE_TARGETDEPS)
TARGET = fairchat
VER_MAJ = 1
......@@ -153,10 +170,34 @@ ios{
xcode_product_bundle_identifier_setting.value = "com.osalliance.RocketChatMobile"
}
win32{
QMAKE_CXXFLAGS += /MP
!contains(QMAKE_TARGET.arch, x86_64) {
CONFIG(release, debug|release) {
QMAKE_POST_LINK = $$QMAKE_COPY $$shell_path($$PWD/../openssl/win-x86/*) $$shell_path($$OUT_PWD/release)
message($$shell_path($$OUT_PWD\release))
}else{
QMAKE_POST_LINK = $$QMAKE_COPY $$shell_path($$PWD/../openssl/win-x86/*) $$shell_path($$OUT_PWD/debug)
message($$shell_path($$OUT_PWD\debug))
}
} else {
CONFIG(release, debug|release) {
QMAKE_POST_LINK = $$QMAKE_COPY $$shell_path($$PWD/../openssl/win-x86_64/*) $$shell_path($$OUT_PWD/release)
message($$shell_path($$OUT_PWD\release))
}else{
QMAKE_POST_LINK = $$QMAKE_COPY $$shell_path($$PWD/../openssl/win-x86_64/*) $$shell_path($$OUT_PWD/debug)
message($$shell_path($$OUT_PWD\debug))
}
}
}
winrt{
RESOURCES +=
QMAKE_CXXFLAGS += /O2 /ZW /AI"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcpackages"
QMAKE_CXXFLAGS += /O2 /ZW /MP /AI"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcpackages"
QMAKE_LFLAGS += /FORCE:MULTIPLE
}
......
......@@ -59,7 +59,4 @@ StdImageHighDPI {
}
}
}
Connections {
target: rocketChatController
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment