diff --git a/makefile b/makefile
index 58bcb5c5a35..d248728a475 100644
--- a/makefile
+++ b/makefile
@@ -1345,6 +1345,30 @@ endif
 	$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/gmake-rpi config=$(CONFIG) precompile
 	$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/gmake-rpi config=$(CONFIG)
 
+#-------------------------------------------------
+# gmake-ci20
+#-------------------------------------------------
+
+$(PROJECTDIR_SDL)/gmake-ci20/Makefile: makefile $(SCRIPTS) $(GENIE)
+ifndef MIPS_LINUXGNU_ROOT
+	$(error MIPS_LINUXGNU_ROOT is not set)
+endif
+ifndef CI20_SYSROOT
+	$(error CI20_SYSROOT is not set)
+endif
+	$(SILENT) $(GENIE) $(PARAMS) --gcc=ci20 --gcc_version=4.9.2 --osd=sdl --targetos=ci20 --targetos=ci20 --NO_USE_MIDI=1  --PLATFORM=arm --NOASM=1 --USE_QTDEBUG=0 --SDL_INSTALL_ROOT=$(RASPBERRY_SYSROOT)/usr  gmake  
+
+.PHONY: ci20
+ci20: generate $(PROJECTDIR_SDL)/gmake-ci20/Makefile
+ifndef MIPS_LINUXGNU_ROOT
+	$(error MIPS_LINUXGNU_ROOT is not set)
+endif
+ifndef CI20_SYSROOT
+	$(error CI20_SYSROOT is not set)
+endif
+	$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/gmake-ci20 config=$(CONFIG) precompile
+	$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/gmake-ci20 config=$(CONFIG)
+
 #-------------------------------------------------
 # cmake
 #-------------------------------------------------
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 5a7748bd5cb..219b493f135 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -115,6 +115,7 @@ newoption {
 		{ "solaris",       "Solaris SunOS"          },
 		{ "steamlink",     "Steam Link"             },
 		{ "rpi",           "Raspberry Pi"           },
+		{ "ci20",          "Creator-Ci20"           },
 	},
 }
 
@@ -1101,7 +1102,7 @@ configuration { "pnacl" }
 	}
 	archivesplit_size "20"
 
-configuration { "linux-* or rpi"}
+configuration { "linux-* or rpi or ci20"}
 		links {
 			"dl",
 			"rt",
@@ -1139,6 +1140,17 @@ configuration { "rpi" }
 		"pthread",
 	}	
 
+
+configuration { "ci20" }
+	links {
+ 		"SDL2",
+		"asound",
+		"fontconfig",
+		"freetype",
+		"pthread",
+	}	
+
+
 configuration { "osx* or xcode4" }
 		links {
 			"pthread",
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index b23ea3f597d..968d974caa3 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -37,6 +37,7 @@ newoption {
 		{ "rpi",           "RaspberryPi"            },
 		{ "solaris", 	   "Solaris"                },
 		{ "steamlink", 	   "Steam Link"             },
+		{ "ci20",          "Creator-Ci20"           },
 	},
 }
 
@@ -266,6 +267,16 @@ function toolchain(_buildDir, _subDir)
 			location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-rpi")
 		end
 
+		if "ci20" == _OPTIONS["gcc"] then
+			if not os.getenv("MIPS_LINUXGNU_ROOT") then
+				print("Set MIPS_LINUXGNU_ROOT envrionment variable.")
+			end
+			premake.gcc.cc  = "$(MIPS_LINUXGNU_ROOT)/bin/mips-mti-linux-gnu-gcc"
+			premake.gcc.cxx = "$(MIPS_LINUXGNU_ROOT)/bin/mips-mti-linux-gnu-g++"
+			premake.gcc.ar  = "$(MIPS_LINUXGNU_ROOT)/bin/mips-mti-linux-gnu-ar"
+			location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-ci20")
+		end
+
 		if "mingw32-gcc" == _OPTIONS["gcc"] then
 			if not os.getenv("MINGW32") then
 				print("Set MINGW32 envrionment variable.")
@@ -353,6 +364,10 @@ function toolchain(_buildDir, _subDir)
 			location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-rpi")
 		end
 
+		if "ci20" == _OPTIONS["gcc"] then
+			location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-ci20")
+		end
+
 	elseif _ACTION == "vs2013" or _ACTION == "vs2015" then
 
 		if (_ACTION .. "-clang") == _OPTIONS["vs"] then
@@ -572,6 +587,62 @@ function toolchain(_buildDir, _subDir)
 	configuration { "rpi", "Debug" }
 		targetdir (_buildDir .. "rpi/bin/Debug")
 
+	configuration { "ci20" }
+		objdir ( _buildDir .. "ci20/obj")
+		includedirs {
+			"$(CI20_SYSROOT)/mipsel-r2-hard/usr/include/c++/4.9",
+			"$(CI20_SYSROOT)/mipsel-r2-hard/usr/include/mipsel-linux-gnu/c++/4.9",
+			"$(CI20_SYSROOT)/mipsel-r2-hard/usr/include/c++/4.9/backward",
+			"$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib/gcc/mipsel-linux-gnu/4.9/include",
+ 			"$(CI20_SYSROOT)/mipsel-r2-hard/usr/local/include",
+			"$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib/gcc/mipsel-linux-gnu/4.9/include-fixed",
+			"$(CI20_SYSROOT)/mipsel-r2-hard/usr/include/mipsel-linux-gnu",
+			"$(CI20_SYSROOT)/mipsel-r2-hard/usr/include",			
+		}
+		links {
+			"c",
+			"dl",
+			"m",
+			"gcc",
+			"stdc++",
+			"gcc_s",
+		}
+		
+		buildoptions {
+			"--sysroot=$(CI20_SYSROOT)",
+			"-Wno-pragmas",
+			"-Wno-undef",
+			"-EL",
+			"-mel",
+			"-march=mips32r2",
+			"-mllsc",
+			"-mabi=32",
+		}
+		linkoptions {
+			"--sysroot=$(CI20_SYSROOT)",
+			"-Wl,-rpath=$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib/mipsel-linux-gnu/",
+			"-Wl,-rpath=$(CI20_SYSROOT)/mipsel-r2-hard/lib/mipsel-linux-gnu/",
+			"-nostdlib",
+			"-EL",
+			"-mel",
+			"-march=mips32r2",
+			"-mllsc",
+			"-mabi=32",
+			"$(MIPS_LINUXGNU_ROOT)/lib/gcc/mips-mti-linux-gnu/4.9.2/mipsel-r2-hard/lib/crtbegin.o",
+			"$(MIPS_LINUXGNU_ROOT)/lib/gcc/mips-mti-linux-gnu/4.9.2/mipsel-r2-hard/lib/crtend.o",
+			"-L$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib/gcc/mipsel-linux-gnu/4.9",
+			"-L$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib/mipsel-linux-gnu",
+			"-L$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib",
+			"-L$(CI20_SYSROOT)/mipsel-r2-hard/lib/mipsel-linux-gnu",
+			"-L$(CI20_SYSROOT)/mipsel-r2-hard/lib",
+		}
+
+	configuration { "ci20", "Release" }
+		targetdir (_buildDir .. "ci20/bin/Release")
+
+	configuration { "ci20", "Debug" }
+		targetdir (_buildDir .. "ci20/bin/Debug")
+
 	configuration { "mingw-clang" }
 		linkoptions {
 			"-Wl,--allow-multiple-definition",