Skip to content

Commit 0240dae

Browse files
committed
Update container image to build libs documentation.
1 parent 36cd767 commit 0240dae

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ include_directories(vendor/inih)
4343

4444
include_directories(vendor/Z80/API)
4545
set(Z80_SHARED_LIBS NO CACHE BOOL "")
46+
set(Z80_WITH_HTML_DOCUMENTATION YES)
4647
add_subdirectory(vendor/Z80)
4748

4849
# Global properties and settings
@@ -66,7 +67,6 @@ function(add_ceda_target target)
6667
target_compile_options(${target} PRIVATE -Werror)
6768
elseif(CMAKE_BUILD_TYPE MATCHES "Debug")
6869
target_compile_options(${target} PRIVATE -DDEBUG=1)
69-
# set(Z80_WITH_HTML_DOCUMENTATION YES)
7070
endif()
7171

7272
target_link_libraries(${target}

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ ENV DEBIAN_FRONTEND=noninteractive
44
RUN apt update && apt upgrade -y
55
RUN apt install -y git cmake gcc g++ clang-tidy clang-format libsdl2-dev libsdl2-mixer-dev
66
RUN apt install -y meson ninja-build libffi-dev libgit2-dev
7+
RUN apt install -y doxygen sphinx python3-breathe
78

89
RUN git clone https://github.com/Snaipe/Criterion.git && cd Criterion && git checkout master && meson build && meson install -C build
910

script/docker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ docker run --rm -ti -u builder \
1212
-v "$(pwd)":/home/builder/workspace \
1313
-v /tmp:/tmp \
1414
-w /home/builder/workspace \
15-
giomba/ceda-cemu-builder:1 \
15+
giomba/ceda-cemu-builder:2 \
1616
"$@"

0 commit comments

Comments
 (0)