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

Merge branch 'master' of https://github.com/tildearrow/furnace

Browse source
This commit is contained in:
cam900 2022-07-24 12:25:17 +09:00
parent b48b7c8bc5 84c955058b
commit 49cb216594
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -33,12 +33,11 @@ if (ANDROID)
endif() endif()
else() else()
set(USE_RTMIDI_DEFAULT ON) set(USE_RTMIDI_DEFAULT ON)
CHECK_INCLUDE_FILE(execinfo.h EXECINFO_FOUND) if (WIN32 OR APPLE)
if (EXECINFO_FOUND)
set(USE_BACKWARD_DEFAULT ON) set(USE_BACKWARD_DEFAULT ON)
else() else()
find_library(EXECINFO_IS_LIBRARY execinfo) CHECK_INCLUDE_FILE(execinfo.h EXECINFO_FOUND)
if (EXECINFO_IS_LIBRARY) if (EXECINFO_FOUND)
set(USE_BACKWARD_DEFAULT ON) set(USE_BACKWARD_DEFAULT ON)
else() else()
set(USE_BACKWARD_DEFAULT OFF) set(USE_BACKWARD_DEFAULT OFF)

2
src/gui/sysConf.cpp
View file

@ -594,7 +594,7 @@ void FurnaceGUI::drawSysConf(int chan, DivSystem type, unsigned int& flags, bool
if (ImGui::RadioButton("14.32MHz (NTSC)",(flags&255)==1)) { if (ImGui::RadioButton("14.32MHz (NTSC)",(flags&255)==1)) {
copyOfFlags=(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; copyOfFlags=(flags&(~255))|2;
} }
if (ImGui::RadioButton("16MHz",(flags&255)==3)) { if (ImGui::RadioButton("16MHz",(flags&255)==3)) {