Compare commits

...

4 Commits

3 changed files with 11 additions and 8 deletions

View File

@ -1,8 +1,8 @@
# Build system for the libimg library for gint
cmake_minimum_required(VERSION 3.16)
project(libimg VERSION 2.2.1 LANGUAGES C)
find_package(Gint 2.2.1 REQUIRED)
cmake_minimum_required(VERSION 3.15)
project(libimg VERSION 2.4.0 LANGUAGES C)
find_package(Gint 2.4.0 REQUIRED)
configure_file(libimg.h libimg.h)
@ -25,8 +25,8 @@ target_include_directories(${NAME} PUBLIC "${CMAKE_CURRENT_BINARY_DIR}")
target_link_libraries(${NAME} Gint::Gint)
install(TARGETS ${NAME}
DESTINATION "${FXSDK_COMPILER_INSTALL}")
DESTINATION "${FXSDK_LIB}")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libimg.h"
DESTINATION "${FXSDK_COMPILER_INSTALL}/include")
DESTINATION "${FXSDK_INCLUDE}")
install(FILES cmake/FindLibImg.cmake
DESTINATION "${FXSDK_CMAKE_MODULE_PATH}")

View File

@ -1,7 +1,9 @@
include(FindSimpleLibrary)
include(FindPackageHandleStandardArgs)
find_simple_library("libimg-${FXSDK_PLATFORM}.a" include/libimg.h
find_package(Gint 2.2.1 REQUIRED)
find_simple_library("libimg-${FXSDK_PLATFORM}.a" libimg.h
"IMG_VERSION" PATH_VAR IMG_PATH VERSION_VAR IMG_VERSION)
find_package_handle_standard_args(LibImg
@ -12,5 +14,6 @@ if(LibImg_FOUND)
add_library(LibImg::LibImg UNKNOWN IMPORTED)
set_target_properties(LibImg::LibImg PROPERTIES
IMPORTED_LOCATION "${IMG_PATH}"
INTERFACE_LINK_OPTIONS -limg-${FXSDK_PLATFORM})
INTERFACE_LINK_OPTIONS -limg-${FXSDK_PLATFORM}
INTERFACE_LINK_LIBRARIES Gint::Gint)
endif()

View File

@ -77,7 +77,7 @@ void img_render_vram_gray(img_t img, int x, int y)
for(int dy = 0; dy < img.height; dy++, px += img.stride)
for(int dx = 0; dx < img.width; dx++)
{
gpixel(x+dx, y+dy, px[dx]);
dpixel(x+dx, y+dy, px[dx]);
}
}
#endif /* FX9860G */