From 295ffa90b1239bc7c6d93bbc729d196ca41c1b22 Mon Sep 17 00:00:00 2001 From: riccardom Date: Sun, 18 Jul 2010 09:05:24 +0000 Subject: [PATCH] Fix wx frontend compilation Add wxcontrolsconfigdialog.* stuff to the build and fix wxcontrolsconfigdialog.h include path. What about a shorter name next time? ;) --- desmume/src/wx/Makefile.am | 1 + desmume/src/wx/wxMain.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/desmume/src/wx/Makefile.am b/desmume/src/wx/Makefile.am index 9a4784dd7..ebc0fd3f2 100644 --- a/desmume/src/wx/Makefile.am +++ b/desmume/src/wx/Makefile.am @@ -12,6 +12,7 @@ wxdesmume_SOURCES = \ ../sndsdl.cpp \ ../driver.h ../driver.cpp \ ../wxdlg/wxdlg3dViewer.h ../wxdlg/wxdlg3dViewer.cpp \ + ../wxdlg/wxcontrolsconfigdialog.h ../wxdlg/wxcontrolsconfigdialog.cpp \ PadSimple/pluginspecs_pad.h \ PadSimple/PadSimple.h PadSimple/PadSimple.cpp \ PadSimple/GUI/ConfigDlg.h PadSimple/GUI/ConfigDlg.cpp \ diff --git a/desmume/src/wx/wxMain.cpp b/desmume/src/wx/wxMain.cpp index 387d01c1e..0a723328e 100644 --- a/desmume/src/wx/wxMain.cpp +++ b/desmume/src/wx/wxMain.cpp @@ -21,7 +21,7 @@ #include "LuaWindow.h" #include "PadSimple/GUI/ConfigDlg.h" #include "PadSimple/pluginspecs_pad.h" -#include "wxcontrolsconfigdialog.h" +#include "wxdlg/wxcontrolsconfigdialog.h" #ifndef WX_PRECOMP #include