Commit 1f3306fb authored by Ghislain MARY's avatar Ghislain MARY

Do not try to search for libgcc and libmingwex when building for Windows Phone.

parent 8e1940fa
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
# #
############################################################################ ############################################################################
if(MSVC) if(MSVC AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsPhone")
find_library(LIBGCC NAMES gcc) find_library(LIBGCC NAMES gcc)
find_library(LIBMINGWEX NAMES mingwex) find_library(LIBMINGWEX NAMES mingwex)
endif() endif()
...@@ -69,12 +69,10 @@ add_definitions( ...@@ -69,12 +69,10 @@ add_definitions(
) )
set(BASE_LIBS set(BASE_LIBS
${LIBGCC}
${LIBMINGWEX}
${ORTP_LIBRARIES} ${ORTP_LIBRARIES}
) )
if(WIN32 AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsPhone") if(WIN32 AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsPhone")
list(APPEND BASE_LIBS ole32 oleaut32 uuid) list(APPEND BASE_LIBS ${LIBGCC} ${LIBMINGWEX} ole32 oleaut32 uuid)
endif() endif()
if(HAVE_DLOPEN) if(HAVE_DLOPEN)
list(APPEND BASE_LIBS dl) list(APPEND BASE_LIBS dl)
...@@ -326,14 +324,12 @@ set_source_files_properties(${VOIP_GENERATED_SOURCE_FILES} PROPERTIES GENERATED ...@@ -326,14 +324,12 @@ set_source_files_properties(${VOIP_GENERATED_SOURCE_FILES} PROPERTIES GENERATED
set(VOIP_LIBS set(VOIP_LIBS
${LIBGCC}
${LIBMINGWEX}
${ORTP_LIBRARIES} ${ORTP_LIBRARIES}
mediastreamer_base mediastreamer_base
) )
if(WIN32) if(WIN32)
if(NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsPhone") if(NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsPhone")
list(APPEND VOIP_LIBS ole32 oleaut32 uuid) list(APPEND VOIP_LIBS ${LIBGCC} ${LIBMINGWEX} ole32 oleaut32 uuid)
if(ENABLE_VIDEO) if(ENABLE_VIDEO)
list(APPEND VOIP_LIBS gdi32 user32 vfw32) list(APPEND VOIP_LIBS gdi32 user32 vfw32)
endif() endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment