diff --git a/Common/ProtocolBuffer/google/protobuf/bin/libprotobuf.lib b/Common/ProtocolBuffer/google/protobuf/bin/libprotobuf.lib new file mode 100644 index 00000000..1d92e9fb Binary files /dev/null and b/Common/ProtocolBuffer/google/protobuf/bin/libprotobuf.lib differ diff --git a/Common/ProtocolBuffer/google/protobuf/bin/libprotobufd.dll b/Common/ProtocolBuffer/google/protobuf/bin/libprotobufd.dll new file mode 100644 index 00000000..b91fe0bd --- /dev/null +++ b/Common/ProtocolBuffer/google/protobuf/bin/libprotobufd.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c96cd9bfc6ccbee21eaf465f3936a3610baf32a8f6fd9b1f148f529efbebd64 +size 9250304 diff --git a/Common/ProtocolBuffer/google/protobuf/bin/libprotobufd.lib b/Common/ProtocolBuffer/google/protobuf/bin/libprotobufd.lib new file mode 100644 index 00000000..f8aad209 Binary files /dev/null and b/Common/ProtocolBuffer/google/protobuf/bin/libprotobufd.lib differ diff --git a/ScreenPlayWorkshop/workshopsdk/ScreenPlayWorkshop.pro b/ScreenPlayWorkshop/workshopsdk/ScreenPlayWorkshop.pro index cdd4bbe6..5edc51ab 100644 --- a/ScreenPlayWorkshop/workshopsdk/ScreenPlayWorkshop.pro +++ b/ScreenPlayWorkshop/workshopsdk/ScreenPlayWorkshop.pro @@ -10,12 +10,12 @@ uri = net.aimber.workshop SOURCES += \ screenplayworkshop_plugin.cpp \ workshop.cpp \ - aimberapi.cpp + aimberapi.cpp HEADERS += \ screenplayworkshop_plugin.h \ workshop.h \ - aimberapi.h + aimberapi.h DISTFILES = qmldir @@ -32,7 +32,7 @@ qmldir.files = qmldir installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /) qmldir.path = $$installPath target.path = $$installPath -INSTALLS += target qmldir +INSTALLS += target qmldir install_it win32 { @@ -50,8 +50,9 @@ unix { LIBS += -L$$PWD/ThirdParty/steam/lib/linux64/ -lsdkencryptedappticket } -win32 { - INCLUDEPATH += "../../Common/ProtocolBuffer/google/protobuf/" - LIBS += -L"../../Common/ProtocolBuffer/google/protobuf/bin" -llibprotobuf.dll -} +win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../Common/ProtocolBuffer/google/protobuf/bin/ -llibprotobuf +else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../Common/ProtocolBuffer/google/protobuf/bin/ -llibprotobufd +else:unix: LIBS += -L$$PWD/../../Common/ProtocolBuffer/google/protobuf/bin/ -llibprotobuf +INCLUDEPATH += $$PWD/../../Common/ProtocolBuffer/google/protobuf +DEPENDPATH += $$PWD/../../Common/ProtocolBuffer/google/protobuf