From 6d664b82a4519eab6b1b37bc9d8a337393046910 Mon Sep 17 00:00:00 2001 From: monsieurgustav Date: Tue, 31 Mar 2015 22:08:05 +0200 Subject: [PATCH] compilefix on MacOSX --- OSC/Source/OSC/Private/Common/OscFunctionLibrary.cpp | 1 + OSC/Source/OSC/Private/Osc.h | 2 +- OSC/Source/OSC/Private/OscModule.cpp | 1 + OSC/Source/OSC/Private/OscPrivatePCH.h | 2 -- OSC/Source/OSC/Private/OscSettings.cpp | 2 +- OSC/Source/OSC/Private/OscSettings.h | 3 ++- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/OSC/Source/OSC/Private/Common/OscFunctionLibrary.cpp b/OSC/Source/OSC/Private/Common/OscFunctionLibrary.cpp index 99bd1da..7528e4c 100644 --- a/OSC/Source/OSC/Private/Common/OscFunctionLibrary.cpp +++ b/OSC/Source/OSC/Private/Common/OscFunctionLibrary.cpp @@ -1,4 +1,5 @@ #include "OscPrivatePCH.h" +#include "OscSettings.h" #include "OscFunctionLibrary.h" #include "oscpack/osc/OscOutboundPacketStream.h" diff --git a/OSC/Source/OSC/Private/Osc.h b/OSC/Source/OSC/Private/Osc.h index dca36ed..02a5cf9 100644 --- a/OSC/Source/OSC/Private/Osc.h +++ b/OSC/Source/OSC/Private/Osc.h @@ -2,7 +2,7 @@ // Target engine version. Used to enable compatibility code. -#define OSC_ENGINE_VERSION 40600 +#define OSC_ENGINE_VERSION 40700 #ifndef OSC_EDITOR_BUILD #error OSC_EDITOR_BUILD must be set by the OSC.Build.cs diff --git a/OSC/Source/OSC/Private/OscModule.cpp b/OSC/Source/OSC/Private/OscModule.cpp index 6a062e5..924fb79 100644 --- a/OSC/Source/OSC/Private/OscModule.cpp +++ b/OSC/Source/OSC/Private/OscModule.cpp @@ -1,4 +1,5 @@ #include "OscPrivatePCH.h" +#include "OscSettings.h" #include "OscDispatcher.h" #if OSC_EDITOR_BUILD diff --git a/OSC/Source/OSC/Private/OscPrivatePCH.h b/OSC/Source/OSC/Private/OscPrivatePCH.h index 90fe866..1c38a17 100644 --- a/OSC/Source/OSC/Private/OscPrivatePCH.h +++ b/OSC/Source/OSC/Private/OscPrivatePCH.h @@ -19,8 +19,6 @@ #include "Runtime/Engine/Classes/Kismet/BlueprintFunctionLibrary.h" #include "Runtime/Networking/Public/Networking.h" -#include "OscSettings.h" - #include #include diff --git a/OSC/Source/OSC/Private/OscSettings.cpp b/OSC/Source/OSC/Private/OscSettings.cpp index f1d6a72..d8b43ee 100644 --- a/OSC/Source/OSC/Private/OscSettings.cpp +++ b/OSC/Source/OSC/Private/OscSettings.cpp @@ -1,6 +1,6 @@ #include "OscPrivatePCH.h" -#include "OscReceiverInputKey.h" +#include "OscSettings.h" #include "OscDispatcher.h" diff --git a/OSC/Source/OSC/Private/OscSettings.h b/OSC/Source/OSC/Private/OscSettings.h index ac85d04..01237eb 100644 --- a/OSC/Source/OSC/Private/OscSettings.h +++ b/OSC/Source/OSC/Private/OscSettings.h @@ -1,9 +1,10 @@ #pragma once #include +#include "OscReceiverInputKey.h" + #include "OscSettings.generated.h" -class OscReceiverInputKey; class UOscDispatcher;