opusDataLength

.gitignore

@@ -32,3 +32,18 @@ build/
 # IntelliJ
 *.iml
 .idea/
+
+
+# QtCreator
+*.user
+
+debug
+release
+*.gch
+*.layout
+*.depend
+*cscope_file_list
+bin
+Mumble.pb.cc
+Mumble.pb.h
+

CMakeLists.txt

@@ -1,24 +1,38 @@
 cmake_minimum_required(VERSION 2.8.0)
 project(mumlib)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-add_definitions(-DOPT_TLS_GNUTLS -D_POSIX_C_SOURCE=200112L)
+if (MSYS)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -DLOG4CPP_FIX_ERROR_COLLISION=1 -D__USE_W32_SOCKETS -static-libstdc++ -static-libgcc -static")
+  add_definitions(-DOPT_TLS_OPENSSL)
+elseif (NOT APPLE)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3")
+  add_definitions(-DOPT_TLS_OPENSSL -D_POSIX_C_SOURCE=200112L)
+elseif()
+  LINK_DIRECTORIES(/opt/local/lib) # Include the default MacPorts library directory
+endif()
 
 INCLUDE(FindPkgConfig)
 find_package(PkgConfig REQUIRED)
+
+if (NOT MSYS)
 find_package(Boost COMPONENTS system REQUIRED)
+endif()
+
 find_package(OpenSSL REQUIRED)
 find_package(Protobuf REQUIRED)
 
 pkg_check_modules(LOG4CPP "log4cpp")
 pkg_check_modules(OPUS "opus")
 
-
+if (MSYS)
+include_directories(~/boost_1_72_0)
+elseif (NOT APPLE)
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
+endif()
+
 include_directories(${OPENSSL_INCLUDE_DIR})
 include_directories(${PROTOBUF_INCLUDE_DIRS})
 include_directories(${OPUS_INCLUDE_DIRS})
-
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${LOG4CPP_INCLUDE_DIRS})
 include_directories(include)
@@ -42,15 +56,39 @@ set(MUMLIB_SRC
         src/Audio.cpp
         )
 
+set(SPEEX_LIBRARIES
+        speexdsp
+        )
+
 PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS Mumble.proto)
 
-add_library(mumlib SHARED ${MUMLIB_SRC} ${MUMLIB_PUBLIC_HEADERS} ${MUMLIB_PRIVATE_HEADERS} ${PROTO_SRCS} ${PROTO_HDRS})
-target_link_libraries(mumlib ${PROTOBUF_LIBRARIES})
-target_link_libraries(mumlib ${Boost_LIBRARIES})
-target_link_libraries(mumlib ${OPENSSL_LIBRARIES})
-target_link_libraries(mumlib ${LOG4CPP_LIBRARIES})
-target_link_libraries(mumlib ${OPUS_LIBRARIES})
+add_library(mumlib STATIC ${MUMLIB_SRC} ${MUMLIB_PUBLIC_HEADERS} ${MUMLIB_PRIVATE_HEADERS} ${PROTO_SRCS} ${PROTO_HDRS})
+
+if (MSYS)
+target_link_libraries(mumlib
+        ${SPEEX_LIBRARIES}
+        ${PROTOBUF_LIBRARIES}
+        ${OPENSSL_LIBRARIES}
+        ${LOG4CPP_LIBRARIES}
+        ${OPUS_LIBRARIES} ws2_32 winmm z crypto ssl)
+else ()
+target_link_libraries(mumlib
+        ${SPEEX_LIBRARIES}
+        ${PROTOBUF_LIBRARIES}
+        ${OPENSSL_LIBRARIES}
+        ${LOG4CPP_LIBRARIES}
+        ${OPUS_LIBRARIES}
+        ${Boost_LIBRARIES})
+endif ()
 
+set_target_properties(mumlib PROPERTIES PUBLIC_HEADER "${MUMLIB_PUBLIC_HEADERS}")
 
 add_executable(mumlib_example mumlib_example.cpp)
+
+if (MSYS)
+target_link_libraries(mumlib_example mumlib ws2_32)
+else ()
 target_link_libraries(mumlib_example mumlib)
+endif ()
+
+install(TARGETS DESTINATION mumlib LIBRARY DESTINATION lib PUBLIC_HEADER DESTINATION include/mumlib)