diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c6e2cb..bfc54d8 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,18 +5,19 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${PROJECT_SOURCE_DIR}/deps/include")
 
-    set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/deps/lib/linux-gcc/x64")
-if(UNIX AND CMAKE_COMPILER_IS_GNUCXX)
-elseif(MINGW)
+
+if(MINGW)
     set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/deps/lib/mingw/x64")
 elseif(MSVC)
     set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/deps/lib/msvc12/x64")
+else()
+    set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/deps/lib/linux-gcc/x64")
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fpermissive")
     # Needed to link with debug version of bgfx
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -ldl")
+    #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -ldl")
 endif()
 
 set(BUILD_SHARED_LIBS OFF)
diff --git a/include/Core/BGFXRenderer.h b/include/Core/BGFXRenderer.h
old mode 100644
new mode 100755
index 4ed22a6..aa61bf2
--- a/include/Core/BGFXRenderer.h
+++ b/include/Core/BGFXRenderer.h
@@ -63,10 +63,18 @@ public:
 
         // Initialize bgfx
         bgfx::glfwSetWindow(m_Window);
-        bgfx::init();
+        bgfx::init(bgfx::RendererType::OpenGL, BGFX_PCI_ID_NONE, 0, nullptr, nullptr);
         bgfx::reset(m_Resolution.Width, m_Resolution.Height, BGFX_RESET_NONE);
         bgfx::setDebug(BGFX_DEBUG_TEXT);
         bgfx::setViewClear(0, BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH, 0x303030ff, 1.0f, 0);
+
+        std::stringstream ss;
+        ss << bgfx::getRendererName(bgfx::getRendererType());
+#ifdef DEBUG
+        ss << " DEBUG";
+#endif
+        LOG_INFO(ss.str().c_str());
+        glfwSetWindowTitle(m_Window, ss.str().c_str());
     }
 
     void Draw(RenderQueueCollection& rq)
diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt
old mode 100644
new mode 100755
index 407bac1..1c4123d
--- a/src/game/CMakeLists.txt
+++ b/src/game/CMakeLists.txt
@@ -7,7 +7,6 @@ find_package(Boost REQUIRED COMPONENTS system filesystem thread chrono)
 find_package(assimp REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(PNG REQUIRED)
-find_package(X11 REQUIRED)
 find_package(BGFX REQUIRED)
 # GLM
 
@@ -20,7 +19,6 @@ include_directories(
     ${Boost_INCLUDE_DIRS}
     ${assimp_INCLUDE_DIRS}
     ${PNG_INCLUDE_DIRS}
-	${X11_INCLUDE_DIR}
 	${BGFX_INCLUDE_DIRS}
 )
 
@@ -72,7 +70,6 @@ target_link_libraries(game
     ${Boost_LIBRARIES}
     ${assimp_LIBRARIES}
     ${PNG_LIBRARIES}
-	${X11_LIBRARIES}
 	${BGFX_LIBRARIES}
 )