Merge branch 'master' of https://github.com/tildearrow/furnace
This commit is contained in:
commit
49cb216594
|
@ -33,12 +33,11 @@ if (ANDROID)
|
|||
endif()
|
||||
else()
|
||||
set(USE_RTMIDI_DEFAULT ON)
|
||||
CHECK_INCLUDE_FILE(execinfo.h EXECINFO_FOUND)
|
||||
if (EXECINFO_FOUND)
|
||||
if (WIN32 OR APPLE)
|
||||
set(USE_BACKWARD_DEFAULT ON)
|
||||
else()
|
||||
find_library(EXECINFO_IS_LIBRARY execinfo)
|
||||
if (EXECINFO_IS_LIBRARY)
|
||||
CHECK_INCLUDE_FILE(execinfo.h EXECINFO_FOUND)
|
||||
if (EXECINFO_FOUND)
|
||||
set(USE_BACKWARD_DEFAULT ON)
|
||||
else()
|
||||
set(USE_BACKWARD_DEFAULT OFF)
|
||||
|
|
|
@ -594,7 +594,7 @@ void FurnaceGUI::drawSysConf(int chan, DivSystem type, unsigned int& flags, bool
|
|||
if (ImGui::RadioButton("14.32MHz (NTSC)",(flags&255)==1)) {
|
||||
copyOfFlags=(flags&(~255))|1;
|
||||
}
|
||||
if (ImGui::RadioButton("14.19MHz (PAL)",(flags&255)==3)) {
|
||||
if (ImGui::RadioButton("14.19MHz (PAL)",(flags&255)==2)) {
|
||||
copyOfFlags=(flags&(~255))|2;
|
||||
}
|
||||
if (ImGui::RadioButton("16MHz",(flags&255)==3)) {
|
||||
|
|
Loading…
Reference in New Issue