Merge branch 'testing' into clang-profile-build

This commit is contained in:
DarthArgus
2016-12-09 04:09:01 +00:00
20 changed files with 93 additions and 110 deletions
@@ -42,8 +42,6 @@ else()
)
endif()
add_compile_options(-fprofile-instr-use=${PROJECT_SOURCE_DIR}/src/linux/PlanetServer.profdata)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/shared
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedCommandParser/include/public