etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-29 16:03:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

don't use IMGUI_USER_CONFIG

Browse source 
apparently a specific build of GCC 11.2.0 has a bug which prevents using
defines in #include
This commit is contained in:
tildearrow 2023-07-10 14:26:27 -05:00
parent a32c706c8f
commit 7d8a61d6dc
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -805,7 +805,6 @@ if (BUILD_GUI)
list(APPEND USED_SOURCES ${GUI_SOURCES}) list(APPEND USED_SOURCES ${GUI_SOURCES})
list(APPEND DEPENDENCIES_INCLUDE_DIRS list(APPEND DEPENDENCIES_INCLUDE_DIRS
extern/imgui_patched extern/imgui_patched
extern/imgui_conf
extern/imgui_patched/backends extern/imgui_patched/backends
extern/IconFontCppHeaders extern/IconFontCppHeaders
extern/igfd extern/igfd
@ -877,7 +876,7 @@ else()
endif() endif()
target_include_directories(furnace SYSTEM PRIVATE ${DEPENDENCIES_INCLUDE_DIRS}) target_include_directories(furnace SYSTEM PRIVATE ${DEPENDENCIES_INCLUDE_DIRS})
target_compile_definitions(furnace PRIVATE ${DEPENDENCIES_DEFINES} IMGUI_USER_CONFIG="imconfig_fur.h") target_compile_definitions(furnace PRIVATE ${DEPENDENCIES_DEFINES})
target_compile_options(furnace PRIVATE ${DEPENDENCIES_COMPILE_OPTIONS}) target_compile_options(furnace PRIVATE ${DEPENDENCIES_COMPILE_OPTIONS})
target_link_libraries(furnace PRIVATE ${DEPENDENCIES_LIBRARIES}) target_link_libraries(furnace PRIVATE ${DEPENDENCIES_LIBRARIES})
if (PKG_CONFIG_FOUND AND (SYSTEM_FMT OR SYSTEM_LIBSNDFILE OR SYSTEM_ZLIB OR SYSTEM_SDL2 OR SYSTEM_RTMIDI OR WITH_JACK)) if (PKG_CONFIG_FOUND AND (SYSTEM_FMT OR SYSTEM_LIBSNDFILE OR SYSTEM_ZLIB OR SYSTEM_SDL2 OR SYSTEM_RTMIDI OR WITH_JACK))

0
extern/imgui_conf/imconfig_fur.h → extern/imgui_patched/imconfig_fur.h vendored
View file

4
extern/imgui_patched/imgui.h vendored
View file

@ -52,9 +52,7 @@ Index of this file:
// Configuration file with compile-time options // Configuration file with compile-time options
// (edit imconfig.h or '#define IMGUI_USER_CONFIG "myfilename.h" from your build system') // (edit imconfig.h or '#define IMGUI_USER_CONFIG "myfilename.h" from your build system')
#ifdef IMGUI_USER_CONFIG #include "imconfig_fur.h"
#include IMGUI_USER_CONFIG
#endif
#include "imconfig.h" #include "imconfig.h"
#ifndef IMGUI_DISABLE #ifndef IMGUI_DISABLE