Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build on Windows #732

Merged
merged 2 commits into from
Jun 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions clean_build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,11 @@ if exist bin\Debug (
)

echo Build completed successfully
set BUILD_FAILED=0
goto done

:failed
set BUILD_FAILED=%ERRORLEVEL%
echo Build failed

:done
Expand All @@ -84,3 +86,5 @@ set BONJOUR_SDK_HOME=
set B_QT_FULLPATH=
set savedir=
set cmake_gen=

EXIT /B %BUILD_FAILED%
1 change: 1 addition & 0 deletions src/lib/arch/win32/ArchInternetWindows.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "arch/win32/ArchInternetWindows.h"
#include "arch/win32/XArchWindows.h"
#include "arch/Arch.h"
#include "base/String.h"
#include "common/Version.h"

#include <sstream>
Expand Down
1 change: 1 addition & 0 deletions src/lib/arch/win32/XArchWindows.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#include "arch/win32/XArchWindows.h"
#include "arch/win32/ArchNetworkWinsock.h"
#include "base/String.h"

//
// XArchEvalWindows
Expand Down
4 changes: 2 additions & 2 deletions src/lib/arch/win32/XArchWindows.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class XArchEvalWindows : public XArchEval {
XArchEvalWindows(DWORD error) : m_error(error) { }
virtual ~XArchEvalWindows() { }

virtual std::string eval() const;
virtual std::string eval() const noexcept;

private:
DWORD m_error;
Expand All @@ -42,7 +42,7 @@ class XArchEvalWinsock : public XArchEval {
XArchEvalWinsock(int error) : m_error(error) { }
virtual ~XArchEvalWinsock() { }

virtual std::string eval() const;
virtual std::string eval() const noexcept;

private:
int m_error;
Expand Down
1 change: 1 addition & 0 deletions src/lib/barrier/PlatformScreen.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

#include "barrier/IPlatformScreen.h"
#include "barrier/DragInformation.h"
#include <stdexcept>

//! Base screen implementation
/*!
Expand Down
1 change: 1 addition & 0 deletions src/lib/base/IEventQueue.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

#include "common/IInterface.h"
#include "base/Event.h"
#include <string>

class IEventJob;
class IEventQueueBuffer;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/platform/MSWindowsDesks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,7 @@ MSWindowsDesks::closeDesktop(HDESK desk)
std::string MSWindowsDesks::getDesktopName(HDESK desk)
{
if (desk == NULL) {
return {}
return {};
}
else {
DWORD size;
Expand Down
1 change: 1 addition & 0 deletions src/lib/platform/MSWindowsUtil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "platform/MSWindowsUtil.h"

#include <stdio.h>
#include "base/String.h"

//
// MSWindowsUtil
Expand Down
1 change: 0 additions & 1 deletion src/test/integtests/platform/MSWindowsKeyStateTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ class MSWindowsKeyStateTests : public ::testing::Test
protected:
virtual void SetUp()
{
m_hook.loadLibrary();
m_screensaver = new MSWindowsScreenSaver();
}

Expand Down