Skip to content

Fix the linux compilation (both x86 and aarch64) #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pdapandapda wants to merge 1 commit into
base: main
Choose a base branch
from
+33 −17
Open

Fix the linux compilation (both x86 and aarch64) #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.8)
cmake_minimum_required (VERSION 3.8)

project ("cpymo")

Expand All @@ -12,8 +12,12 @@ add_definitions (-DENABLE_TEXT_EXTRACT_COPY_TO_CLIPBOARD)
add_definitions (-DENABLE_EXIT_CONFIRM)
add_definitions (-DLEAKCHECK)
add_definitions (-DLIMIT_WINDOW_SIZE_TO_SCREEN)

find_package (FFMPEG REQUIRED)
if(MSVC OR WIN32)
find_package(FFMPEG REQUIRED)
else()
find_package(PkgConfig REQUIRED)
pkg_check_modules(FFMPEG REQUIRED libavformat libavcodec libavutil libswscale libswresample)
endif()

if (FFMPEG_FOUND)
else ()
Expand Down
38 changes: 25 additions & 13 deletions cpymo-backends/sdl2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,39 @@ cmake_minimum_required (VERSION 3.8)
include_directories("../../cpymo")

find_package (SDL2 CONFIG REQUIRED)
find_package (FFMPEG REQUIRED)

if (MSVC OR WIN32)
find_package (FFMPEG REQUIRED)
endif()

include_directories(${FFMPEG_INCLUDE_DIRS})

file (GLOB CPYMO_BACKEND_SRC "*.h" "*.c")

add_executable (cpymo ${CPYMO_BACKEND_SRC})

target_link_libraries(cpymo PRIVATE
SDL2::SDL2
SDL2::SDL2main
cpymolib
${FFMPEG_LIBRARIES})

target_link_libraries(cpymo PRIVATE
SDL2::SDL2
SDL2::SDL2main
cpymolib
${FFMPEG_LIBRARIES}
)

if (VCPKG_LIBRARY_LINKAGE EQUAL "static")
target_link_libraries(cpymo PRIVATE SDL2::SDL2-static)
if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
target_link_libraries(cpymo PRIVATE SDL2::SDL2-static)
endif ()

if (CMAKE_SYSTEM_NAME MATCHES "Windows")
target_sources (cpymo PRIVATE "pymo-icon-windows.rc")
target_sources (cpymo PRIVATE "pymo-icon-windows.rc")
elseif (CMAKE_SYSTEM_NAME MATCHES "Linux")
set(CMAKE_C_FLAGS "-D__LINUX__")
target_link_libraries(cpymo PRIVATE X11)
endif ()
target_compile_definitions(cpymo PRIVATE __LINUX__)

execute_process(
COMMAND pkg-config --libs --static libavformat libavcodec libavutil libswscale libswresample
OUTPUT_VARIABLE FFMPEG_STATIC_LIBS_STR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
separate_arguments(FFMPEG_FULL_LIBS_LIST UNIX_COMMAND "${FFMPEG_STATIC_LIBS_STR}")

target_link_libraries(cpymo PRIVATE X11 ${FFMPEG_FULL_LIBS_LIST})
endif ()
2 changes: 1 addition & 1 deletion cpymo-tool/cpymo_tool_convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <io.h>
#elif defined __APPLE__
#include <sys/uio.h>
#else
#elif defined(__linux__) && (defined(__x86_64__) || defined(__i386__))
#include <sys/io.h>
#endif
#include <string.h>
Expand Down