From 15457fef21dd6f0c5d697b80c811e61ee8e4c547 Mon Sep 17 00:00:00 2001
From: Dmytro Bogovych <dmytro.bogovych@gmail.com>
Date: Fri, 20 Jul 2018 22:20:25 +0300
Subject: [PATCH] - minor fixes for MSVC compiler

---
 src/CMakeLists.txt              | 22 ++++++++++++++++++++--
 src/engine/audio/CMakeLists.txt |  4 +++-
 src/libs/gsmhr/gsmhr_sp_rom.h   |  9 +++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e4973576..9b7d661e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -50,9 +50,27 @@ add_subdirectory(${rtphone_libs}/speexdsp)
 add_subdirectory(${rtphone_libs}/srtp)
 add_subdirectory(${rtphone_libs}/webrtc)
 
+set(LIBS ice_stack jrtplib g729_codec gsm_codec
+    gsmhr_codec g722_codec srtp resiprocate helper_lib audio_lib webrtc speexdsp
+    uuid dl)
+
+if (CMAKE_SYSTEM MATCHES "Win*")
+    set (LIBS ${LIBS} ssleay32 libeay32 opus silk_float celt)
+else (CMAKE_SYSTEM MATCHES "Win*")
+    set (LIBS ${LIBS} ssl crypto dl opus)
+endif (CMAKE_SYSTEM MATCHES "Win*")
+
+if (USE_AMR_CODEC)
+    set(LIBS ${LIBS} opencore-amrnb opencore-amrwb)
+endif (USE_AMR_CODEC)
+
 target_link_libraries(rtphone ice_stack jrtplib g729_codec gsm_codec
     gsmhr_codec g722_codec srtp resiprocate
-    opencore-amrnb opencore-amrwb
     helper_lib audio_lib webrtc speexdsp
-    ssl crypto opus uuid dl)
+    opus uuid)
 
+
+target_include_directories(rtphone
+    PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+           $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/engine>
+    PRIVATE ../../libs/speex/include ../../libs ../)
diff --git a/src/engine/audio/CMakeLists.txt b/src/engine/audio/CMakeLists.txt
index f12dc54a..0ea2ad95 100644
--- a/src/engine/audio/CMakeLists.txt
+++ b/src/engine/audio/CMakeLists.txt
@@ -20,4 +20,6 @@ set (AUDIOLIB_SOURCES
 )
 
 add_library(audio_lib ${AUDIOLIB_SOURCES})
-target_include_directories(audio_lib PRIVATE ../../libs/speex/include ../../libs ../)
+target_include_directories(audio_lib
+    PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    PRIVATE ../../libs/speex/include ../../libs ../)
diff --git a/src/libs/gsmhr/gsmhr_sp_rom.h b/src/libs/gsmhr/gsmhr_sp_rom.h
index 00632281..74f85f5b 100644
--- a/src/libs/gsmhr/gsmhr_sp_rom.h
+++ b/src/libs/gsmhr/gsmhr_sp_rom.h
@@ -7,6 +7,10 @@
 #ifndef ___ROM
 #define ___ROM
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 #include "gsmhr_typedefs.h"
 //#include "gsmhr_mathhalf.h"
 //#include "gsmhr_mathdp31.h"
@@ -190,4 +194,9 @@ extern int32_tRom pL_rFlatSstCoefs[FLATSSTCOEFS_NUM_OF_CODES];
 extern int16_tRom psrOldCont[4];
 extern int16_tRom psrNewCont[4];
 
+#if defined(__cplusplus)
+}
+#endif
+
+
 #endif