test/Cdroid
1
0
Fork 0
mirror of https://gitee.com/houstudio/Cdroid.git synced 2024-11-30 11:18:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix sigma/graph_gfx.c FindCURL

Browse Source
This commit is contained in:
houzh 2023-07-03 16:58:22 +08:00
parent 3bbd08e58a
commit e2ce38e0d0
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/curldownload/CMakeLists.txt
View File

@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.8)
project(curldownload C CXX)
set(CMAKE_CXX_STANDARD 11)
find_package(CURL REQUIRED)
find_package(CURL)
include_directories(
./
${CDROID_INCLUDE_DIRS}
@ -19,12 +19,10 @@ aux_source_directory(./ CURLDLD_SRCS)
add_definitions(--include cdtypes.h)
add_definitions(--include cdlog.h)
link_directories(${CMAKE_BINARY_DIR}/lib)
add_executable(curldownload ${CURLDLD_SRCS})
#CreatePAK(w9 ${PROJECT_SOURCE_DIR}/assets ${PROJECT_BINARY_DIR}/w9.pak ${PROJECT_SOURCE_DIR}/R.h)
message("CDROID_LIBRARIES=${CDROID_LIBRARIES} CDROID_INCLUDE_DIRS=${CDROID_INCLUDE_DIRS}")
target_link_libraries(curldownload PRIVATE cdroid ${CURL_LIBRARIES})
install(TARGETS curldownload DESTINATION bin)
if(CURL_DOUND)
add_executable(curldownload ${CURLDLD_SRCS})
target_link_libraries(curldownload PRIVATE cdroid ${CURL_LIBRARIES})
install(TARGETS curldownload DESTINATION bin)
endif()

2
cmake/modules/FindCURL.cmake
View File

@ -39,5 +39,5 @@ if (CURL_FOUND)
mark_as_advanced(CURL_INCLUDE_DIR CURL_INCLUDE_DIRS CURL_LIBRARY CURL_LIBRARIES)
message(STATUS "Found CURL header files in ${CURL_INCLUDE_DIRS} ver=${CURL_VERSION}")
else ()
message(FATAL_ERROR "Could not find CURL")
message("Could not find CURL")
endif ()

2
src/porting/sigma/graph_gfx.c
View File

@ -303,7 +303,7 @@ INT GFXBlit(HANDLE dstsurface,int dx,int dy,HANDLE srcsurface,const GFXRect*srcr
if(dx<0){ rs.x-=dx; rs.w = (int)rs.w+dx; dx = 0;}
if(dy<0){ rs.y-=dy; rs.h = (int)rs.h+dy; dy = 0;}
if(dx + rs.w > ndst->width - screenMargin.x - screenMargin.w)
rs.w = ndst->width -s creenMargin.x - screenMargin.w - dx;
rs.w = ndst->width -screenMargin.x - screenMargin.w - dx;
if(dy + rs.h > ndst->height - screenMargin.y- screenMargin.h)
rs.h = ndst->height - screenMargin.y - screenMargin.h - dy;

2
src/porting/sigma/mediaplayer.c
View File

@ -87,7 +87,7 @@ DWORD MPSetWindow(HANDLE handle,int x,int y,int width,int height){
return 0;
}
int MPRotate(HANDLE handle, int type) {
DWORD MPRotate(HANDLE handle, int type) {
MP_PLAYER *mp =(MP_PLAYER*)handle;
GFXRect *r = &mp->viewPort;