otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix build

Browse source
This commit is contained in:
tildearrow 2023-06-08 01:00:47 -05:00
parent a5abe19b2a
commit 6ae9f8e083
7 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -602,7 +602,7 @@ extern/imgui_patched/imgui.cpp
extern/imgui_patched/imgui_draw.cpp extern/imgui_patched/imgui_draw.cpp
extern/imgui_patched/imgui_tables.cpp extern/imgui_patched/imgui_tables.cpp
extern/imgui_patched/imgui_widgets.cpp extern/imgui_patched/imgui_widgets.cpp
extern/imgui_patched/backends/imgui_impl_sdl.cpp extern/imgui_patched/backends/imgui_impl_sdl2.cpp
extern/imgui_patched/misc/cpp/imgui_stdlib.cpp extern/imgui_patched/misc/cpp/imgui_stdlib.cpp
extern/igfd/ImGuiFileDialog.cpp extern/igfd/ImGuiFileDialog.cpp
@ -701,7 +701,7 @@ endif()
if (WITH_RENDER_SDL) if (WITH_RENDER_SDL)
list(APPEND GUI_SOURCES src/gui/render/renderSDL.cpp) list(APPEND GUI_SOURCES src/gui/render/renderSDL.cpp)
list(APPEND GUI_SOURCES extern/imgui_patched/backends/imgui_impl_sdlrenderer.cpp) list(APPEND GUI_SOURCES extern/imgui_patched/backends/imgui_impl_sdlrenderer2.cpp)
list(APPEND DEPENDENCIES_DEFINES HAVE_RENDER_SDL) list(APPEND DEPENDENCIES_DEFINES HAVE_RENDER_SDL)
message(STATUS "UI render backend: SDL_Renderer") message(STATUS "UI render backend: SDL_Renderer")
endif() endif()

7
extern/igfd/ImGuiFileDialog.cpp vendored
View file

@ -25,6 +25,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS
#endif // IMGUI_DEFINE_MATH_OPERATORS
#include "ImGuiFileDialog.h" #include "ImGuiFileDialog.h"
#include "../../src/ta-log.h" #include "../../src/ta-log.h"
@ -71,9 +75,6 @@ SOFTWARE.
#endif // defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) #endif // defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
#include "imgui.h" #include "imgui.h"
#ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS
#endif // IMGUI_DEFINE_MATH_OPERATORS
#include "imgui_internal.h" #include "imgui_internal.h"
#include <IconsFontAwesome4.h> #include <IconsFontAwesome4.h>

1
src/gui/gui.cpp
View file

@ -29,7 +29,6 @@
#include "../fileutils.h" #include "../fileutils.h"
#include "imgui.h" #include "imgui.h"
#include "imgui_internal.h" #include "imgui_internal.h"
#include "imgui_impl_sdl.h"
#include "ImGuiFileDialog.h" #include "ImGuiFileDialog.h"
#include "IconsFontAwesome4.h" #include "IconsFontAwesome4.h"
#include "misc/cpp/imgui_stdlib.h" #include "misc/cpp/imgui_stdlib.h"

2
src/gui/gui.h
View file

@ -23,7 +23,7 @@
#include "../engine/engine.h" #include "../engine/engine.h"
#include "../engine/waveSynth.h" #include "../engine/waveSynth.h"
#include "imgui.h" #include "imgui.h"
#include "imgui_impl_sdl.h" #include "imgui_impl_sdl2.h"
#include <SDL.h> #include <SDL.h>
#include <fftw3.h> #include <fftw3.h>
#include <deque> #include <deque>

4
src/gui/plot_nolerp.cpp
View file

@ -19,11 +19,11 @@
// portions based on imgui_widgets.cpp // portions based on imgui_widgets.cpp
#include "plot_nolerp.h"
#include "imgui.h"
#ifndef IMGUI_DEFINE_MATH_OPERATORS #ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS
#endif #endif
#include "plot_nolerp.h"
#include "imgui.h"
#include "imgui_internal.h" #include "imgui_internal.h"
struct FurnacePlotArrayGetterData struct FurnacePlotArrayGetterData

16
src/gui/render/renderSDL.cpp
View file

@ -18,7 +18,7 @@
*/ */
#include "renderSDL.h" #include "renderSDL.h"
#include "backends/imgui_impl_sdlrenderer.h" #include "backends/imgui_impl_sdlrenderer2.h"
ImTextureID FurnaceGUIRenderSDL::getTextureID(void* which) { ImTextureID FurnaceGUIRenderSDL::getTextureID(void* which) {
return which; return which;
@ -86,19 +86,19 @@ void FurnaceGUIRenderSDL::clear(ImVec4 color) {
} }
bool FurnaceGUIRenderSDL::newFrame() { bool FurnaceGUIRenderSDL::newFrame() {
return ImGui_ImplSDLRenderer_NewFrame(); return ImGui_ImplSDLRenderer2_NewFrame();
} }
void FurnaceGUIRenderSDL::createFontsTexture() { void FurnaceGUIRenderSDL::createFontsTexture() {
ImGui_ImplSDLRenderer_CreateFontsTexture(); ImGui_ImplSDLRenderer2_CreateFontsTexture();
} }
void FurnaceGUIRenderSDL::destroyFontsTexture() { void FurnaceGUIRenderSDL::destroyFontsTexture() {
ImGui_ImplSDLRenderer_DestroyFontsTexture(); ImGui_ImplSDLRenderer2_DestroyFontsTexture();
} }
void FurnaceGUIRenderSDL::renderGUI() { void FurnaceGUIRenderSDL::renderGUI() {
ImGui_ImplSDLRenderer_RenderDrawData(ImGui::GetDrawData()); ImGui_ImplSDLRenderer2_RenderDrawData(ImGui::GetDrawData());
} }
void FurnaceGUIRenderSDL::wipe(float alpha) { void FurnaceGUIRenderSDL::wipe(float alpha) {
@ -132,11 +132,11 @@ void FurnaceGUIRenderSDL::initGUI(SDL_Window* win) {
ImGui::CreateContext(); ImGui::CreateContext();
ImGui_ImplSDL2_InitForSDLRenderer(win,sdlRend); ImGui_ImplSDL2_InitForSDLRenderer(win,sdlRend);
ImGui_ImplSDLRenderer_Init(sdlRend); ImGui_ImplSDLRenderer2_Init(sdlRend);
} }
void FurnaceGUIRenderSDL::quitGUI() { void FurnaceGUIRenderSDL::quitGUI() {
ImGui_ImplSDLRenderer_Shutdown(); ImGui_ImplSDLRenderer2_Shutdown();
} }
bool FurnaceGUIRenderSDL::quit() { bool FurnaceGUIRenderSDL::quit() {
@ -144,4 +144,4 @@ bool FurnaceGUIRenderSDL::quit() {
SDL_DestroyRenderer(sdlRend); SDL_DestroyRenderer(sdlRend);
sdlRend=NULL; sdlRend=NULL;
return true; return true;
} }

2
src/gui/settings.cpp
View file

@ -3827,7 +3827,7 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
} }
mainFont->FallbackChar='?'; mainFont->FallbackChar='?';
mainFont->DotChar='.'; mainFont->EllipsisChar='.';
} }
// TODO: allow changing these colors. // TODO: allow changing these colors.