Merge pull request #1 from Blizzard/master

Merging from origin

Author: jrepp

.gitignore

@@ -20,6 +20,7 @@
 *.app
 
 build/
+build_*/
 
 *.swp
 
@@ -52,4 +53,8 @@ CodeAnalyst/
 project/include
 project/lib
 
-.DS_Store
+.DS_Store
+
+docs/html
+docs/latex
+doxygen.log

.gitmodules

@@ -1,12 +1,15 @@
+[submodule "contrib/civetweb"]
+	path = contrib/civetweb
+	url = https://github.com/Blizzard/civetweb
 [submodule "contrib/protobuf"]
 	path = contrib/protobuf
 	url = https://github.com/google/protobuf
 [submodule "contrib/SDL-mirror"]
 	path = contrib/SDL-mirror
 	url = https://github.com/spurious/SDL-mirror
-[submodule "contrib/civetweb"]
-	path = contrib/civetweb
-	url = https://github.com/KevinCalderone/civetweb
 [submodule "protocol"]
 	path = protocol
 	url = https://github.com/Blizzard/s2client-proto
+[submodule "contrib/ipv6-parse"]
+	path = contrib/ipv6-parse
+	url = https://github.com/jrepp/ipv6-parse

.travis.yml

@@ -0,0 +1,34 @@
+sudo: true
+language: cpp
+compiler: gcc
+dist: trusty
+
+branches:
+  only:
+  - master
+  - /blizzard_internal.*/
+  except:
+  - gh-pages
+
+before_install:
+  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test # For C++14
+  - sudo apt-get -qq update
+
+install:
+  - sudo apt-get install -y g++-5
+  - sudo apt-get install doxygen
+  - sudo apt-get install doxygen-doc
+  - sudo apt-get install doxygen-latex
+  - sudo apt-get install doxygen-gui
+  - sudo apt-get install graphviz
+  - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 90
+  - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 90
+
+script:
+  - mkdir build
+  - cd build
+  - cmake ../
+  - make
+
+after_success:
+  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && cd $TRAVIS_BUILD_DIR && ./generate_and_deploy_doxygen.sh'

CMakeLists.txt

@@ -19,19 +19,72 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${PROJECT_BINARY_DIR}/bin)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${PROJECT_BINARY_DIR}/bin)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${PROJECT_BINARY_DIR}/bin)
 
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL ${PROJECT_BINARY_DIR}/bin)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL ${PROJECT_BINARY_DIR}/bin)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${PROJECT_BINARY_DIR}/bin)
+
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO ${PROJECT_BINARY_DIR}/bin)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO ${PROJECT_BINARY_DIR}/bin)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${PROJECT_BINARY_DIR}/bin)
+
 # Build with c++14 support.
 set(CMAKE_CXX_STANDARD 14)
 
+# Disable default libraries in visual studio
+if (MSVC)
+    # Default to statically-linked runtime.
+    if("${MSVC_RUNTIME}" STREQUAL "")
+        set(MSVC_RUNTIME "static")
+    endif()
+
+    # Set compiler options.
+    set(variables
+        CMAKE_C_FLAGS_DEBUG
+        CMAKE_C_FLAGS_MINSIZEREL
+        CMAKE_C_FLAGS_RELEASE
+        CMAKE_C_FLAGS_RELWITHDEBINFO
+        CMAKE_CXX_FLAGS_DEBUG
+        CMAKE_CXX_FLAGS_MINSIZEREL
+        CMAKE_CXX_FLAGS_RELEASE
+        CMAKE_CXX_FLAGS_RELWITHDEBINFO
+    )
+    if(${MSVC_RUNTIME} STREQUAL "static")
+        message(STATUS
+          "MSVC -> forcing use of statically-linked runtime."
+        )
+        foreach(variable ${variables})
+            if(${variable} MATCHES "/MD")
+                string(REGEX REPLACE "/MD" "/MT" ${variable} "${${variable}}")
+            endif()
+        endforeach()
+    else()
+        message(STATUS
+            "MSVC -> forcing use of dynamically-linked runtime."
+        )
+        foreach(variable ${variables})
+            if(${variable} MATCHES "/MT")
+                string(REGEX REPLACE "/MT" "/MD" ${variable} "${${variable}}")
+            endif()
+        endforeach()
+    endif()
+endif ()
+
 # Allow creating filters for projects in visual studio.
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
+# -- Settings for building civetweb
 # Don't build civetweb tests.
-set(BUILD_TESTING OFF CACHE BOOL "" FORCE)
+set(CIVETWEB_BUILD_TESTING OFF CACHE BOOL "" FORCE)
 set(CIVETWEB_ENABLE_WEBSOCKETS ON CACHE BOOL "" FORCE)
+set(CIVETWEB_ENABLE_SERVER_EXECUTABLE OFF CACHE BOOL "" FORCE)
+set(CIVETWEB_ENABLE_IPV6 ON CACHE BOOL "" FORCE)
 
 # Don't build civetweb with sanitizers
 set(CIVETWEB_ENABLE_ASAN OFF CACHE BOOL "" FORCE)
 
+# Settings for ipv6 parse library
+set(IPV6_PARSE_LIBRARY_ONLY ON CACHE BOOL "" FORCE)
+
 # Don't build protobuf tests.
 set(protobuf_BUILD_TESTS OFF CACHE BOOL "" FORCE)
 set(protobuf_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
@@ -42,27 +95,29 @@ set(SDL_SHARED OFF CACHE BOOL "" FORCE)
 # Run civetwebs cmake.
 add_subdirectory("contrib/civetweb")
 
-# TODO: This generates a cmake warning but we don't 
-# want to include it in the project.
-#set_target_properties(c-executable PROPERTIES FOLDER contrib)
-set_target_properties(c-executable PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1)
-set_target_properties(c-library c-executable PROPERTIES FOLDER contrib)
+# Enable IPv6 in civetweb
+target_compile_options(civetweb-c-library PUBLIC -DUSE_IPV6=1)
 
 # Run protobufs cmake.
 add_subdirectory("contrib/protobuf/cmake")
 
+# Run ipv6-parse cmake.
+add_subdirectory("contrib/ipv6-parse")
+
+set_target_properties(civetweb-c-library PROPERTIES FOLDER contrib)
 set_target_properties(libprotobuf PROPERTIES FOLDER contrib)
 set_target_properties(libprotobuf-lite PROPERTIES FOLDER contrib)
 set_target_properties(libprotoc PROPERTIES FOLDER contrib)
 set_target_properties(protoc PROPERTIES FOLDER contrib)
+set_target_properties(ipv6-parse PROPERTIES FOLDER contrib)
 
-if (WIN32)
+if (MSVC)
     set_target_properties(libprotobuf libprotobuf-lite libprotoc protoc PROPERTIES COMPILE_FLAGS "/W0")
     set_source_files_properties(${libprotobuf_files} PROPERTIES COMPILE_FLAGS "/W0")
     set_source_files_properties(${protobuf_SHARED_OR_STATIC} PROPERTIES COMPILE_FLAGS "/W0")
     set_source_files_properties(${libprotobuf_lite_files} PROPERTIES COMPILE_FLAGS "/W0")
     add_definitions(-D_SCL_SECURE_NO_WARNINGS)
-endif (WIN32)
+endif (MSVC)
 
 # Exclude SDL and related projects to work around linker issue.
 if (NOT APPLE)