OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-24 06:31:03 +00:00
Code Issues Projects Releases Wiki Activity

fixup! Added libcurl submodule and CMake code for building it.

Browse Source
This commit is contained in:
archshift 2015-05-15 16:48:46 -07:00
parent eb2dd8bf5d
commit 4cd226860d
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -190,7 +190,7 @@ find_package(CURL 7.28.0)
if (NOT CURL_FOUND) if (NOT CURL_FOUND)
set(CURL_SOURCE_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/externals/curl") set(CURL_SOURCE_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/externals/curl")
set(CURL_BUILT_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/externals/curl") set(CURL_BUILT_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/externals/curl")
externalproject_add( externalproject_add(curl
PREFIX SOURCE_DIR ${CURL_SOURCE_PREFIX} PREFIX SOURCE_DIR ${CURL_SOURCE_PREFIX}
CMAKE_CACHE_ARGS CMAKE_CACHE_ARGS
-DBUILD_CURL_EXE:string=off -DBUILD_CURL_EXE:string=off
@ -201,7 +201,11 @@ if (NOT CURL_FOUND)
) )
include_directories("${CURL_BUILT_PREFIX}/include") include_directories("${CURL_BUILT_PREFIX}/include")
link_directories("${CURL_BUILT_PREFIX}/lib") link_directories("${CURL_BUILT_PREFIX}/lib")
set(CURL_LIBRARIES "curl") if (NOT MSVC)
set(CURL_LIBRARIES "curl")
else()
set(CURL_LIBRARIES "libcurl_imp")
endif()
else() else()
include_directories(${CURL_INCLUDE_DIRS}) include_directories(${CURL_INCLUDE_DIRS})
endif() endif()

4
appveyor.yml
View File

@ -15,6 +15,10 @@ platform:
configuration: configuration:
- Release - Release
build:
parallel: true
project: build/ALL_BUILD.vcxproj
install: install:
- git submodule update --init --recursive - git submodule update --init --recursive

1
src/core/CMakeLists.txt
View File

@ -220,3 +220,4 @@ set(HEADERS
create_directory_groups(${SRCS} ${HEADERS}) create_directory_groups(${SRCS} ${HEADERS})
add_library(core STATIC ${SRCS} ${HEADERS}) add_library(core STATIC ${SRCS} ${HEADERS})
add_dependencies(core curl)