From a3c96ac42c4c2ce4a4cf2f5ca09a5ae9dd4bd303 Mon Sep 17 00:00:00 2001 From: hrydgard Date: Thu, 3 Jun 2010 18:05:08 +0000 Subject: Warp back to 5578. Sorry for the lost changes, please re-apply. Reason: 5579 is a complete disaster. Not only does it change tons of files to switch to a new and non-working (it doesn't parse my ini files, at least) ini parser, it also reshuffles a lot of code and removes a plugin. The latter part is fine, but doing these two major switches in one revision, one of which is broken, is completely unacceptable. I said to merge tiny changes, not massive reworkings. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5589 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/InputCommon/Src/Configuration.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Source/Core/InputCommon/Src/Configuration.cpp') diff --git a/Source/Core/InputCommon/Src/Configuration.cpp b/Source/Core/InputCommon/Src/Configuration.cpp index 7f4972ea11..c48e48d05f 100644 --- a/Source/Core/InputCommon/Src/Configuration.cpp +++ b/Source/Core/InputCommon/Src/Configuration.cpp @@ -18,10 +18,13 @@ #include // System #include -#define _USE_MATH_DEFINES -#include +#include #include "Common.h" // Common +#if defined HAVE_WX && HAVE_WX + #include +#endif + #ifdef _WIN32 #define NOMINMAX #include -- cgit v1.2.3