mirror of
https://github.com/wolfpld/tracy.git
synced 2024-11-10 10:41:50 +00:00
Merge pull request #56 from nagisa/nagisa/fix-macos-build
Fix build on macos
This commit is contained in:
commit
b353eb753b
26
.github/workflows/gcc.yml
vendored
26
.github/workflows/gcc.yml
vendored
@ -9,22 +9,30 @@ on:
|
||||
jobs:
|
||||
build:
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ${{ matrix.os }}
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-latest, macOS-latest]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Install libraries
|
||||
- name: Install linux libraries
|
||||
if: ${{ matrix.os == 'ubuntu-latest' }}
|
||||
run: sudo apt-get update && sudo apt-get -y install libglfw3-dev libgtk2.0-dev libcapstone-dev
|
||||
- name: Install macos libraries
|
||||
if: ${{ matrix.os == 'macOS-latest' }}
|
||||
run: brew install capstone tbb pkg-config glfw
|
||||
- name: Profiler GUI
|
||||
run: make -C profiler/build/unix debug release
|
||||
run: make -j -C profiler/build/unix debug release
|
||||
- name: Update utility
|
||||
run: make -C update/build/unix debug release
|
||||
run: make -j -C update/build/unix debug release
|
||||
- name: Capture utility
|
||||
run: make -C capture/build/unix debug release
|
||||
run: make -j -C capture/build/unix debug release
|
||||
- name: Library
|
||||
run: make -C library/unix debug release
|
||||
run: make -j -C library/unix debug release
|
||||
- name: Test application
|
||||
run: |
|
||||
make -C test
|
||||
make -C test clean
|
||||
make -C test TRACYFLAGS=-DTRACY_ON_DEMAND
|
||||
make -j -C test
|
||||
make -j -C test clean
|
||||
make -j -C test TRACYFLAGS=-DTRACY_ON_DEMAND
|
||||
|
@ -3079,7 +3079,13 @@ TRACY_API uint64_t ___tracy_alloc_srcloc_name( uint32_t line, const char* source
|
||||
// initialized every time a thread is created. As thus, expose to the C API users a simple API to
|
||||
// call every time they create a thread. Here we can then put all sorts of per-thread
|
||||
// initialization.
|
||||
TRACY_API void ___tracy_init_thread(void) { (void)tracy::s_rpmalloc_thread_init; }
|
||||
TRACY_API void ___tracy_init_thread(void) {
|
||||
#ifdef TRACY_DELAYED_INIT
|
||||
(void)tracy::GetProfilerThreadData();
|
||||
#else
|
||||
(void)tracy::s_rpmalloc_thread_init;
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
@ -16,6 +16,8 @@
|
||||
|
||||
#ifdef __CYGWIN__
|
||||
# define ftello64(x) ftello(x)
|
||||
#elif defined __APPLE__
|
||||
# define ftello64(x) ftello(x)
|
||||
#elif defined _WIN32
|
||||
# define ftello64(x) _ftelli64(x)
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user