Skip to content

Commit 740f24d

Browse files
committed
Absolute path to cxxopts changed to relative path
1 parent e62a4b8 commit 740f24d

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
all:
22
g++ src/Main.cpp \
33
-std=c++14 -pthread \
4+
-Ilib/cxxopts/include \
45
-o FileBroadcaster

src/FileBroadcaster.vcxproj

+2
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
<SDLCheck>true</SDLCheck>
8686
<ConformanceMode>true</ConformanceMode>
8787
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions); _WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions>
88+
<AdditionalIncludeDirectories>$(SolutionDir)/lib/cxxopts/include/</AdditionalIncludeDirectories>
8889
</ClCompile>
8990
</ItemDefinitionGroup>
9091
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -110,6 +111,7 @@
110111
<SDLCheck>true</SDLCheck>
111112
<ConformanceMode>true</ConformanceMode>
112113
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions); _WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions>
114+
<AdditionalIncludeDirectories>$(SolutionDir)/lib/cxxopts/include/</AdditionalIncludeDirectories>
113115
</ClCompile>
114116
<Link>
115117
<EnableCOMDATFolding>true</EnableCOMDATFolding>

src/Main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "../lib/cxxopts/include/cxxopts.hpp"
1+
#include "cxxopts.hpp"
22

33
#include "Receiver.cpp"
44
#include "Sender.cpp"

src/Utils.hpp

+3-10
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,22 @@
1616

1717
#include <thread>
1818
#include <string>
19-
#include <iostream>
2019
#include <fstream>
21-
#include <string.h> // memcpy
22-
#include <map>
20+
#include <cstring> // memcpy
2321
#include <chrono>
2422

25-
#include <random> // TODO: remove (for tests only)
26-
#include <ctime> // TODO: remove (for tests only)
27-
#include <math.h>
28-
23+
#include <map>
2924
#include <vector>
3025
#include <set>
31-
#include <atomic>
3226

33-
#include "../lib/cxxopts/include/cxxopts.hpp"
27+
#include "cxxopts.hpp"
3428
#include "Config.hpp"
3529

3630

3731
using namespace std::chrono_literals;
3832

3933

4034
namespace Utils {
41-
4235
/**
4336
* Return a coded number
4437
* @param buffer - bytes array

0 commit comments

Comments
 (0)