Skip to content

Commit

Permalink
Link thtk statically and disable OpenMP. Use WinMain on Windows.
Browse files Browse the repository at this point in the history
  • Loading branch information
chirs241097 committed Nov 3, 2022
1 parent afe4784 commit 6d1a129
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
1 change: 0 additions & 1 deletion .github/workflows/windows-msys2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ jobs:
mkdir build && cd build
cmake .. -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} -DCMAKE_PREFIX_PATH="${MINGW_PREFIX}/qt5-static" -G Ninja
cmake --build . -j
cmake --build . --target thtk/thtk/install/strip
cd ..
- name: Prepare for package
continue-on-error: true
Expand Down
6 changes: 6 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ project(thplayer CXX)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

set(BUILD_SHARED_LIBS OFF)
option(WITH_OPENMP OFF)
add_subdirectory(thtk EXCLUDE_FROM_ALL)

#they assumed their project is the root project...
Expand Down Expand Up @@ -43,3 +45,7 @@ get_property(thtk_bindir DIRECTORY thtk/ PROPERTY BINARY_DIR)
target_include_directories(thplayer PRIVATE ${thtk_bindir})

target_link_libraries(thplayer thtk Qt5::Widgets Qt5::Multimedia)

if(WIN32)
set_property(TARGET thplayer PROPERTY WIN32_EXECUTABLE True)
endif()
2 changes: 1 addition & 1 deletion thtk
Submodule thtk updated 2 files
+1 −0 CMakeLists.txt
+11 −6 thtk/CMakeLists.txt

0 comments on commit 6d1a129

Please sign in to comment.