From e4085f0f049c0f681e3feaa97f7f0842c017ae8e Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Thu, 3 Jun 2010 04:55:39 +0000
Subject: Merge GCPadNew into Dolphin. This takes place in three segments:
 Core, InputCommon, and InputUICommon. From now on it can be referred to just
 as "GCPad". Switch to Billiard's IniFile implementation throughout Dolphin
 (it's faster!!).

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5579 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/InputCommon/Src/Configuration.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 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 c48e48d05f..7f4972ea11 100644
--- a/Source/Core/InputCommon/Src/Configuration.cpp
+++ b/Source/Core/InputCommon/Src/Configuration.cpp
@@ -18,13 +18,10 @@
 
 #include <iostream> // System
 #include <vector>
-#include <cmath>
+#define _USE_MATH_DEFINES
+#include <math.h>
 #include "Common.h" // Common
 
-#if defined HAVE_WX && HAVE_WX
-	#include <wx/wx.h>
-#endif
-
 #ifdef _WIN32
 #define NOMINMAX
 #include <Windows.h>
-- 
cgit v1.2.3