Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Curl Update to 7.69.1 #728

Merged
merged 7 commits into from
May 13, 2020
Merged

Curl Update to 7.69.1 #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
99b200f
Remove old curl
jameskr97 Apr 5, 2020
bb27488
Squashed 'extern/curl/' content from commit 509c2c2ac0
jameskr97 Apr 5, 2020
08317b5
Merge commit 'bb274885165433600514f4c4a9564b3c33b284e7' as 'extern/curl'
jameskr97 Apr 5, 2020
6ff52bc
Build and link curl to Etterna.
jameskr97 Apr 5, 2020
2bc1a80
Comment out line possibly breaking travis
jameskr97 May 13, 2020
e6269a0
Merge branch 'develop' into feature/curl-7.69.1
nico-abram May 13, 2020
df974e5
Other possible curl travis fix
jameskr97 May 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 2 additions & 4 deletions CMake/Helpers/CMakeWindows.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ set_target_properties(Etterna PROPERTIES COMPILE_DEFINITIONS "${cdefs}")
target_compile_options(Etterna PRIVATE /W3)

# Linking - Windows Only
target_link_libraries(Etterna curl)
target_link_libraries(Etterna libcurl)
target_link_libraries(Etterna ffmpeg)

find_package(DirectX REQUIRED)
Expand All @@ -51,14 +51,12 @@ list(APPEND WIN_DLLS
"${PROJECT_SOURCE_DIR}/extern/ffmpeg/windows/${ARCH}/avcodec-55.dll"
"${PROJECT_SOURCE_DIR}/extern/ffmpeg/windows/${ARCH}/avformat-55.dll"
"${PROJECT_SOURCE_DIR}/extern/ffmpeg/windows/${ARCH}/avutil-52.dll"
"${PROJECT_SOURCE_DIR}/extern/ffmpeg/windows/${ARCH}/swscale-2.dll"
"${PROJECT_SOURCE_DIR}/extern/libcurl/windows/${ARCH}/libcurl.dll")
"${PROJECT_SOURCE_DIR}/extern/ffmpeg/windows/${ARCH}/swscale-2.dll")

if(ARCH STREQUAL "32bit")
list(APPEND WIN_DLLS "${OPENSSL_ROOT_DIR}/libssl-1_1.dll" "${OPENSSL_ROOT_DIR}/libcrypto-1_1.dll") # SSL
else() # 64bit
list(APPEND WIN_DLLS "${OPENSSL_ROOT_DIR}/libssl-1_1-x64.dll" "${OPENSSL_ROOT_DIR}/libcrypto-1_1-x64.dll") # SSL
list(APPEND WIN_DLLS "${PROJECT_SOURCE_DIR}/extern/libcurl/windows/${ARCH}/libcurl.dll") # CURL
endif()

foreach(dll ${WIN_DLLS})
Expand Down
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ set(SQLITECPP_RUN_CPPLINT OFF CACHE BOOL "" FORCE) # Disable SQLiteCpp linting
set(CLANG_FORMAT_CMD OFF CACHE BOOL "" FORCE) # Disable discord clang-format
set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) # Disable discord examples
set(USE_STATIC_CRT ON CACHE BOOL "" FORCE) # Have discord-rpc link statically
set(BUILD_TESTING OFF CACHE BOOL "" FORCE) # Disable libuv testing
if(WIN32)
set(CURL_STATIC_CRT ON CACHE BOOL "" FORCE) # Have curl link statically - Windows only option
endif()

## CMake related variables
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/CMake/Modules) # Tell CMake where to access FindXXX.cmake files
Expand Down
2 changes: 1 addition & 1 deletion extern/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ add_subdirectory(glew-1.5.8)
add_subdirectory(pcre)
add_subdirectory(stb)
add_subdirectory(zlib)
add_subdirectory(libcurl)
add_subdirectory(curl)
add_subdirectory(mad-0.15.1b)
add_subdirectory(newogg)
add_subdirectory(newvorbis)
Expand Down
Loading