Skip to content

Commit

Permalink
revert to older build config on windows to test fixing issue #1
Browse files Browse the repository at this point in the history
Signed-off-by: ArchieMeng <[email protected]>
  • Loading branch information
ArchieMeng committed May 17, 2021
1 parent 664bb48 commit 6c84631
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ jobs:
with:
tag_name: ${{ needs.setup.outputs.VERSION }}
release_name: Release ${{ needs.setup.outputs.VERSION }}
draft: false
draft: true
prerelease: false

- name: upload-ubuntu
Expand Down
Binary file removed images/outx.png
Binary file not shown.
6 changes: 3 additions & 3 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
project(rife-ncnn-vulkan-python)

# Python
if (${CMAKE_VERSION} VERSION_LESS "3.15")
find_package(Python REQUIRED)
if (${CMAKE_VERSION} VERSION_LESS "3.15" OR ${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
find_package(PythonLibs REQUIRED)
else()
find_package(Python REQUIRED COMPONENTS Development)
endif()
Expand Down Expand Up @@ -293,7 +293,7 @@ swig_add_library(rife_ncnn_vulkan_wrapper LANGUAGE python SOURCES rife.i rife.cp
add_dependencies(rife_ncnn_vulkan_wrapper generate-spirv)
target_compile_options(rife_ncnn_vulkan_wrapper PUBLIC -fexceptions)

if (${CMAKE_VERSION} VERSION_LESS "3.15")
if (${CMAKE_VERSION} VERSION_LESS "3.15" OR ${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
include_directories(${PYTHON_INCLUDE_DIRS})
target_link_libraries(rife_ncnn_vulkan_wrapper ${RIFE_LINK_LIBRARIES} ${PYTHON_LIBRARIES})
else()
Expand Down

0 comments on commit 6c84631

Please sign in to comment.