From 6203a2e8c0a994a8a3a6375fff5a074d40f6ba02 Mon Sep 17 00:00:00 2001 From: kelteseth Date: Sat, 17 Nov 2018 18:35:09 +0100 Subject: [PATCH] Fix --- Common/ProtocolBuffer/.gitattributes | 11 ----------- Common/ProtocolBuffer/google/protobuf/bin/desktop.ini | 2 -- ScreenPlayWorkshop/workshopsdk/ScreenPlayWorkshop.pro | 4 ++-- 3 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 Common/ProtocolBuffer/.gitattributes delete mode 100644 Common/ProtocolBuffer/google/protobuf/bin/desktop.ini diff --git a/Common/ProtocolBuffer/.gitattributes b/Common/ProtocolBuffer/.gitattributes deleted file mode 100644 index c2b03299..00000000 --- a/Common/ProtocolBuffer/.gitattributes +++ /dev/null @@ -1,11 +0,0 @@ -*.uasset filter=lfs diff=lfs merge=lfs -text -*.umap filter=lfs diff=lfs merge=lfs -text -*.kra filter=lfs diff=lfs merge=lfs -text -*.blend filter=lfs diff=lfs merge=lfs -text -*.png filter=lfs diff=lfs merge=lfs -text -*.jpg filter=lfs diff=lfs merge=lfs -text -*.fbx filter=lfs diff=lfs merge=lfs -text -*.bmp filter=lfs diff=lfs merge=lfs -text -*.lib filter=lfs diff=lfs merge=lfs -text -*.exe filter=lfs diff=lfs merge=lfs -text -*.dll filter=lfs diff=lfs merge=lfs -text diff --git a/Common/ProtocolBuffer/google/protobuf/bin/desktop.ini b/Common/ProtocolBuffer/google/protobuf/bin/desktop.ini deleted file mode 100644 index 1a856bf7..00000000 --- a/Common/ProtocolBuffer/google/protobuf/bin/desktop.ini +++ /dev/null @@ -1,2 +0,0 @@ -[LocalizedFileNames] -libprotobuf.dll=@libprotobuf.dll,0 diff --git a/ScreenPlayWorkshop/workshopsdk/ScreenPlayWorkshop.pro b/ScreenPlayWorkshop/workshopsdk/ScreenPlayWorkshop.pro index 454d6e6f..cdd4bbe6 100644 --- a/ScreenPlayWorkshop/workshopsdk/ScreenPlayWorkshop.pro +++ b/ScreenPlayWorkshop/workshopsdk/ScreenPlayWorkshop.pro @@ -51,7 +51,7 @@ unix { } win32 { - INCLUDEPATH += "..\..\Common\ProtocolBuffer\google\protobuf\" - LIBS += -L"..\..\Common\ProtocolBuffer\google\protobuf\bin" -llibprotobuf.dll + INCLUDEPATH += "../../Common/ProtocolBuffer/google/protobuf/" + LIBS += -L"../../Common/ProtocolBuffer/google/protobuf/bin" -llibprotobuf.dll }