From 57184963ec94bd54431e99c4e98ed54013fd31e5 Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Sun, 7 Aug 2022 08:02:36 -0400 Subject: [PATCH] Simplified a little bit --- meson.build | 77 +++++++------------------------------------- meson_options.txt | 3 +- profiler/meson.build | 14 +++++--- server/meson.build | 3 +- 4 files changed, 25 insertions(+), 72 deletions(-) diff --git a/meson.build b/meson.build index ec8faaac..58273d8f 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('tracy', ['cpp', 'c']) +project('tracy', ['cpp', 'c'], default_options: 'cpp_std=c++17') if get_option('tracy_enable') add_project_arguments('-DTRACY_ENABLE', language : 'cpp') @@ -91,74 +91,21 @@ endif if get_option('tracy_use_wayland') add_project_arguments('-DDISPLAY_SERVER_WAYLAND', language: 'cpp') -else + add_project_arguments('-DGLFW_EXPOSE_NATIVE_WAYLAND', language: 'cpp') +else add_project_arguments('-DDISPLAY_SERVER_X11', language: 'cpp') endif -if not get_option('tracy_gtk_fileselector') - if get_option('tracy_no_fileselector') - add_project_arguments('-DTRACY_NO_FILESELECTOR', language: 'cpp') - endif +if get_option('tracy_fileselector') == 'none' + add_project_arguments('-DTRACY_NO_FILESELECTOR', language: 'cpp') endif - + threads_dep = dependency('threads') -includes = [ - 'public/tracy/TracyC.h', - 'public/tracy/Tracy.hpp', - 'public/tracy/TracyD3D11.hpp', - 'public/tracy/TracyD3D12.hpp', - 'public/tracy/TracyLua.hpp', - 'public/tracy/TracyOpenCL.hpp', - 'public/tracy/TracyOpenGL.hpp', - 'public/tracy/TracyVulkan.hpp' -] - -client_includes = files( - 'public/client/tracy_concurrentqueue.h', - 'public/client/tracy_rpmalloc.hpp', - 'public/client/tracy_SPSCQueue.h', - 'public/client/TracyArmCpuTable.hpp', - 'public/client/TracyCallstack.h', - 'public/client/TracyCallstack.hpp', - 'public/client/TracyDebug.hpp', - 'public/client/TracyDxt1.hpp', - 'public/client/TracyFastVector.hpp', - 'public/client/TracyLock.hpp', - 'public/client/TracyProfiler.hpp', - 'public/client/TracyRingBuffer.hpp', - 'public/client/TracyScoped.hpp', - 'public/client/TracyStringHelpers.hpp', - 'public/client/TracySysTime.hpp', - 'public/client/TracySysTrace.hpp', - 'public/client/TracyThread.hpp' -) - -common_includes = [ - 'public/common/tracy_lz4.hpp', - 'public/common/tracy_lz4hc.hpp', - 'public/common/TracyAlign.hpp', - 'public/common/TracyAlign.hpp', - 'public/common/TracyAlloc.hpp', - 'public/common/TracyApi.h', - 'public/common/TracyColor.hpp', - 'public/common/TracyForceInline.hpp', - 'public/common/TracyMutex.hpp', - 'public/common/TracyProtocol.hpp', - 'public/common/TracyQueue.hpp', - 'public/common/TracySocket.hpp', - 'public/common/TracyStackFrames.hpp', - 'public/common/TracySystem.hpp', - 'public/common/TracyUwp.hpp', - 'public/common/TracyYield.hpp' -] - -tracy_header_files = common_includes + client_includes + includes +# tracy_header_files = common_includes + client_includes + includes tracy_src = [ 'public/TracyClient.cpp', - 'public/common/tracy_lz4.cpp', - 'public/common/tracy_lz4hc.cpp' ] tracy_public_include_dirs = include_directories('public') @@ -170,22 +117,22 @@ if compiler.get_id() != 'msvc' endif if tracy_shared_libs - tracy = shared_library('tracy', tracy_src, tracy_header_files, + tracy = shared_library('tracy', tracy_src, dependencies : [ threads_dep ], include_directories : tracy_public_include_dirs, override_options : override_options, install : true) else - tracy = static_library('tracy', tracy_src, tracy_header_files, + tracy = static_library('tracy', tracy_src, dependencies : [ threads_dep ], include_directories : tracy_public_include_dirs, override_options : override_options, install : true) endif -install_headers(includes) -install_headers(common_includes, subdir : 'common') -install_headers(client_includes, subdir : 'client') +# install_headers(includes) +# install_headers(common_includes, subdir : 'common') +# install_headers(client_includes, subdir : 'client') tracy_dep_compile_args = [] diff --git a/meson_options.txt b/meson_options.txt index 48027bb4..f8061e88 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -22,5 +22,4 @@ option('tracy_shared_libs', type : 'boolean', value : false, description : 'Buil option('tracy_no_crash_handler', type : 'boolean', value : false, description : 'Disable crash handling') option('tracy_use_wayland', type : 'boolean', value : false, description : 'Profiler: Set the Display Server on linux to wayland') -option('tracy_no_fileselector', type : 'boolean', value : true, description : 'Profiler: Disable fileselector') -option('tracy_gtk_fileselector', type : 'boolean', value : false, description : 'Profiler: Set the fileselector to native GTK') +option('tracy_fileselector', type : 'combo', choices : ['none', 'gtk'], value : 'none', description : 'Profiler: Choose fileselector') diff --git a/profiler/meson.build b/profiler/meson.build index f189f1b1..0c9d5cdc 100644 --- a/profiler/meson.build +++ b/profiler/meson.build @@ -12,12 +12,18 @@ profiler_sources = files( 'src/imgui/imgui_impl_glfw.cpp', 'src/imgui/imgui_impl_opengl3.cpp') -if get_option('tracy_gtk_fileselector') +glfw = dependency('glfw3') +deps = [glfw, threads_dep, server_dep, tracy_dep, zstd_dep] + +if get_option('tracy_fileselector') == 'gtk' profiler_sources += files('../nfd/nfd_gtk.cpp') + deps += dependency('gtk+-3.0') +endif + +if get_option('tracy_use_wayland') + deps += dependency('wayland-client') endif profiler_inc = include_directories('src', 'src/imgui') -glfw = dependency('glfw3') - -executable('profiler', profiler_sources, include_directories: profiler_inc, dependencies: [glfw, threads_dep, server_dep, tracy_dep, zstd_dep]) \ No newline at end of file +executable('profiler', profiler_sources, include_directories: profiler_inc, dependencies: deps, cpp_args: '-UTRACY_ENABLE') \ No newline at end of file diff --git a/server/meson.build b/server/meson.build index fee42cd2..a31bd662 100644 --- a/server/meson.build +++ b/server/meson.build @@ -1,4 +1,5 @@ server_sources = files( + '../public/common/tracy_lz4hc.cpp', 'TracyBadVersion.cpp', 'TracyColor.cpp', # 'TracyEventDebug.cpp', @@ -52,5 +53,5 @@ server_sources = files( capstone = dependency('capstone') deps = [imgui_dep, capstone, tracy_dep] -server_lib = static_library('tracy_server', server_sources, dependencies: deps) +server_lib = static_library('tracy_server', server_sources, dependencies: deps, cpp_args: '-UTRACY_ENABLE') server_dep = declare_dependency(dependencies: deps, link_with: server_lib) \ No newline at end of file