Merge pull request #437 from tmayoff/meson_fix

Meson fix
This commit is contained in:
Bartosz Taudul 2022-07-29 11:18:01 +02:00 committed by GitHub
commit 7b35d88716
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -92,62 +92,62 @@ endif
threads_dep = dependency('threads') threads_dep = dependency('threads')
includes = [ includes = [
'TracyC.h', 'public/tracy/TracyC.h',
'Tracy.hpp', 'public/tracy/Tracy.hpp',
'TracyD3D11.hpp', 'public/tracy/TracyD3D11.hpp',
'TracyD3D12.hpp', 'public/tracy/TracyD3D12.hpp',
'TracyLua.hpp', 'public/tracy/TracyLua.hpp',
'TracyOpenCL.hpp', 'public/tracy/TracyOpenCL.hpp',
'TracyOpenGL.hpp', 'public/tracy/TracyOpenGL.hpp',
'TracyVulkan.hpp' 'public/tracy/TracyVulkan.hpp'
] ]
client_includes = [ client_includes = [
'client/tracy_concurrentqueue.h', 'public/client/tracy_concurrentqueue.h',
'client/tracy_rpmalloc.hpp', 'public/client/tracy_rpmalloc.hpp',
'client/tracy_SPSCQueue.h', 'public/client/tracy_SPSCQueue.h',
'client/TracyArmCpuTable.hpp', 'public/client/TracyArmCpuTable.hpp',
'client/TracyCallstack.h', 'public/client/TracyCallstack.h',
'client/TracyCallstack.hpp', 'public/client/TracyCallstack.hpp',
'client/TracyDebug.hpp', 'public/client/TracyDebug.hpp',
'client/TracyDxt1.hpp', 'public/client/TracyDxt1.hpp',
'client/TracyFastVector.hpp', 'public/client/TracyFastVector.hpp',
'client/TracyLock.hpp', 'public/client/TracyLock.hpp',
'client/TracyProfiler.hpp', 'public/client/TracyProfiler.hpp',
'client/TracyRingBuffer.hpp', 'public/client/TracyRingBuffer.hpp',
'client/TracyScoped.hpp', 'public/client/TracyScoped.hpp',
'client/TracyStringHelpers.hpp', 'public/client/TracyStringHelpers.hpp',
'client/TracySysTime.hpp', 'public/client/TracySysTime.hpp',
'client/TracySysTrace.hpp', 'public/client/TracySysTrace.hpp',
'client/TracyThread.hpp' 'public/client/TracyThread.hpp'
] ]
common_includes = [ common_includes = [
'common/tracy_lz4.hpp', 'public/common/tracy_lz4.hpp',
'common/tracy_lz4hc.hpp', 'public/common/tracy_lz4hc.hpp',
'common/TracyAlign.hpp', 'public/common/TracyAlign.hpp',
'common/TracyAlign.hpp', 'public/common/TracyAlign.hpp',
'common/TracyAlloc.hpp', 'public/common/TracyAlloc.hpp',
'common/TracyApi.h', 'public/common/TracyApi.h',
'common/TracyColor.hpp', 'public/common/TracyColor.hpp',
'common/TracyForceInline.hpp', 'public/common/TracyForceInline.hpp',
'common/TracyMutex.hpp', 'public/common/TracyMutex.hpp',
'common/TracyProtocol.hpp', 'public/common/TracyProtocol.hpp',
'common/TracyQueue.hpp', 'public/common/TracyQueue.hpp',
'common/TracySocket.hpp', 'public/common/TracySocket.hpp',
'common/TracyStackFrames.hpp', 'public/common/TracyStackFrames.hpp',
'common/TracySystem.hpp', 'public/common/TracySystem.hpp',
'common/TracyUwp.hpp', 'public/common/TracyUwp.hpp',
'common/TracyYield.hpp' 'public/common/TracyYield.hpp'
] ]
tracy_header_files = common_includes + client_includes + includes tracy_header_files = common_includes + client_includes + includes
tracy_src = [ tracy_src = [
'TracyClient.cpp' 'public/TracyClient.cpp'
] ]
tracy_public_include_dirs = include_directories('.') tracy_public_include_dirs = include_directories('public')
compiler = meson.get_compiler('cpp') compiler = meson.get_compiler('cpp')
override_options = [] override_options = []