mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-08-01 05:38:50 +00:00
Merge branch 'master' of https://github.com/dolphin-emu/dolphin into dolphin-emu-master
This commit is contained in:
commit
0a2d2c624b
511 changed files with 74722 additions and 58925 deletions
2
Externals/curl/CMakeLists.txt
vendored
2
Externals/curl/CMakeLists.txt
vendored
|
@ -45,7 +45,7 @@ if(NOT CURL_CA_PATH_SET)
|
|||
endif()
|
||||
endif()
|
||||
|
||||
dolphin_disable_warnings_msvc(curl)
|
||||
dolphin_disable_warnings(curl)
|
||||
target_link_libraries(curl ${CURL_LIBS})
|
||||
target_include_directories(curl PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/curl/include")
|
||||
target_compile_definitions(curl PRIVATE "BUILDING_LIBCURL=1")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue