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

Merge pull request #1488 from Tilka/llvm_stdint_defines 

Work around LLVM header peculiarity
This commit is contained in:
skidau 2014-11-06 14:31:10 +11:00
parent e2c5573bc9 c34d99e40e
commit d1950c1920
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -764,6 +764,11 @@ add_custom_command(TARGET unittests POST_BUILD COMMAND ${CMAKE_CTEST_COMMAND})
# Start compiling our code # Start compiling our code
# #
add_definitions(-std=gnu++0x) add_definitions(-std=gnu++0x)
# These aren't actually needed for C11/C++11
# but some dependencies require them (LLVM, libav).
add_definitions(-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS)
add_subdirectory(Source) add_subdirectory(Source)

1
Source/Core/VideoCommon/CMakeLists.txt
View File

@ -59,6 +59,5 @@ add_dolphin_library(videocommon "${SRCS}" "${LIBS}")
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
if(LIBAV_FOUND) if(LIBAV_FOUND)
target_link_libraries(videocommon ${LIBS} ${LIBAV_LIBRARIES}) target_link_libraries(videocommon ${LIBS} ${LIBAV_LIBRARIES})
add_definitions(-D__STDC_CONSTANT_MACROS)
endif() endif()
endif() endif()