Link/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

match build dependencies

Browse Source
This commit is contained in:
Tom Atkinson 2024-03-11 01:12:45 +00:00
parent c8a87b01aa
commit 132106c11a
2 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
.github/workflows/linux.yml vendored
View File

@ -72,47 +72,31 @@ jobs:
if: ${{ !startsWith(matrix.os, 'windows') }} if: ${{ !startsWith(matrix.os, 'windows') }}
id: find_artifacts id: find_artifacts
run: | run: |
echo PROFILER_PATH=build/profiler/Tracy >> $GITHUB_OUTPUT mkdir bin
echo UPDATE_PATH=build/update/update >> $GITHUB_OUTPUT cp build/profiler/Tracy bin
echo CAPTURE_PATH=build/capture/capture >> $GITHUB_OUTPUT cp build/update/update bin
echo CSVEXPORT_PATH=build/csvexport/csvexport >> $GITHUB_OUTPUT cp build/capture/capture bin
echo IMPORT_CHROME_PATH=build/import-chrome/import-chrome >> $GITHUB_OUTPUT cp build/csvexport/csvexport bin
echo IMPORT_FUCHSIA_PATH=build/import-fuchsia/import-fuchsia >> $GITHUB_OUTPUT cp build/import-chrome/import-chrome bin
cp build/import-fuchsia/import-fuchsia bin
zip -r ${{ matrix.os }}.zip bin
- name: Find Artifacts Windows - name: Find Artifacts Windows
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
id: find_artifacts_windows id: find_artifacts_windows
run: | run: |
echo PROFILER_PATH=build/profiler/Release/Tracy.exe >> $GITHUB_OUTPUT mkdir bin
echo UPDATE_PATH=build/update/Release/update.exe >> $GITHUB_OUTPUT copy build\profiler\Release\Tracy.exe bin
echo CAPTURE_PATH=build/capture/Release/capture.exe >> $GITHUB_OUTPUT copy build\update\Release\update.exe bin
echo CSVEXPORT_PATH=build/csvexport/Release/csvexport.exe >> $GITHUB_OUTPUT copy build\capture\Release\capture.exe bin
echo IMPORT_CHROME_PATH=build/import-chrome/Release/import-chrome.exe >> $GITHUB_OUTPUT copy build\csvexport\Release\csvexport.exe bin
echo IMPORT_FUCHSIA_PATH=build/import-fuchsia/Release/import-fuchsia.exe >> $GITHUB_OUTPUT copy build\import-chrome\Release\import-chrome.exe bin
copy build\import-fuchsia\Release\import-fuchsia.exe bin
Compress-Archive -Path bin/* -Destination ${{ matrix.os }}.zip
- name: Export Artifacts - name: Export Artifacts
if: ${{ !startsWith(matrix.os, 'windows') }}
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: ${{ matrix.os }} name: ${{ matrix.os }}
path: | path: |
${{ steps.find_artifacts.outputs.PROFILER_PATH }} ${{ matrix.os }}.zip
${{ steps.find_artifacts.outputs.UPDATE_PATH }}
${{ steps.find_artifacts.outputs.CAPTURE_PATH }}
${{ steps.find_artifacts.outputs.CSVEXPORT_PATH }}
${{ steps.find_artifacts.outputs.IMPORT_CHROME_PATH }}
${{ steps.find_artifacts.outputs.IMPORT_FUCHSIA_PATH }}
- name: Export Artifacts Windows
if: startsWith(matrix.os, 'windows')
uses: actions/upload-artifact@v2
with:
name: ${{ matrix.os }}
path: |
${{ steps.find_artifacts_windows.outputs.PROFILER_PATH }}
${{ steps.find_artifacts_windows.outputs.UPDATE_PATH }}
${{ steps.find_artifacts_windows.outputs.CAPTURE_PATH }}
${{ steps.find_artifacts_windows.outputs.CSVEXPORT_PATH }}
${{ steps.find_artifacts_windows.outputs.IMPORT_CHROME_PATH }}
${{ steps.find_artifacts_windows.outputs.IMPORT_FUCHSIA_PATH }}

7
cmake/server.cmake
View File

@ -101,7 +101,12 @@ endif()
add_library(TracyServer STATIC ${SOURCES}) add_library(TracyServer STATIC ${SOURCES})
target_include_directories(TracyServer PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../server) target_include_directories(TracyServer PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../server)
target_link_libraries(TracyServer PUBLIC TracyImGui TracyCapstone TracyZstd TracyClient)
if (TRACY_NO_STATISTICS)
target_link_libraries(TracyServer PUBLIC TracyCapstone TracyZstd TracyClient)
else()
target_link_libraries(TracyServer PUBLIC TracyImGui TracyCapstone TracyZstd TracyClient)
endif()
target_compile_definitions(TracyServer PUBLIC NOMINMAX) # Windows.h defines min and max macros which conflict with std::min and std::max target_compile_definitions(TracyServer PUBLIC NOMINMAX) # Windows.h defines min and max macros which conflict with std::min and std::max