Correct definition of LINPHONE_PUBLIC on Windows.

CMakeLists.txt

@@ -237,6 +237,7 @@ if(MSVC)
 	include_directories(${MSVC_INCLUDE_DIR})
 endif()
 
+add_definitions("-DLINPHONE_EXPORTS")
 if(ENABLE_DEBUG_LOGS)
 	add_definitions("-DDEBUG")
 endif()

coreapi/lime.h

@@ -41,10 +41,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "linphone/core.h"
 #include <mediastreamer2/mscommon.h>
 
-#ifndef LINPHONE_PUBLIC
-#define LINPHONE_PUBLIC MS2_PUBLIC
-#endif
-
 /**
  * @brief Structure holding all needed material to encrypt/decrypt Messages */
 typedef struct limeKey_struct  {

coreapi/lpc2xml.h

@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #ifndef LPC2XML_H_
 #define LPC2XML_H_
 
-#include "linphone/lpconfig.h"
+#include "linphone/core.h"
 
 typedef struct _lpc2xml_context lpc2xml_context;
 

coreapi/vcard_private.h

@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #ifndef LINPHONE_VCARD_PRIVATE_H
 #define LINPHONE_VCARD_PRIVATE_H
 
-#include "linphone/vcard.h"
+#include "linphone/core.h"
 
 #ifdef __cplusplus
 extern "C"

coreapi/xml2lpc.h

@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #ifndef XML2LPC_H_
 #define XML2LPC_H_
 
-#include "linphone/lpconfig.h"
+#include "linphone/core.h"
 
 typedef struct _xml2lpc_context xml2lpc_context;
 

include/linphone/auth_info.h

@@ -22,10 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <mediastreamer2/mscommon.h>
 
-#ifndef LINPHONE_PUBLIC
-#define LINPHONE_PUBLIC MS2_PUBLIC
-#endif
-
 /**
  * @addtogroup authentication
  * @{

include/linphone/call.h

@@ -21,9 +21,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define LINPHONE_CALL_H
 
 #include <mediastreamer2/mscommon.h>
-#ifndef LINPHONE_PUBLIC
-#define LINPHONE_PUBLIC MS2_PUBLIC
-#endif
 
 #include "linphone/address.h"
 #include "linphone/call_log.h"

include/linphone/core.h

@@ -25,20 +25,30 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "mediastreamer2/msvideo.h"
 #include "mediastreamer2/mediastream.h"
 #include "mediastreamer2/bitratecontrol.h"
-#include "linphone/sipsetup.h"
-#include "linphone/lpconfig.h"
 
 #define LINPHONE_IPADDR_SIZE 64
 #define LINPHONE_HOSTNAME_SIZE 128
 
 #ifndef LINPHONE_PUBLIC
-#define LINPHONE_PUBLIC MS2_PUBLIC
+#if defined(_MSC_VER)
+#ifdef LINPHONE_EXPORTS
+#define LINPHONE_PUBLIC	__declspec(dllexport)
+#else
+#define LINPHONE_PUBLIC	__declspec(dllimport)
+#endif
+#else
+#define LINPHONE_PUBLIC
+#endif
 #endif
 
+
 #ifndef LINPHONE_DEPRECATED
 #define LINPHONE_DEPRECATED MS2_DEPRECATED
 #endif
 
+#include "linphone/sipsetup.h"
+#include "linphone/lpconfig.h"
+
 
 #ifdef __cplusplus
 extern "C" {

include/linphone/dictionary.h

@@ -21,9 +21,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define LINPHONE_DICTIONARY_H
 
 #include <mediastreamer2/mscommon.h>
-#ifndef LINPHONE_PUBLIC
-#define LINPHONE_PUBLIC MS2_PUBLIC
-#endif
 
 typedef struct belle_sip_dict LinphoneDictionary;
 

include/linphone/error_info.h

@@ -21,9 +21,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define LINPHONE_ERROR_INFO_H
 
 #include <mediastreamer2/mscommon.h>
-#ifndef LINPHONE_PUBLIC
-#define LINPHONE_PUBLIC MS2_PUBLIC
-#endif
 
 /**
  * @addtogroup misc

include/linphone/im_encryption_engine.h

@@ -22,10 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <mediastreamer2/mscommon.h>
 
-#ifndef LINPHONE_PUBLIC
-#define LINPHONE_PUBLIC MS2_PUBLIC
-#endif
-
 /**
  * @addtogroup misc
  * @{

include/linphone/lpconfig.h

@@ -29,10 +29,6 @@
 #include <ortp/port.h>
 #include "linphone/dictionary.h"
 
-#ifndef LINPHONE_PUBLIC
-	#define LINPHONE_PUBLIC MS2_PUBLIC
-#endif
-
 /**
  * @addtogroup misc
  * @{

include/linphone/sipsetup.h

@@ -23,10 +23,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "mediastreamer2/mscommon.h"
 
-#ifndef LINPHONE_PUBLIC
-#define LINPHONE_PUBLIC MS2_PUBLIC
-#endif
-
 struct _SipSetup;
 
 struct _BuddyInfo;

include/linphone/vcard.h

@@ -22,14 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <mediastreamer2/mscommon.h>
 
-#ifndef LINPHONE_PUBLIC
-#define LINPHONE_PUBLIC MS2_PUBLIC
-#endif
-
-#ifndef LINPHONE_DEPRECATED
-#define LINPHONE_DEPRECATED MS2_DEPRECATED
-#endif
-
 #ifdef __cplusplus
 extern "C"
 {

include/sal/sal.h

@@ -36,7 +36,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "belle-sip/mainloop.h"
 
 #ifndef LINPHONE_PUBLIC
-	#define LINPHONE_PUBLIC MS2_PUBLIC
+#if defined(_MSC_VER)
+#ifdef LINPHONE_EXPORTS
+#define LINPHONE_PUBLIC	__declspec(dllexport)
+#else
+#define LINPHONE_PUBLIC	__declspec(dllimport)
+#endif
+#else
+#define LINPHONE_PUBLIC
+#endif
 #endif
 
 #ifdef __cplusplus