Merge branch 'master' into windows

gameui/wscript

@@ -13,6 +13,7 @@ def options(opt):
 
 def configure(conf):
 	conf.define('GAMEUI_EXPORTS',1)
+	conf.define('NO_STEAM',1)
 	conf.define('VERSION_SAFE_STEAM_API_INTERFACES',1)
 
 def build(bld):
@@ -87,6 +88,7 @@ def build(bld):
 		'OptionsSubGame.cpp',
 		'OptionsSubKeyboard.cpp',
 		'OptionsSubMouse.cpp',
+		'OptionsSubTouch.cpp',
 		'OptionsSubMultiplayer.cpp',
 		'OptionsSubPortal.cpp',
 		'OptionsSubVideo.cpp',