Skip to content

Commit cd5f2da

Browse files
committed
feat: отделил pngutils
1 parent 9c53299 commit cd5f2da

File tree

9 files changed

+11
-222
lines changed

9 files changed

+11
-222
lines changed

CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ cmake_minimum_required(VERSION 3.5) # Проверка версии CMake.
44

55
project(luaort C) # Название проекта
66

7+
add_library(luaort SHARED src/ort.c)
8+
79
find_package(Lua REQUIRED)
8-
find_package(PNG REQUIRED)
910

10-
add_library(luaort SHARED src/ort.c)
11-
target_include_directories(luaort PRIVATE ${ORT_INCLUDE_DIR})
1211
target_link_directories(luaort PRIVATE ${ORT_DIR})
12+
target_include_directories(luaort PRIVATE ${ORT_INCLUDE_DIR})
1313
target_link_libraries(luaort PRIVATE lua onnxruntime)
1414

15-
add_library(pngutils SHARED src/pngutils.c)
16-
target_link_libraries(pngutils PRIVATE lua PNG::PNG)
17-
18-
add_test(NAME ORTInference COMMAND lua test.lua)
15+
install(TARGETS luaort
16+
RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}
17+
LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}
18+
ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX})

lua/test.lua

Lines changed: 0 additions & 33 deletions
This file was deleted.
File renamed without changes.

meta/pngutils.lua

Lines changed: 0 additions & 34 deletions
This file was deleted.

rocks/pngutils-dev-1.rockspec

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/ort.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,9 @@ ORT_RUNTIME_CLASS(PrepackedWeightsContainer);
447447
ORT_RUNTIME_CLASS(TensorRTProviderOptionsV2);
448448
*/
449449

450-
450+
#if defined(_WIN32) || defined(_WIN64)
451+
__declspec(dllexport)
452+
#endif
451453
int luaopen_luaort(lua_State *L) {
452454
g_ort = OrtGetApiBase()->GetApi(ORT_API_VERSION);
453455
if (!g_ort) {

src/pngutils.c

Lines changed: 0 additions & 107 deletions
This file was deleted.

vcpkg-configuration.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

vcpkg.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"dependencies": [
3-
"lua",
4-
"libpng"
3+
"lua"
54
]
65
}

0 commit comments

Comments
 (0)