--- nono/wx/Makefile.in 2026/04/29 17:04:42 1.1.1.5 +++ nono/wx/Makefile.in 2026/04/29 17:05:27 1.1.1.13 @@ -13,31 +13,49 @@ TARGETS= nono CPPFLAGS+= @WXWIDGETS_CPPFLAGS@ -# DECLARE_EVENT_TABLE 内に override があるのでそれが回避できない -CPPFLAGS+= -Wno-inconsistent-missing-override +# wxWidgets-3.0 用のハック。 +# (wxWidgets-3.2 以降では wxWidgets 側がやってるので不要になる) +WX_MAJORMINOR= @WX_MAJORMINOR@ +.if "${WX_MAJORMINOR}" == "30" +.if ${WARNFLAGS_CXX:M-Winconsistent-missing-override} +CXXFLAGS+= -Wno-inconsistent-missing-override +.endif +.if ${WARNFLAGS_CXX:M-Wsuggest-override} +CXXFLAGS+= -Wno-suggest-override +.endif +.endif LDFLAGS+= -pthread LIBS+= @WXWIDGETS_LIBS@ CXXSRCS= \ - bitrev.cpp \ + fontmanager.cpp \ kaname12.cpp \ + privatechar.cpp \ + wxaccstatmonitor.cpp \ wxapp.cpp \ + wxbitmappanel.cpp \ + wxbutton.cpp \ + wxdipswwindow.cpp \ wxdumpmonitor.cpp \ - wxhistmonitor.cpp \ wxlcdwindow.cpp \ wxlogmonitor.cpp \ + wxlogsetting.cpp \ wxmainframe.cpp \ wxmainview.cpp \ wxmonitor.cpp \ wxmpumonitor.cpp \ + wxpalettemonitor.cpp \ + wxplanemonitor.cpp \ + wxromwindow.cpp \ + wxscrollbar.cpp \ wxsoftkey.cpp \ + wxstatuspanel.cpp \ wxsubwindow.cpp \ wxtextpanel.cpp \ wxtextscreen.cpp \ + wxuimessage.cpp \ wxversion.cpp \ - wxvideomonitor.cpp \ - OBJS= ${CXXSRCS:.cpp=.o}