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.

Sign up for GitHub

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 0.4.0 release that has issue with newer MSVC version #68

Merged
merged 1 commit into from
Dec 16, 2024
Merged

Fix 0.4.0 release that has issue with newer MSVC version #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions dependencies/nx_kit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ if(MSVC)
# This block covers not only Visual Studio compiler but also clang-cl, which expands /W4 to
# the -Wall flag, while -Wall itself, if passed directly, will be expanded to -Weverything.
add_compile_options(/W4 /WX /utf-8)

# Temporary fix to prevent crashes on startup of Network Optix Server
# Issue causes by compiling with MSVC 14.40 which has a code change incompatible
# with MSVC 14.38 which the Network Optix server is compiled with.
add_compile_definitions(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
add_compile_options(-Wall -Wextra -Werror)
endif()
Expand Down
9 changes: 0 additions & 9 deletions dependencies/nx_kit/src/nx/kit/debug.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,6 @@

#include "debug.h"

// Temporary fix to prevent crashes on startup of Network Optix Server
// Issue causes by compiling with MSVC 14.40 which has a code change incompatible
// with MSVC 14.38 which the Network Optix server is compiled with.
#if defined(_WIN32)
#ifndef _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
#define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
#endif
#endif

#include <chrono>
#include <deque>
#include <fstream>
Expand Down
9 changes: 0 additions & 9 deletions dependencies/nx_kit/src/nx/kit/ini_config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,6 @@

#include "ini_config.h"

// Temporary fix to prevent crashes on startup of Network Optix Server
// Issue causes by compiling with MSVC 14.40 which has a code change incompatible
// with MSVC 14.38 which the Network Optix server is compiled with.
#if defined(_WIN32)
#ifndef _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
#define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
#endif
#endif

#include <cstdlib>
#include <cstring>
#include <fstream>
Expand Down
9 changes: 0 additions & 9 deletions dependencies/nx_kit/src/nx/kit/ini_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,6 @@

#pragma once

// Temporary fix to prevent crashes on startup of Network Optix Server
// Issue causes by compiling with MSVC 14.40 which has a code change incompatible
// with MSVC 14.38 which the Network Optix server is compiled with.
#if defined(_WIN32)
#ifndef _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
#define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
#endif
#endif

#include <functional>
#include <iostream>
#include <vector>
Expand Down
5 changes: 5 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@ if(NOT MSVC)
-Werror=format-security
)
else()
# Temporary fix to prevent crashes on startup of Network Optix Server
# Issue causes by compiling with MSVC 14.40 which has a code change incompatible
# with MSVC 14.38 which the Network Optix server is compiled with.
add_compile_definitions(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)

add_compile_definitions(_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING)
target_compile_options(cloudfuse_plugin PRIVATE
-W4 -GS -sdl
Expand Down
9 changes: 0 additions & 9 deletions src/lib/nx/sdk/analytics/helpers/consuming_device_agent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,6 @@

#pragma once

// Temporary fix to prevent crashes on startup of Network Optix Server
// Issue causes by compiling with MSVC 14.40 which has a code change incompatible
// with MSVC 14.38 which the Network Optix server is compiled with.
#if defined(_WIN32)
#ifndef _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
#define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
#endif
#endif

#include <map>
#include <mutex>
#include <string>
Expand Down
8 changes: 0 additions & 8 deletions src/lib/nx/sdk/analytics/helpers/engine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@

#pragma once

// Temporary fix to prevent crashes on startup of Network Optix Server
// Issue causes by compiling with MSVC 14.40 which has a code change incompatible
// with MSVC 14.38 which the Network Optix server is compiled with.
#if defined(_WIN32)
#ifndef _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
#define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
#endif
#endif
#include <map>
#include <mutex>
#include <string>
Expand Down
9 changes: 0 additions & 9 deletions src/lib/nx/sdk/helpers/lib_context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,6 @@

#pragma once

// Temporary fix to prevent crashes on startup of Network Optix Server
// Issue causes by compiling with MSVC 14.40 which has a code change incompatible
// with MSVC 14.38 which the Network Optix server is compiled with.
#if defined(_WIN32)
#ifndef _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
#define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
#endif
#endif

#include <map>
#include <memory>
#include <mutex>
Expand Down
9 changes: 0 additions & 9 deletions src/lib/nx/sdk/helpers/media_stream_statistics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,6 @@

#pragma once

// Temporary fix to prevent crashes on startup of Network Optix Server
// Issue causes by compiling with MSVC 14.40 which has a code change incompatible
// with MSVC 14.38 which the Network Optix server is compiled with.
#if defined(_WIN32)
#ifndef _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
#define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
#endif
#endif

#include <chrono>
#include <deque>
#include <limits>
Expand Down
9 changes: 0 additions & 9 deletions src/lib/nx/sdk/helpers/uuid_helper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,6 @@

#include "uuid_helper.h"

// Temporary fix to prevent crashes on startup of Network Optix Server
// Issue causes by compiling with MSVC 14.40 which has a code change incompatible
// with MSVC 14.38 which the Network Optix server is compiled with.
#if defined(_WIN32)
#ifndef _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
#define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
#endif
#endif

#include <limits>
#include <sstream>
#include <iomanip>
Expand Down
4 changes: 2 additions & 2 deletions src/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "nx-lyve-cloud-plugin",
"dependencies": [
{ "name": "openssl", "version>=": "3.3.1" }
{ "name": "openssl", "version>=": "3.3.2" }
],
"builtin-baseline": "4065f37d0a6628ef17cf6ee15385f9091f1075bc"
"builtin-baseline": "b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c"
}
Loading