Skip to content

Commit a32d20b

Browse files
committed
cmake: build more libraries
1 parent 6166372 commit a32d20b

8 files changed

Lines changed: 83 additions & 9 deletions

File tree

ee/CMakeLists.txt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,21 @@ cmake_minimum_required(VERSION 3.10)
22
project(ps2sdk-ee C ASM)
33
file(REAL_PATH ../ PS2SDKSRC_ROOT)
44

5-
set(EE_INC ${PS2SDKSRC_ROOT}/common/include ${PROJECT_SOURCE_DIR}/kernel/include ${PROJECT_SOURCE_DIR}/rpc/cdvd/include
6-
${PROJECT_SOURCE_DIR}/erl/include)
5+
set(EE_INC
6+
${PS2SDKSRC_ROOT}/common/include
7+
${PROJECT_SOURCE_DIR}/kernel/include
8+
${PROJECT_SOURCE_DIR}/erl/include
9+
)
710

11+
include(${PS2SDKSRC_ROOT}/cmake/utils.cmake)
12+
13+
add_subdirectory(debug)
14+
add_subdirectory(dma)
15+
add_subdirectory(draw)
16+
add_subdirectory(eedebug)
17+
add_subdirectory(elf-loader)
818
add_subdirectory(kernel)
919
add_subdirectory(erl)
1020
add_subdirectory(libcglue)
11-
add_subdirectory(debug)
1221
add_subdirectory(sbv)
1322
add_subdirectory(startup)

ee/dma/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
add_library(dma)
2+
target_include_directories(dma PUBLIC include)
3+
target_include_directories(dma PRIVATE ${EE_INC} ${PROJECT_SOURCE_DIR}/packet2/include)
4+
target_sources(dma PRIVATE src/dma.c src/erl-support.c)
5+
file(GLOB DMA_INCLUDE_FILES "include/*.h*")
6+
set_target_properties(dma PROPERTIES PUBLIC_HEADER "${DMA_INCLUDE_FILES}")
7+
install(TARGETS dma)
8+
target_add_erl(dma)

ee/draw/CMakeLists.txt

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
add_library(draw)
2+
target_include_directories(draw PUBLIC include)
3+
target_include_directories(draw PRIVATE
4+
${EE_INC}
5+
${PROJECT_SOURCE_DIR}/math3d/include
6+
${PROJECT_SOURCE_DIR}/dma/include
7+
)
8+
9+
target_sources(draw PRIVATE
10+
src/draw_environment.c
11+
src/draw.c
12+
src/draw2d.c
13+
src/draw3d.c
14+
src/erl-support.c
15+
)
16+
17+
file(GLOB DRAW_INCLUDE_FILES "include/*.h*")
18+
set_target_properties(draw PROPERTIES PUBLIC_HEADER "${DRAW_INCLUDE_FILES}")
19+
install(TARGETS draw)
20+
21+
target_add_erl(draw)

ee/eedebug/CMakeLists.txt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
add_library(eedebug)
2+
target_include_directories(eedebug PUBLIC include)
3+
target_include_directories(eedebug PRIVATE
4+
${EE_INC}
5+
)
6+
7+
target_sources(eedebug PRIVATE
8+
src/ee_dbg_low.S
9+
src/ee_debug.c
10+
src/ee_exceptions.S
11+
src/erl-support.c
12+
)
13+
14+
file(GLOB eedebug_INCLUDE_FILES "include/*.h*")
15+
set_target_properties(eedebug PROPERTIES PUBLIC_HEADER "${eedebug_INCLUDE_FILES}")
16+
install(TARGETS eedebug)
17+
18+
target_add_erl(eedebug)

ee/elf-loader/CMakeLists.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# TODO subfolder binary include
2+
add_library(elf-loader)
3+
target_include_directories(elf-loader PUBLIC include)
4+
target_include_directories(elf-loader PRIVATE
5+
${EE_INC}
6+
)
7+
8+
target_sources(elf-loader PRIVATE
9+
src/elf.c
10+
)
11+
12+
file(GLOB elf-loader_INCLUDE_FILES "include/*.h*")
13+
set_target_properties(elf-loader PROPERTIES PUBLIC_HEADER "${elf-loader_INCLUDE_FILES}")
14+
install(TARGETS elf-loader)
15+
16+
target_add_erl(elf-loader)

ee/kernel/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
cmake_minimum_required(VERSION 3.10)
22

3-
include(${PS2SDKSRC_ROOT}/cmake/utils.cmake)
4-
53
add_subdirectory(src/eenull)
64
add_subdirectory(src/osdsrc)
75
add_subdirectory(src/srcfile)
86
add_subdirectory(src/tlbsrc)
97

108
add_library(kernel)
119
target_include_directories(kernel PUBLIC include)
12-
target_include_directories(kernel PRIVATE ${EE_INC})
10+
target_include_directories(kernel PRIVATE
11+
${EE_INC}
12+
${PROJECT_SOURCE_DIR}/rpc/cdvd/include
13+
)
1314

1415
compile_multiple(kernel src/sifcmd.c OBJECTS
1516
sif_cmd_send.o _sif_cmd_int_handler.o sif_cmd_main.o

ee/kernel/src/osdsrc/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@ add_executable(osdsrc)
33
target_sources(osdsrc PRIVATE src/ExecPS2.c src/osd.c src/osdsrc.c)
44
target_compile_definitions(osdsrc PRIVATE -DREUSE_EXECPS2)
55
target_compile_options(osdsrc PRIVATE -fno-tree-loop-distribute-patterns -mno-gpopt)
6-
target_include_directories(osdsrc PRIVATE ${EE_INC})
6+
target_include_directories(osdsrc PRIVATE
7+
${EE_INC}
8+
${PROJECT_SOURCE_DIR}/rpc/cdvd/include
9+
)
710
target_link_options(osdsrc PRIVATE -nostdlib -nostartfiles -T${CMAKE_CURRENT_SOURCE_DIR}/linkfile -s)

ee/libcglue/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include(${PS2SDKSRC_ROOT}/cmake/utils.cmake)
2-
31
add_library(cglue)
42
target_include_directories(cglue PUBLIC ${EE_INC} include)
53
target_sources(cglue PRIVATE src/rtc.c)

0 commit comments

Comments
 (0)