Merge pull request #1488 from Tilka/llvm_stdint_defines

Work around LLVM header peculiarity

CMakeLists.txt

@@ -764,6 +764,11 @@ add_custom_command(TARGET unittests POST_BUILD COMMAND ${CMAKE_CTEST_COMMAND})
 # Start compiling our code
 #
 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)
 
 

Source/Core/VideoCommon/CMakeLists.txt

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