From 63191e1c865b329da86a295e462d2302c97625a6 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Fri, 20 Sep 2019 16:07:04 -0700 Subject: [PATCH] Linux fixes --- BeefBoot/BeefBoot.cpp | 1 - IDEHelper/CMakeLists.txt | 1 + IDEHelper/NetManager.cpp | 14 +++++++++++++- IDEHelper/NetManager.h | 23 +++-------------------- 4 files changed, 17 insertions(+), 22 deletions(-) diff --git a/BeefBoot/BeefBoot.cpp b/BeefBoot/BeefBoot.cpp index 0d129ba8..f4d50544 100644 --- a/BeefBoot/BeefBoot.cpp +++ b/BeefBoot/BeefBoot.cpp @@ -12,7 +12,6 @@ #include "BeefySysLib/util/Deque.h" #include "BeefySysLib/util/HashSet.h" #include "BeefySysLib/util/MultiHashSet.h" -#include "CrashCatcher.h" //#include //#include diff --git a/IDEHelper/CMakeLists.txt b/IDEHelper/CMakeLists.txt index 1deadf9f..8f91cb90 100644 --- a/IDEHelper/CMakeLists.txt +++ b/IDEHelper/CMakeLists.txt @@ -111,6 +111,7 @@ file(GLOB SRC_FILES Debugger.cpp DebugManager.cpp DebugVisualizers.cpp + NetManager.cpp SpellChecker.cpp Targets.cpp X64.cpp diff --git a/IDEHelper/NetManager.cpp b/IDEHelper/NetManager.cpp index 4e56600c..9f893242 100644 --- a/IDEHelper/NetManager.cpp +++ b/IDEHelper/NetManager.cpp @@ -198,7 +198,7 @@ void NetRequest::Perform() DoTransfer(); } -#else +#elif defined BF_PLATFORM_WINDOWS #include #include @@ -370,6 +370,18 @@ void NetRequest::Cleanup() } +#else + +void NetRequest::Perform() +{ + mFailed = true; +} + +void NetRequest::Cleanup() +{ + +} + #endif NetRequest::~NetRequest() diff --git a/IDEHelper/NetManager.h b/IDEHelper/NetManager.h index eb73e5fe..f21d7e65 100644 --- a/IDEHelper/NetManager.h +++ b/IDEHelper/NetManager.h @@ -6,10 +6,11 @@ #include "BeefySysLib/util/ThreadPool.h" #include "BeefySysLib/util/Dictionary.h" -#ifdef BF_PLATFORM_WINDOWS - NS_BF_BEGIN + +#ifdef BF_PLATFORM_WINDOWS #define BF_CURL +#endif class DebugManager; class NetManager; @@ -120,21 +121,3 @@ public: }; NS_BF_END - -#else - -NS_BF_BEGIN - -class NetManager -{ -public: - DebugManager* mDebugManager; - -public: - void CancelAll() {}; - void Clear() {}; -}; - -NS_BF_END - -#endif \ No newline at end of file