ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix VTune static library dependencies 

Since libcommon.a is also the last library to be linked, this has the
totally hacky but useful side-effect that it doesn't require people to
modify CMake files for temporarily adding VTune code to other Dolphin
libraries.
This commit is contained in:
Tillmann Karras 2015-02-22 20:49:30 +01:00
parent 03ffab4249
commit 387777ed72
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -348,8 +348,10 @@ if(VTUNE)
endif() endif()
add_definitions(-DUSE_VTUNE) add_definitions(-DUSE_VTUNE)
include_directories("${VTUNE_DIR}/include") include_directories("${VTUNE_DIR}/include")
list(APPEND LIBS "${VTUNE_DIR}/lib64/libjitprofiling.a") set(VTUNE_LIBRARIES
list(APPEND LIBS "${VTUNE_DIR}/lib64/libittnotify.a") "${VTUNE_DIR}/lib64/libjitprofiling.a"
"${VTUNE_DIR}/lib64/libittnotify.a"
)
endif(VTUNE) endif(VTUNE)
if(ANDROID) if(ANDROID)

2
Source/Core/Common/CMakeLists.txt
View File

@ -60,7 +60,7 @@ if(WIN32)
set(SRCS ${SRCS} ExtendedTrace.cpp) set(SRCS ${SRCS} ExtendedTrace.cpp)
endif(WIN32) endif(WIN32)
set(LIBS "${CMAKE_THREAD_LIBS_INIT}") set(LIBS "${CMAKE_THREAD_LIBS_INIT}" ${VTUNE_LIBRARIES})
if(NOT APPLE AND NOT ANDROID) if(NOT APPLE AND NOT ANDROID)
set(LIBS ${LIBS} rt) set(LIBS ${LIBS} rt)
endif() endif()