Merge remote-tracking branch 'origin/master'

src/CMakeLists.txt

@@ -28,15 +28,18 @@ include_directories(${OPENSSL_INCLUDE})
 
 if (CMAKE_SYSTEM MATCHES "Windows*")
     add_definitions (-DTARGET_WIN -D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS -D_UNICODE -D_CRT_SECURE_NO_WARNINGS)
+    set (TARGET_WIN ON)
 endif()
 
 if (CMAKE_SYSTEM MATCHES "Linux*")
     add_definitions (-DTARGET_LINUX -DHAVE_NETINET_IN_H)
+    set (TARGET_LINUX ON)
 endif()
 
 
 if (CMAKE_SYSTEM MATCHES "Darwin*")
     add_definitions (-DTARGET_OSX)
+    set (TARGET_OSX ON)
 endif()
 
 if (CMAKE_SYSTEM MATCHES "Android")
@@ -45,10 +48,12 @@ if (CMAKE_SYSTEM MATCHES "Android")
     add_subdirectory (${OBOE_DIR} ./oboe)
     include_directories (${OBOE_DIR}/include)
     add_definitions(-DTARGET_ANDROID -DHAVE_NETINET_IN_H)
+    set (TARGET_ANDROID ON)
 endif()
 
 if (USE_MUSL)
     add_definitions(-DTARGET_MUSL)
+    set (TARGET_MUSL ON)
 endif()
 
 set (RTPHONE_SOURCES

src/engine/agent/Agent_AudioManager.cpp

@@ -6,6 +6,7 @@
 #include "Agent_AudioManager.h"
 #include "../engine/audio/Audio_WavFile.h"
 #include "../engine/audio/Audio_Null.h"
+#include "HL_String.h"
 
 #if defined(TARGET_ANDROID)
 # include "../engine/audio/Audio_Android.h"
@@ -171,7 +172,7 @@ void AudioManager::startPlayFile(int usageId, const std::string& path, AudioTarg
     // Check if file exists
     Audio::PWavFileReader r = std::make_shared<Audio::WavFileReader>();
 #ifdef TARGET_WIN
-    r->open(StringHelper::makeTstring(path));
+    r->open(strx::makeTstring(path));
 #else
     r->open(path);
 #endif

src/engine/audio/Audio_DirectSound.h

@@ -1,4 +1,4 @@
-/* Copyright(C) 2007-2017 VoIP objects (voipobjects.com)
+/* Copyright(C) 2007-2025 VoIP objects (voipobjects.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -6,7 +6,7 @@
 #ifndef __AUDIO_DSOUND_H
 #define __AUDIO_DSOUND_H
 
-#include "../config.h"
+#include "../engine_config.h"
 
 #include <winsock2.h>
 #include <windows.h>

src/engine/audio/Audio_Null.cpp

@@ -1,6 +1,7 @@
 #include "Audio_Null.h"
 #include "helper/HL_Log.h"
 #include <assert.h>
+#include <chrono>
 #define LOG_SUBSYSTEM "NULL audio"
 
 using namespace Audio;

src/engine/audio/Audio_Wmme.h

@@ -8,7 +8,7 @@
 
 #ifdef TARGET_WIN
 
-#include "../config.h"
+#include "../engine_config.h"
 
 #include <winsock2.h>
 #include <windows.h>

src/engine/helper/HL_String.cpp

@@ -423,3 +423,24 @@ std::string strx::removeQuotes(const std::string& s)
 
     return r;
 }
+
+#if defined(TARGET_WIN)
+
+// MSVC++ lacks memmem support
+const void *memmem(const void *haystack, size_t haystack_len,
+                   const void * const needle, const size_t needle_len)
+{
+    if (!haystack || !haystack_len || !needle || !needle_len)
+        return nullptr;
+
+    for (const char *h = (const char*)haystack;
+         haystack_len >= needle_len;
+         ++h, --haystack_len) {
+        if (!memcmp(h, needle, needle_len)) {
+            return h;
+        }
+    }
+    return nullptr;
+}
+#endif
+

src/engine/helper/HL_String.h

@@ -84,4 +84,11 @@ public:
 };
 
 
+#if defined(TARGET_WIN)
+
+// MSVC++ lacks memmem support
+extern const void *memmem(const void *haystack, size_t haystack_len,
+                          const void * const needle, const size_t needle_len);
+#endif
+
 #endif

src/engine/helper/HL_Sync.h

@@ -14,6 +14,11 @@
 #include <functional>
 #include <assert.h>
 
+#if defined(TARGET_WIN)
+# include <WinSock2.h>
+# include <Windows.h>
+#endif
+
 typedef std::recursive_mutex Mutex;
 typedef std::unique_lock<std::recursive_mutex> Lock;
 

src/engine/media/MT_AmrCodec.cpp

@@ -6,6 +6,8 @@
 #include "../helper/HL_Log.h"
 #include "../helper/HL_IuUP.h"
 
+#include <iostream>
+
 #define LOG_SUBSYSTEM "AmrCodec"
 using namespace MT;
 

src/engine/media/MT_AudioReceiver.cpp

@@ -3,7 +3,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define NOMINMAX
+#if defined(TARGET_WIN) && !defined(NOMINMAX)
+#  define NOMINMAX
+#endif
 
 #include "../engine_config.h"
 #include "MT_AudioReceiver.h"
@@ -14,6 +16,7 @@
 #include "../audio/Audio_Interface.h"
 #include "../audio/Audio_Resampler.h"
 #include <cmath>
+#include <iostream>
 
 #if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT) && !defined(TARGET_WIN) && !defined(TARGET_RPI) && defined(USE_AMR_CODEC)
 # include "MT_AmrCodec.h"

src/libs/libevs/CMakeLists.txt

@@ -14,3 +14,5 @@ target_include_directories(evs_codec PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/basic_o
                                              ${CMAKE_CURRENT_SOURCE_DIR}/lib_enc
                                              ${CMAKE_CURRENT_SOURCE_DIR}/lib_dec
                                              ${CMAKE_CURRENT_SOURCE_DIR}/lib_com)
+
+set_property(TARGET evs_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

src/libs/opus/CMakeLists.txt

@@ -256,6 +256,8 @@ endif()
 add_library(opus ${opus_headers} ${opus_sources} ${opus_sources_float} ${Opus_PUBLIC_HEADER})
 add_library(Opus::opus ALIAS opus)
 
+set_property(TARGET opus PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+
 get_library_version(OPUS_LIBRARY_VERSION OPUS_LIBRARY_VERSION_MAJOR)
 message(DEBUG "Opus library version: ${OPUS_LIBRARY_VERSION}")
 

src/libs/srtp/crypto/include/config.h

@@ -3,10 +3,6 @@
 
 #define HAVE_STDLIB_H
 
-#ifdef WIN32
-# define inline __inline
-#endif
-
 #ifdef WIN32
 #define HAVE_WINSOCK2_H   1
 #define CPU_CISC 1