diff --git a/CMakeLists.txt b/CMakeLists.txt
index bfc54d8..b979cac 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${PROJECT_SOURCE_DIR}/deps/include")
 
-
 if(MINGW)
     set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/deps/lib/mingw/x64")
 elseif(MSVC)
@@ -16,8 +15,10 @@ 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")
+    if(UNIX)
+        # Needed to link with debug version of bgfx on linux
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -ldl")
+    endif()
 endif()
 
 set(BUILD_SHARED_LIBS OFF)
diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt
index 1c4123d..32c9a03 100755
--- a/src/game/CMakeLists.txt
+++ b/src/game/CMakeLists.txt
@@ -9,6 +9,9 @@ find_package(ZLIB REQUIRED)
 find_package(PNG REQUIRED)
 find_package(BGFX REQUIRED)
 # GLM
+if(UNIX)
+    find_package(X11 REQUIRED)
+endif()
 
 set(INCLUDE_PATH ${CMAKE_SOURCE_DIR}/include)
 include_directories(
@@ -19,6 +22,7 @@ include_directories(
     ${Boost_INCLUDE_DIRS}
     ${assimp_INCLUDE_DIRS}
     ${PNG_INCLUDE_DIRS}
+    ${X11_INCLUDE_DIRS}
 	${BGFX_INCLUDE_DIRS}
 )
 
@@ -62,6 +66,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
 endif()
 
+add_definitions(-DBGFX_CONFIG_RENDERER_OPENGL=33)
+
 add_library(game ${SOURCE_FILES})
 target_link_libraries(game
     ${OPENGL_LIBRARIES}
@@ -70,6 +76,7 @@ target_link_libraries(game
     ${Boost_LIBRARIES}
     ${assimp_LIBRARIES}
     ${PNG_LIBRARIES}
+    ${X11_LIBRARIES}
 	${BGFX_LIBRARIES}
 )