Skip to content

thanm: fix windows build error in github actions #135

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
wants to merge 1 commit into
base: anm_jpeg_merge
Choose a base branch
from
Open

thanm: fix windows build error in github actions #135

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
6 changes: 5 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,12 @@ jobs:
mkdir bison
cd bison
7z x ../win_flex_bison-${{env.FLEXBISON_VER}}.zip
- name: Integrate vcpkg
run: vcpkg integrate install
- name: Install libjpeg
run: vcpkg install libjpeg-turbo:${{matrix.arch}}-windows-static
- name: Configure CMake
run: cmake -B build -A ${{matrix.arch == 'x86' && 'Win32' || matrix.arch}} -DBISON_EXECUTABLE=${{github.workspace}}/bison/win_bison.exe -DFLEX_EXECUTABLE=${{github.workspace}}/bison/win_flex.exe -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
run: cmake -B build -A ${{matrix.arch == 'x86' && 'Win32' || matrix.arch}} -DBISON_EXECUTABLE=${{github.workspace}}/bison/win_bison.exe -DFLEX_EXECUTABLE=${{github.workspace}}/bison/win_flex.exe -DJPEG_INCLUDE_DIR=C:/vcpkg/packages/libjpeg-turbo_${{matrix.arch}}-windows-static/include/ -DJPEG_LIBRARY_RELEASE=C:/vcpkg/packages/libjpeg-turbo_${{matrix.arch}}-windows-static/lib/jpeg.lib -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
- name: Build
run: cmake --build build --config ${{env.BUILD_TYPE}}
- name: Prepare Dist
Expand Down
1 change: 1 addition & 0 deletions INSTALL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Build requirements:
cmake >=3.14
flex >=2.5.31
bison >=3.6.4
libjpeg >= 8.0
(optional) pkg-config
(optional) zlib
(optional) libpng
Expand Down
5 changes: 3 additions & 2 deletions thanm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
find_package(BISON REQUIRED)
find_package(FLEX REQUIRED)
find_package(JPEG REQUIRED)
bison_target(AnmParse anmparse.y ${CMAKE_CURRENT_BINARY_DIR}/anmparse.c COMPILE_FLAGS ${BISON_FLAGS})
flex_target(AnmScan anmscan.l ${CMAKE_CURRENT_BINARY_DIR}/anmscan.c)
add_flex_bison_dependency(AnmScan AnmParse)
Expand All @@ -8,7 +9,7 @@ add_executable(thanm
thanm.c image.c anmmap.c reg.c expr.c
thanm.h image.h anmmap.h reg.h expr.h
)
target_include_directories(thanm PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
target_link_libraries(thanm PRIVATE util $<$<BOOL:${PNG_FOUND}>:PNG::PNG> math setargv thtk_warning jpeg)
target_include_directories(thanm PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${JPEG_INCLUDE_DIR})
target_link_libraries(thanm PRIVATE util $<$<BOOL:${PNG_FOUND}>:PNG::PNG> math setargv thtk_warning ${JPEG_LIBRARY_RELEASE})
install(TARGETS thanm)
install(FILES thanm.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
Loading