Changeset 227:7cf64dc0debb in verona

Timestamp:

May 31, 2011 2:08:25 PM (2 years ago)

Author:

laurent@…

Branch:

default

Message:

add missing -DISL_DLLENTRY

Files:

• libeXosip2/CMakeLists.txt (modified) (2 diffs)
• oRTP/CMakeLists.txt (modified) (1 diff)
• phapi/CMakeLists.txt (modified) (2 diffs)

libeXosip2/CMakeLists.txt

@@ -59 +59 @@
   include_directories(include ${OSIP2_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/../libs/util/cutil/include/cutil/msvc)
 else(WIN32 AND NOT CMAKE_UNDER_CE)
-        if(CMAKE_UNDER_CE)
-                include_directories(include ${OSIP2_INCLUDE_DIRS} ${WCECOMPAT_INCLUDE_DIRS})
-        else(CMAKE_UNDER_CE)
-                include_directories(include ${OSIP2_INCLUDE_DIRS})
-        endif(CMAKE_UNDER_CE)
+  if(CMAKE_UNDER_CE)
+    include_directories(include ${OSIP2_INCLUDE_DIRS} ${WCECOMPAT_INCLUDE_DIRS})
+  else(CMAKE_UNDER_CE)
+    include_directories(include ${OSIP2_INCLUDE_DIRS})
+  endif(CMAKE_UNDER_CE)
 endif(WIN32 AND NOT CMAKE_UNDER_CE)
 link_directories(${OSIP2_LIBRARY_DIRS})
@@ -95 +95 @@
   include_directories(${OSIP2_INCLUDE_DIRS} ${CSL_INCLUDE_DIRS} ${ACSLCORE_INCLUDE_DIRS})
   set(EXOSIP2_LINK_LIBRARIES ${EXOSIP2_LINK_LIBRARIES} ${ACSLCORE_LIBRARIES})
+  if(WIN32)
+                add_definitions(-DISL_DLLENTRY=__declspec\(dllexport\))
+        else(WIN32)
+                add_definitions(-DISL_DLLENTRY=)
+        endif(WIN32)
 endif(USE_CSL)
 

oRTP/CMakeLists.txt

@@ -73 +73 @@
   include_directories(${CSL_INCLUDE_DIRS} ${ACSLCORE_INCLUDE_DIRS})
   set(ORTP_LINK_LIBRARIES ${ORTP_LINK_LIBRARIES} ${ACSLCORE_LIBRARIES})
+  if(WIN32)
+        add_definitions(-DISL_DLLENTRY=__declspec\(dllexport\))
+  else(WIN32)
+        add_definitions(-DISL_DLLENTRY=)
+  endif(WIN32)
 endif(USE_CSL)
 

phapi/CMakeLists.txt

@@ -14 +14 @@
     message("Can't find avcodec.h -- Video disabled")
   else()
-    add_definitions(-PHAPI_VIDEO_SUPPORT)
+    add_definitions(-DENABLE_VIDEO)
   endif(NOT HAVE_AVCODEC_H)
 endif(ENABLE_VIDEO)
@@ -104 +104 @@
   include_directories(${CSL_INCLUDE_DIRS} ${ACSLCORE_INCLUDE_DIRS})
   set(PHAPI_SRCS ${PHAPI_SRCS} phapi_csl.c)
+  if(WIN32)
+        add_definitions(-DISL_DLLENTRY=__declspec\(dllexport\))
+  else(WIN32)
+        add_definitions(-DISL_DLLENTRY=)
+  endif(WIN32)
 endif(USE_CSL)