diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3cdad79a5..be0c8bbbc8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,10 +33,10 @@ endif()
 include(FindPkgConfig REQUIRED)
 
 # Various compile flags
-add_definitions(-msse2 -Wall)
+add_definitions(-msse2 -Wall -Wno-unused-result)
 
 # gcc uses some optimizations which might break stuff without this flag
-add_definitions(-fno-strict-aliasing)
+add_definitions(-fno-strict-aliasing -fno-exceptions)
 
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG(-fvisibility-inlines-hidden VISIBILITY_INLINES_HIDDEN)
@@ -88,7 +88,10 @@ include(FindOpenGL REQUIRED)
 
 include(FindALSA OPTIONAL)
 include(FindOpenAL OPTIONAL)
-include(FindwxWidgets OPTIONAL)
+set(DISABLE_WX FALSE CACHE BOOL "Disable wxWidgets (use CLI interface)")
+if(NOT DISABLE_WX)
+	include(FindwxWidgets OPTIONAL)
+endif(NOT DISABLE_WX)
 if(UNIX)
 	include(FindX11 REQUIRED)
 endif(UNIX)
diff --git a/Externals/Lua/CMakeLists.txt b/Externals/Lua/CMakeLists.txt
index 9bec9d8944..0665cc6686 100644
--- a/Externals/Lua/CMakeLists.txt
+++ b/Externals/Lua/CMakeLists.txt
@@ -1,8 +1,6 @@
-# TODO?
-#luaenv = env.Clone()
-#
-#if not sys.platform == 'win32':
-#    luaenv['CPPDEFINES'].append('LUA_USE_LINUX')    # Also works for OS X
+if(UNIX)
+	add_definitions(-DLUA_USE_LINUX)
+endif(UNIX)
 
 set(SRCS	lapi.c
 			lauxlib.c
diff --git a/SConstruct b/SConstruct
index ea6978b175..9307cfa773 100644
--- a/SConstruct
+++ b/SConstruct
@@ -36,7 +36,6 @@ if env['PLATFORM'] == 'posix': vars.AddVariables(
                  '/usr', PathVariable.PathAccept),
     PathVariable('userdir', 'Set the name of the user data directory in home',
                  '.dolphin-emu', PathVariable.PathAccept),
-    BoolVariable('opencl', 'Build with OpenCL', False),
     EnumVariable('pgo', 'Profile-Guided Optimization (generate or use)', 'none',
                  allowed_values = ('none', 'generate', 'use'), ignorecase = 2),
     BoolVariable('shared_glew', 'Use system shared libGLEW', True),
@@ -275,11 +274,9 @@ else:
         print "Must have CgGL to build"
         Exit(1)
 
-    if env['opencl']:
-        env['HAVE_OPENCL'] = conf.CheckPKG('OpenCL')
-        conf.Define('HAVE_OPENCL', env['HAVE_OPENCL'])
-    else:
-        env['HAVE_OPENCL'] = 0
+    env['HAVE_OPENCL'] = int(conf.CheckPKG('OpenCL') and \
+                         conf.CheckCXXHeader("CL/cl.h"))
+    conf.Define('HAVE_OPENCL', env['HAVE_OPENCL'])
 
     # PGO - Profile Guided Optimization
     if env['pgo'] == 'generate':
diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
index 8f89e29939..9a99df2e66 100644
--- a/Source/Core/DolphinWX/CMakeLists.txt
+++ b/Source/Core/DolphinWX/CMakeLists.txt
@@ -8,7 +8,8 @@ set(LIBS	core
 			common
 			lua
 			z
-			sfml-network)
+			sfml-network
+			wiiuse)
 
 if(wxWidgets_FOUND)
 	set(MEMCARDSRCS	Src/MemcardManager.cpp
diff --git a/Source/Core/DolphinWX/Src/MainNoGUI.cpp b/Source/Core/DolphinWX/Src/MainNoGUI.cpp
index 171fc2281d..c07ee7f379 100644
--- a/Source/Core/DolphinWX/Src/MainNoGUI.cpp
+++ b/Source/Core/DolphinWX/Src/MainNoGUI.cpp
@@ -42,6 +42,7 @@
 #include "cmdline.h"
 #include "Thread.h"
 #include "PowerPC/PowerPC.h"
+#include "HW/Wiimote.h"
 
 #include "PluginManager.h"
 #include "ConfigManager.h"