Skip to content

Commit

Permalink
fix build for ubuntu
Browse files Browse the repository at this point in the history
  • Loading branch information
freshlife001 committed Jul 15, 2016
2 parents c5404aa + e7ae358 commit c7a5782
Show file tree
Hide file tree
Showing 39 changed files with 277 additions and 3,084 deletions.
10 changes: 7 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
############################################################################

cmake_minimum_required(VERSION 3.0)
project(oRTP VERSION 0.26.0)
project(oRTP VERSION 0.27.0)


set(ORTP_MAJOR_VERSION ${PROJECT_VERSION_MAJOR})
set(ORTP_MINOR_VERSION ${PROJECT_VERSION_MINOR})
set(ORTP_MICRO_VERSION ${PROJECT_VERSION_PATCH})
set(ORTP_VERSION ${PROJECT_VERSION})
set(ORTP_SO_VERSION "11") # incremented on January, the 20th 2015. DO NOT INCREMENT BEFORE ORTP 0.26
set(ORTP_SO_VERSION "12") # incremented on June, the 1st 2016. DO NOT INCREMENT BEFORE ORTP 0.28


option(ENABLE_SHARED "Build shared library." YES)
Expand Down Expand Up @@ -133,7 +133,11 @@ add_definitions(-DHAVE_CONFIG_H)

set(STRICT_OPTIONS_CPP )
set(STRICT_OPTIONS_C )
if(NOT MSVC)
if(MSVC)
if(ENABLE_STRICT)
list(APPEND STRICT_OPTIONS_CPP "/WX")
endif()
else()
list(APPEND STRICT_OPTIONS_CPP "-Wall" "-Wuninitialized")
list(APPEND STRICT_OPTIONS_C "-Wdeclaration-after-statement" "-Wstrict-prototypes" "-Wno-error=strict-prototypes")
if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
Expand Down
11 changes: 10 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
June 1st 2016: ortp-0.27.0

May XX, 2016: 
- Fix DSCP on Windows.
- bctoolbox added as dependency
- fixes around IPv6 support for windows and android

January 22, 2016: ortp-0.26.0

November 2, 2015: ortp-0.25.0
- Suppot AVPF generic NACK
- Support AVPF generic NACK
- Add payload types for RTT (Real-Time Text) and Codec2
- Bug fixes

Expand Down
1 change: 0 additions & 1 deletion build/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
SUBDIRS= win32native wince winmob
EXTRA_DIST=android/Android.mk android/ortp_AndroidConfig.h wp8/oRTP/oRTP.sln wp8/oRTP/inttypes.h wp8/oRTP/oRTP.vcxproj wp8/oRTP/stdint.h

2 changes: 0 additions & 2 deletions build/win32native/.gitignore

This file was deleted.

2 changes: 0 additions & 2 deletions build/win32native/Makefile.am

This file was deleted.

20 changes: 0 additions & 20 deletions build/win32native/oRTP.sln

This file was deleted.

173 changes: 0 additions & 173 deletions build/win32native/oRTP.vcxproj

This file was deleted.

32 changes: 0 additions & 32 deletions build/win32native/ortp-config.h

This file was deleted.

2 changes: 0 additions & 2 deletions build/wince/.gitignore

This file was deleted.

2 changes: 0 additions & 2 deletions build/wince/Makefile.am

This file was deleted.

Loading

0 comments on commit c7a5782

Please sign in to comment.