From 5fa4217abfe1da53e001e4af16494a1e1efc795b Mon Sep 17 00:00:00 2001 From: riccardom Date: Fri, 31 Dec 2010 15:21:21 +0000 Subject: [PATCH] wx: fix compile without libaggx --- desmume/src/wx/wxMain.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/desmume/src/wx/wxMain.cpp b/desmume/src/wx/wxMain.cpp index cd7c30d5b..b07908917 100644 --- a/desmume/src/wx/wxMain.cpp +++ b/desmume/src/wx/wxMain.cpp @@ -13,6 +13,9 @@ #include "rasterize.h" #include "OGLRender.h" #include "firmware.h" +#ifdef HAVE_LIBAGG +#include "aggdraw.h" +#endif #ifndef WIN32 #define lstrlen(a) strlen((a)) @@ -512,6 +515,7 @@ void DesmumeFrame::displayMicrophone(wxCommandEvent& event) CommonSettings.hud.ShowMicrophone ^= true; osd->clear(); } +#ifdef HAVE_LIBAGG void DesmumeFrame::setHUDFont(wxCommandEvent &event) { wxArrayString fontchoices; @@ -531,6 +535,7 @@ void DesmumeFrame::setHUDFont(wxCommandEvent &event) } } +#endif void DesmumeFrame::mainG(int n) { if(CommonSettings.dispLayers[0][n]) @@ -676,7 +681,9 @@ BEGIN_EVENT_TABLE(DesmumeFrame, wxFrame) EVT_MENU(wDisplayGraphicalInput,DesmumeFrame::displayGraphicalInput) EVT_MENU(wDisplayLagCounter,DesmumeFrame::displayLagCounter) EVT_MENU(wDisplayMicrophone,DesmumeFrame::displayMicrophone) +#ifdef HAVE_LIBAGG EVT_MENU(wSetHUDFont,DesmumeFrame::setHUDFont) +#endif EVT_MENU(wMainGPU,DesmumeFrame::mainGPU) EVT_MENU(wMainBG0,DesmumeFrame::mainBG0) @@ -903,4 +910,4 @@ void DesmumeFrame::loadmenuBar(wxMenuBar *menuBar) loadhelpMenu(helpMenu); loadviewMenu(viewMenu); -} \ No newline at end of file +}