diff --git a/.gitignore b/.gitignore
index 4d087d107..063da9dcf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,13 +14,18 @@
# Dependency makefiles
*.d
-#Compiled executable
+# Compiled executable
emulationstation
-#build directory
-EmulationStation_vs2010
+# build directory
build
Debug
Release
MinSizeRel
-RelWithDebInfo
\ No newline at end of file
+RelWithDebInfo
+
+# CMake
+CMakeCache.txt
+CMakeFiles
+cmake_install.cmake
+Makefile
diff --git a/EmulationStation_vs2010/EmulationStation_vs2010.sln b/EmulationStation_vs2010/EmulationStation_vs2010.sln
deleted file mode 100644
index 2e2783b31..000000000
--- a/EmulationStation_vs2010/EmulationStation_vs2010.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EmulationStation_vs2010", "EmulationStation_vs2010\EmulationStation_vs2010.vcxproj", "{0AB5C397-7B64-4AAD-92AD-E6B72FEDE8C3}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {0AB5C397-7B64-4AAD-92AD-E6B72FEDE8C3}.Debug|Win32.ActiveCfg = Debug|Win32
- {0AB5C397-7B64-4AAD-92AD-E6B72FEDE8C3}.Debug|Win32.Build.0 = Debug|Win32
- {0AB5C397-7B64-4AAD-92AD-E6B72FEDE8C3}.Release|Win32.ActiveCfg = Release|Win32
- {0AB5C397-7B64-4AAD-92AD-E6B72FEDE8C3}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/EmulationStation_vs2010/EmulationStation_vs2010/EmulationStation_vs2010.vcxproj b/EmulationStation_vs2010/EmulationStation_vs2010/EmulationStation_vs2010.vcxproj
deleted file mode 100644
index d29e27a3d..000000000
--- a/EmulationStation_vs2010/EmulationStation_vs2010/EmulationStation_vs2010.vcxproj
+++ /dev/null
@@ -1,128 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Release
- Win32
-
-
-
- {0AB5C397-7B64-4AAD-92AD-E6B72FEDE8C3}
- EmulationStation_vs2010
-
-
-
- Application
- true
- MultiByte
-
-
- Application
- false
- true
- MultiByte
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Level3
- Disabled
-
-
- true
-
-
-
-
- Level3
- MaxSpeed
- true
- true
- USE_OPENGL_DESKTOP;%(PreprocessorDefinitions)
-
-
- true
- true
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/EmulationStation_vs2010/EmulationStation_vs2010/EmulationStation_vs2010.vcxproj.filters b/EmulationStation_vs2010/EmulationStation_vs2010/EmulationStation_vs2010.vcxproj.filters
deleted file mode 100644
index 4be1df7e5..000000000
--- a/EmulationStation_vs2010/EmulationStation_vs2010/EmulationStation_vs2010.vcxproj.filters
+++ /dev/null
@@ -1,195 +0,0 @@
-
-
-
-
- {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
- cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
-
-
- {93995380-89BD-4b04-88EB-625FBE52EBFB}
- h;hpp;hxx;hm;inl;inc;xsd
-
-
- {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
- rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
-
-
- {31a8e8d1-9795-42bf-99fd-500e57ac87d4}
-
-
- {bec1ca52-69f2-42eb-b134-57016057661a}
-
-
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- components
-
-
- components
-
-
- components
-
-
- components
-
-
- components
-
-
- components
-
-
- components
-
-
- components
-
-
- components
-
-
- PugiXML
-
-
- Source Files
-
-
- Source Files
-
-
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- components
-
-
- components
-
-
- components
-
-
- components
-
-
- components
-
-
- components
-
-
- components
-
-
- components
-
-
- components
-
-
- components
-
-
- PugiXML
-
-
- PugiXML
-
-
-
\ No newline at end of file
diff --git a/EmulationStation_vs2010/EmulationStation_vs2010/lib_paths.props b/EmulationStation_vs2010/EmulationStation_vs2010/lib_paths.props
deleted file mode 100644
index 4b9b5bf1d..000000000
--- a/EmulationStation_vs2010/EmulationStation_vs2010/lib_paths.props
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
- $(IncludePath)
- $(LibraryPath)
-
-
-
- _DESKTOP_;%(PreprocessorDefinitions)
-
-
- SDLmain.lib;SDL.lib;FreeImage.lib;freetype.lib;opengl32.lib;%(AdditionalDependencies)
- Windows
-
-
-
-
\ No newline at end of file
diff --git a/Makefile b/Makefile
deleted file mode 100644
index f64e41ea6..000000000
--- a/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-CPPFLAGS=-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux -I/usr/include/freetype2 -I/usr/include/SDL -D_RPI_
-LIBS=-L/opt/vc/lib -lbcm_host -lEGL -lGLESv2 -lfreetype -lSDL -lboost_system -lboost_filesystem -lfreeimage -lSDL_mixer
-
-include Makefile.common
diff --git a/Makefile.common b/Makefile.common
deleted file mode 100644
index 15ec7a98c..000000000
--- a/Makefile.common
+++ /dev/null
@@ -1,25 +0,0 @@
-CXX=g++
-CXXFLAGS=-Wall -g -O2
-LDFLAGS=
-
-SRC_SOURCES=platform.cpp AudioManager.cpp Window.cpp InputConfig.cpp Log.cpp FolderData.cpp Font.cpp GameData.cpp Gui.cpp InputManager.cpp main.cpp MathExp.cpp Renderer_draw_gl.cpp Renderer_init.cpp Sound.cpp SystemData.cpp XMLReader.cpp components/GuiAnimation.cpp components/GuiBox.cpp components/GuiFastSelect.cpp components/GuiGameList.cpp components/GuiImage.cpp components/GuiMenu.cpp components/GuiTheme.cpp components/GuiInputConfig.cpp components/GuiDetectDevice.cpp pugiXML/pugixml.cpp
-SOURCES=$(addprefix src/,$(SRC_SOURCES))
-OBJECTS=$(SOURCES:.cpp=.o)
-DEPS=$(SOURCES:.cpp=.d)
-EXECUTABLE=emulationstation
-
-all: $(EXECUTABLE)
-
-$(EXECUTABLE): $(DEPS) $(OBJECTS)
- $(CXX) -o $@ $(LDFLAGS) $(OBJECTS) $(LIBS)
-
-include $(wildcard src/*.d src/components/*.d src/pugiXML/*.d)
-
-%.d: %.cpp
- $(SHELL) -ec '$(CXX) -M $(CPPFLAGS) $< | tr -d "\\\\\n" | sed -e "s|$(*F).o|$(*D)/& $@|" -e "s|: \(.*\)|: \$$\(wildcard \1\)|" > $@'
-
-.PHONY: clean
-
-clean:
- rm -f src/*.[do] src/components/*.[do] src/pugiXML/*.[do] $(EXECUTABLE)
-
diff --git a/Makefile.x86 b/Makefile.x86
deleted file mode 100644
index 1217a1f00..000000000
--- a/Makefile.x86
+++ /dev/null
@@ -1,4 +0,0 @@
-CPPFLAGS=-I/usr/include/freetype2 -I/usr/include/SDL -D_DESKTOP_
-LIBS=-lGL -lfreetype -lSDL -lboost_system -lboost_filesystem -lfreeimage -lSDL_mixer
-
-include Makefile.common