-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #188 from edunad/features/imgui
Add IMGUI support
- Loading branch information
Showing
50 changed files
with
680 additions
and
106 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,6 +43,7 @@ option(RAWRBOX_BUILD_RAWRBOX_SCRIPTING "Build lua & mod support" OFF) | |
option(RAWRBOX_BUILD_RAWRBOX_SCRIPTING_UNSAFE "Enable unsafe scripting (io / etc)" OFF) | ||
option(RAWRBOX_BUILD_RAWRBOX_SCRIPTING_EXCEPTION "Enables scripting throwing exceptions instead of catching them" OFF) | ||
option(RAWRBOX_BUILD_RAWRBOX_STEAMWORKS "Build steamworks support" OFF) | ||
option(RAWRBOX_BUILD_RAWRBOX_IMGUI "Build imgui support" OFF) | ||
option(RAWRBOX_BUILD_MSVC_MULTITHREADED_RUNTIME "Build with msvc multithreading" OFF) | ||
option(RAWRBOX_BUILD_QHULL "Include QHull on utils" OFF) | ||
# --------------- | ||
|
@@ -76,6 +77,7 @@ if(RAWRBOX_DEV_MODE) | |
set(RAWRBOX_BUILD_RAWRBOX_SCRIPTING ON) | ||
set(RAWRBOX_BUILD_RAWRBOX_SCRIPTING_UNSAFE ON) | ||
set(RAWRBOX_BUILD_RAWRBOX_STEAMWORKS ON) | ||
set(RAWRBOX_BUILD_RAWRBOX_IMGUI ON) | ||
set(RAWRBOX_BUILD_QHULL ON) | ||
|
||
if(NOT DEFINED STEAMWORKS_APPID) | ||
|
@@ -171,7 +173,7 @@ if(NOT WIN32 AND RAWRBOX_USE_WAYLAND) | |
CPMAddPackage("https://gitlab.freedesktop.org/wayland/[email protected]") | ||
endif() | ||
|
||
CPMAddPackage("gh:stephenberry/glaze@3.1.9") | ||
CPMAddPackage("gh:stephenberry/glaze@3.2.1") | ||
|
||
# --- | ||
if(RAWRBOX_BUILD_RAWRBOX_NETWORK OR RAWRBOX_BUILD_RAWRBOX_ASSIMP) | ||
|
@@ -261,6 +263,11 @@ if(RAWRBOX_BUILD_RAWRBOX_STEAMWORKS) | |
add_subdirectory("rawrbox.steamworks") | ||
endif() | ||
|
||
if(RAWRBOX_BUILD_RAWRBOX_IMGUI) | ||
message(STATUS "Enabled RAWRBOX.IMGUI support") | ||
add_subdirectory("rawrbox.imgui") | ||
endif() | ||
|
||
# Shhhhh windows... shhhh.... | ||
mute_dependencies_warnings(".*RAWRBOX.*") | ||
# -------------------- | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.