diff options
| author | realtradam <[email protected]> | 2023-06-23 01:26:52 -0400 |
|---|---|---|
| committer | realtradam <[email protected]> | 2023-06-23 01:26:52 -0400 |
| commit | 5f57ca96bb0702be7a6b518626ad1d300e5d92e6 (patch) | |
| tree | 0fa46c8bd4d537d42634ff382a4703b80c34d44e | |
| parent | fab77cfb2104e8c76f01630bb7e8b25f87e4d7ac (diff) | |
| download | RodeoKit-5f57ca96bb0702be7a6b518626ad1d300e5d92e6.tar.gz RodeoKit-5f57ca96bb0702be7a6b518626ad1d300e5d92e6.zip | |
added RmlUi to build
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rwxr-xr-x | build | 2 | ||||
| m--------- | external/RmlUi | 0 |
4 files changed, 12 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 4dfe4cf..2ae308b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "external/SDL_mixer"] path = external/SDL_mixer url = https://github.com/libsdl-org/SDL_mixer.git +[submodule "external/RmlUi"] + path = external/RmlUi + url = https://github.com/mikke89/RmlUi.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f04b54..11a5003 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ add_library(${PROJECT_NAME} ) set_property(TARGET RodeoKit PROPERTY C_STANDARD 99) -set_property(TARGET RodeoKit PROPERTY CXX_STANDARD 11) +set_property(TARGET RodeoKit PROPERTY CXX_STANDARD 14) # pull all git submodules recursively find_package(Git QUIET) @@ -46,6 +46,7 @@ if(DEFINED EMSCRIPTEN) option(CGLM_SHARED "Shared build" OFF) option(CGLM_STATIC "Static build" ON) add_subdirectory(external/cglm) + add_subdirectory(external/RmlUi) ExternalProject_Add(project_bgfx #BUILD_IN_SOURCE true # this just doesn't work @@ -90,6 +91,7 @@ if(DEFINED EMSCRIPTEN) PRIVATE bimg PRIVATE bgfx PRIVATE bx + PRIVATE RmlCore ) target_compile_options(${PROJECT_NAME} PUBLIC "-fno-exceptions" @@ -103,6 +105,8 @@ elseif(DEFINED UNIX AND NOT DEFINED APPLE) option(CGLM_SHARED "Shared build" OFF) option(CGLM_STATIC "Static build" ON) add_subdirectory(external/cglm) + add_definitions(-DRMLUI_STATIC_LIB) + add_subdirectory(external/RmlUi) add_subdirectory(external/SDL) add_subdirectory(external/SDL_image) @@ -158,6 +162,7 @@ endif() PRIVATE external/SDL_image PRIVATE external/SDL_mixer PRIVATE external/bgfx + PRIVATE external/RmlUi ) target_link_libraries(${PROJECT_NAME} #PRIVATE SDL2::SDL2-static # static lib @@ -167,6 +172,7 @@ endif() PRIVATE SDL2_mixer PRIVATE cglm PRIVATE bgfx + PRIVATE RmlCore ) endif() @@ -174,6 +180,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE external/bgfx/include PRIVATE external/bx/include PRIVATE external/cglm/include + PRIVATE external/RmlUi/Include PRIVATE src PUBLIC include ) @@ -1,3 +1,3 @@ #! /bin/sh -cd build_dir/tux ; make +cd build_dir/tux ; make -j4 #cd build_dir/web ; emmake make diff --git a/external/RmlUi b/external/RmlUi new file mode 160000 +Subproject 092396938e2dafa2a76b8a1581ac69982a21302 |