From 03bc51e5b47e7278512201ab3dd3f9554f4a54fb Mon Sep 17 00:00:00 2001 From: Nishi Date: Mon, 25 May 2026 07:25:59 +0900 Subject: [PATCH] more and more deps --- engine/CMakeLists.txt | 3 +++ engine/cmake/deps/jar.cmake | 10 ++++++++++ engine/cmake/deps/lz4.cmake | 12 ++++++++++++ engine/cmake/deps/ode.cmake | 2 -- engine/cmake/deps/stb.cmake | 10 ++++++++++ engine/include/fishbone/client.h | 17 +++++++++++++++++ engine/include/fishbone/foundation.h | 4 ++++ engine/include/fishbone/mixer.h | 13 +++++++++++++ engine/include/fishbone/sound.h | 19 +++++++++++++++++++ engine/src/client.cc | 1 + engine/src/core.cc | 1 - 11 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 engine/cmake/deps/jar.cmake create mode 100644 engine/cmake/deps/lz4.cmake create mode 100644 engine/cmake/deps/stb.cmake create mode 100644 engine/include/fishbone/client.h create mode 100644 engine/include/fishbone/mixer.h create mode 100644 engine/include/fishbone/sound.h create mode 100644 engine/src/client.cc delete mode 100644 engine/src/core.cc diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt index 9b47cd3..57fcd7a 100644 --- a/engine/CMakeLists.txt +++ b/engine/CMakeLists.txt @@ -33,3 +33,6 @@ endmacro() pkg_add(sdl2 REQUIRED) fb_add_dep(fishbone ode) +fb_add_dep(fishbone stb) +fb_add_dep(fishbone jar) +fb_add_dep(fishbone lz4) diff --git a/engine/cmake/deps/jar.cmake b/engine/cmake/deps/jar.cmake new file mode 100644 index 0000000..e6decc5 --- /dev/null +++ b/engine/cmake/deps/jar.cmake @@ -0,0 +1,10 @@ +include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CPM.cmake") + +CPMAddPackage( + NAME "jar" + GITHUB_REPOSITORY "pyrite-dev/jar" + GIT_TAG master +) + +add_library(jar INTERFACE) +target_include_directories(jar INTERFACE ${jar_SOURCE_DIR}) diff --git a/engine/cmake/deps/lz4.cmake b/engine/cmake/deps/lz4.cmake new file mode 100644 index 0000000..7de82fe --- /dev/null +++ b/engine/cmake/deps/lz4.cmake @@ -0,0 +1,12 @@ +include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CPM.cmake") + +CPMAddPackage( + NAME "lz4" + GITHUB_REPOSITORY "lz4/lz4" + GIT_TAG dev +) + +file(GLOB LZ4_SRC ${lz4_SOURCE_DIR}/lib/*.c) + +add_library(lz4 ${LZ4_SRC}) +target_include_directories(lz4 PUBLIC ${lz4_SOURCE_DIR}/lib) diff --git a/engine/cmake/deps/ode.cmake b/engine/cmake/deps/ode.cmake index cc0e742..32ade3a 100644 --- a/engine/cmake/deps/ode.cmake +++ b/engine/cmake/deps/ode.cmake @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.11) - include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CPM.cmake") CPMAddPackage( diff --git a/engine/cmake/deps/stb.cmake b/engine/cmake/deps/stb.cmake new file mode 100644 index 0000000..ceb7440 --- /dev/null +++ b/engine/cmake/deps/stb.cmake @@ -0,0 +1,10 @@ +include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CPM.cmake") + +CPMAddPackage( + NAME "stb" + GITHUB_REPOSITORY "nothings/stb" + GIT_TAG master +) + +add_library(stb INTERFACE) +target_include_directories(stb INTERFACE ${stb_SOURCE_DIR}) diff --git a/engine/include/fishbone/client.h b/engine/include/fishbone/client.h new file mode 100644 index 0000000..6f9bdd5 --- /dev/null +++ b/engine/include/fishbone/client.h @@ -0,0 +1,17 @@ +#ifndef __FISHBONE_CLIENT_H__ +#define __FISHBONE_CLIENT_H__ + +namespace fishbone { + class Client; +}; + +#include + +namespace fishbone { + class Client { + public: + fishbone::SoundDriver sound; + }; +}; + +#endif diff --git a/engine/include/fishbone/foundation.h b/engine/include/fishbone/foundation.h index 087bd04..e65891b 100644 --- a/engine/include/fishbone/foundation.h +++ b/engine/include/fishbone/foundation.h @@ -1,4 +1,8 @@ #ifndef __FISHBONE_FOUNDATION_H__ #define __FISHBONE_FOUNDATION_H__ +#include +#include +#include + #endif diff --git a/engine/include/fishbone/mixer.h b/engine/include/fishbone/mixer.h new file mode 100644 index 0000000..aa3f748 --- /dev/null +++ b/engine/include/fishbone/mixer.h @@ -0,0 +1,13 @@ +#ifndef __FISHBONE_MIXER_H__ +#define __FISHBONE_MIXER_H__ + +namespace fishbone { + class Mixer; +}; + +namespace fishbone { + class Mixer { + }; +}; + +#endif diff --git a/engine/include/fishbone/sound.h b/engine/include/fishbone/sound.h new file mode 100644 index 0000000..80f8238 --- /dev/null +++ b/engine/include/fishbone/sound.h @@ -0,0 +1,19 @@ +#ifndef __FISHBONE_SOUND_H__ +#define __FISHBONE_SOUND_H__ + +namespace fishbone { + class SoundDriver; + class SoundLoader; +}; + +#include + +namespace fishbone { + class SoundDriver { + fishbone::Mixer mixer; + }; + class SoundLoader { + }; +}; + +#endif diff --git a/engine/src/client.cc b/engine/src/client.cc new file mode 100644 index 0000000..78bf70c --- /dev/null +++ b/engine/src/client.cc @@ -0,0 +1 @@ +#include diff --git a/engine/src/core.cc b/engine/src/core.cc deleted file mode 100644 index 10e9255..0000000 --- a/engine/src/core.cc +++ /dev/null @@ -1 +0,0 @@ -#include