Skip to content

Commit

Permalink
added ffmpeg in tools, and created a video demo which currently only …
Browse files Browse the repository at this point in the history
…has a dummy video (#29)
  • Loading branch information
abdelrahim-hentabli authored Apr 27, 2024
1 parent 368af28 commit 24c11bf
Show file tree
Hide file tree
Showing 7 changed files with 657 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ jobs:
uses: actions/checkout@v4
with:
submodules: 'true'
- name: install ffmpeg
run: |
sudo apt-get update
sudo apt-get install ffmpeg
- run: mkdir build
- run: cd build
- name: Run Cmake Config step
Expand Down
13 changes: 12 additions & 1 deletion tools/common/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
find_package(PNG REQUIRED)

find_package(PkgConfig REQUIRED)
pkg_check_modules(LIBAV REQUIRED IMPORTED_TARGET
libavutil
libavcodec
libavformat
libswscale
libswresample
)

file(GLOB TOOL_COMMON_SOURCES *.cpp)

add_library(tool_common OBJECT ${TOOL_COMMON_SOURCES})
Expand All @@ -12,4 +21,6 @@ target_include_directories(tool_common
PRIVATE ${PROJECT_SOURCE_DIR}/include)

target_link_libraries(tool_common
PUBLIC ${PNG_LIBRARY})
PRIVATE ray_tracer
PRIVATE ${PNG_LIBRARY}
PRIVATE PkgConfig::LIBAV)
Loading

0 comments on commit 24c11bf

Please sign in to comment.