diff --git a/.gitignore b/.gitignore
index 1303bc309..4d087d107 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,9 @@
 emulationstation
 
 #build directory
-EmulationStation_vs2010
\ No newline at end of file
+EmulationStation_vs2010
+build
+Debug
+Release
+MinSizeRel
+RelWithDebInfo
\ No newline at end of file
diff --git a/CMake/Packages/FindOpenGLES.cmake b/CMake/Packages/FindOpenGLES.cmake
index f790c642b..535cdb15a 100644
--- a/CMake/Packages/FindOpenGLES.cmake
+++ b/CMake/Packages/FindOpenGLES.cmake
@@ -24,12 +24,11 @@ IF (WIN32)
 
   ELSE (CYGWIN)
 
-    IF(BORLAND)
+    IF(MSVC)
+      #The user hast to provide this atm. GLES can be emulated via Desktop OpenGL
+      #using the ANGLE project found at: http://code.google.com/p/angleproject/
       SET (OPENGLES_gl_LIBRARY import32 CACHE STRING "OpenGL ES 1.x library for win32")
-    ELSE(BORLAND)
-          #MS compiler - todo - fix the following line:
-      SET (OPENGLES_gl_LIBRARY ${OGRE_SOURCE_DIR}/Dependencies/lib/release/libgles_cm.lib CACHE STRING "OpenGL ES 1.x library for win32")
-    ENDIF(BORLAND)
+    ENDIF(MSVC)
 
   ENDIF (CYGWIN)
 
@@ -47,6 +46,7 @@ ELSE (WIN32)
       /usr/openwin/share/include
       /opt/graphics/OpenGL/include /usr/X11R6/include
       /usr/include
+      /opt/vc/include
     )
 
     FIND_LIBRARY(OPENGLES_gl_LIBRARY
@@ -55,6 +55,7 @@ ELSE (WIN32)
             /usr/openwin/lib
             /usr/shlib /usr/X11R6/lib
             /usr/lib
+            /opt/vc/lib
     )
 
     # On Unix OpenGL most certainly always requires X11.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38b680ff2..9e6e04a4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,19 +164,29 @@ endif()
 
 #-------------------------------------------------------------------------------
 #define libraries and directories
+if(DEFINED BCMHOST)
+    link_directories(
+        ${Boost_LIBRARY_DIRS}
+        "/opt/vc/lib"
+    )
+else()
+    link_directories(
+        ${Boost_LIBRARY_DIRS}
+    )
+endif()
+
 set(ES_LIBRARIES
-	freetype
-	freeimage
-	SDL
-	boost_filesystem
-	boost_system
+    ${Boost_LIBRARIES}
+    ${FREETYPE_LIBRARIES}
+    ${FreeImage_LIBRARIES}
+	${SDL_LIBRARY}
+    ${SDLMAIN_LIBRARY}
 )
 
 if(DEFINED BCMHOST)
     LIST(APPEND ES_LIBRARIES
         bcm_host
         EGL
-        GLESv1_CM
     )
 else()
     if(${GLSystem} MATCHES "Desktop OpenGL")
@@ -190,10 +200,6 @@ else()
     endif()
 endif()
 
-if(DEFINED BCMHOST)
-    LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} "/opt/vc/lib")
-endif()
-
 #-------------------------------------------------------------------------------
 #set up build directories
 set(dir ${CMAKE_CURRENT_SOURCE_DIR})