diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fd97ca..8036b38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,6 +36,7 @@ include_directories(BEFORE link_directories(BEFORE ${CMAKE_INSTALL_PREFIX}/development/lib ${CMAKE_BINARY_DIR}/third_party/install/lib + ${CMAKE_BINARY_DIR}/core ) link_libraries( diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index d155aa7..e3a015e 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -1,7 +1,18 @@ -#add_subdirectory(kernel) +# Place before add_subdir -> define for all childs +add_compile_definitions( + BOOST_ALL_NO_LIB +) + +add_subdirectory(kernel) # add_subdirectory(videoout) -# add_library(core SHARED - #$ +add_library(core SHARED + $ + # $ -#) \ No newline at end of file +) + +target_link_libraries(core PRIVATE + libboost_thread + libboost_chrono +) \ No newline at end of file diff --git a/core/readme.md b/core/readme.md new file mode 100644 index 0000000..d500758 --- /dev/null +++ b/core/readme.md @@ -0,0 +1,7 @@ +# Overview + +
+ +![](../out/docs/uml/modules/coreDeps/coreDeps.svg) +
+ diff --git a/docs/uml/modules/coreDeps.puml b/docs/uml/modules/coreDeps.puml new file mode 100644 index 0000000..1f3bc78 --- /dev/null +++ b/docs/uml/modules/coreDeps.puml @@ -0,0 +1,17 @@ +@startuml +skinparam classAttributeIconSize 0 + +package Modules {} + +package core { + package kernel { } +} + +package "psOff Emulator" { + +} + +Modules -> core + +core <--> "psOff Emulator" +@enduml \ No newline at end of file diff --git a/modules/libSceCoredump/CMakeLists.txt b/modules/libSceCoredump/CMakeLists.txt index 0fed364..19e2f51 100644 --- a/modules/libSceCoredump/CMakeLists.txt +++ b/modules/libSceCoredump/CMakeLists.txt @@ -11,7 +11,6 @@ add_library(${libName} SHARED add_dependencies(${libName} third_party) target_compile_definitions(${libName} PRIVATE BOOST_ALL_NO_LIB) -target_link_libraries(${libName} PRIVATE - libboost_thread) +target_link_libraries(${libName} PRIVATE libboost_thread) setupModule(${libName}) \ No newline at end of file diff --git a/modules/libkernel/CMakeLists.txt b/modules/libkernel/CMakeLists.txt index df8177f..2af7bd0 100644 --- a/modules/libkernel/CMakeLists.txt +++ b/modules/libkernel/CMakeLists.txt @@ -6,6 +6,7 @@ project(${libName}) add_library(${libName} SHARED entry.cpp equeue.cpp) -target_link_libraries(${libName} PRIVATE emulator.lib) +add_dependencies(${libName} core) +target_link_libraries(${libName} PRIVATE core.lib) setupModule(${libName}) \ No newline at end of file diff --git a/out/docs/uml/modules/coreDeps/coreDeps.svg b/out/docs/uml/modules/coreDeps/coreDeps.svg new file mode 100644 index 0000000..62e01be --- /dev/null +++ b/out/docs/uml/modules/coreDeps/coreDeps.svg @@ -0,0 +1,30 @@ +coreModuleskernelpsOff Emulator \ No newline at end of file