Merge branch 'linux' of https://github.com/q4a/xray-16 into linux

Author: q4a

.travis.yml

@@ -22,11 +22,11 @@ addons:
     - ubuntu-toolchain-r-test
     packages:
     - g++-7
-branches:
-  only:
-  - linux
-  - xd_dev
-  - "/^v\\d+\\./"
+#branches:
+#  only:
+#  - linux
+#  - xd_dev
+#  - "/^v\\d+\\./"
 notifications:
   email: false
 env:

Externals/libogg

@@ -2,6 +2,7 @@ TITLE: X-Ray 1.6 build and setup on Linux
 
 Required packages:
 ------
+TBB
 Crypto++
 pugixml
 Theora
@@ -12,7 +13,7 @@ JPEG
 
 
 Ubuntu 18.04 build dependencies:
-sudo apt install git cmake libcrypto++-dev libpugixml-dev libogg-dev libtheora-dev libvorbis-dev libsdl2-dev liblzo2-dev libjpeg-dev libncurses5-dev
+sudo apt install git cmake libtbb-dev libcrypto++-dev libpugixml-dev libogg-dev libtheora-dev libvorbis-dev libsdl2-dev liblzo2-dev libjpeg-dev libncurses5-dev
 
 Build commands:
 ------

Externals/libtheora

@@ -11,6 +11,7 @@ the src\Externals directory.
 Windows SDK is available from Visual Studio 2017 installer. You will definitely need to install the following items:
 * Windows 8.1 SDK (or newer)
 * Visual C++ MFC for x86 and x64
+* C++/CLI support
 * NuGet package manager
 
 You will need following extension to save files in Visual Studio with encoding UTF-8 without BOM:

Externals/libvorbis

@@ -22,7 +22,7 @@ add_definitions(-DXRCORE_EXPORTS)
 add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
-#Заглушки, пока не починю find_package
+#this is a temporary solution until find_package will not be fixed
 set(CRYPTO_LIBRARY crypto++)
 set(PUGIXML_LIBRARY pugixml)
 set(TBB_LIBRARIES tbb tbbmalloc_proxy tbbmalloc)

Externals/pugixml

@@ -11,7 +11,7 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
 	)
 
-#list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/tri-colliderKNoOPC/dcTriListCollider.cpp")
+#list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/tri-colliderknoopc/dcTriListCollider.cpp")
 #list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_cda.h")
 
 add_definitions(-DXRNETSERVER_EXPORTS)