summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--makefile24
-rw-r--r--scripts/genie.lua13
-rw-r--r--scripts/toolchain.lua71
3 files changed, 1 insertions, 107 deletions
diff --git a/makefile b/makefile
index 0c8f5e92ebd..5d85764e29a 100644
--- a/makefile
+++ b/makefile
@@ -1633,30 +1633,6 @@ endif
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/$(MAKETYPE)-rpi config=$(CONFIG)
#-------------------------------------------------
-# gmake-ci20
-#-------------------------------------------------
-
-$(PROJECTDIR_SDL)/$(MAKETYPE)-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 $(MAKETYPE)
-
-.PHONY: ci20
-ci20: generate $(PROJECTDIR_SDL)/$(MAKETYPE)-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)/$(MAKETYPE)-ci20 config=$(CONFIG) precompile
- $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/$(MAKETYPE)-ci20 config=$(CONFIG)
-
-#-------------------------------------------------
# cmake
#-------------------------------------------------
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 8886fe2d0e6..e76a2c1c3d1 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -151,7 +151,6 @@ newoption {
{ "haiku", "Haiku" },
{ "solaris", "Solaris SunOS" },
{ "rpi", "Raspberry Pi" },
- { "ci20", "Creator-Ci20" },
},
}
@@ -1224,7 +1223,7 @@ configuration { "android-arm64" }
"-Wno-asm-operand-widths",
}
-configuration { "linux-* or rpi or ci20"}
+configuration { "linux-* or rpi"}
links {
"dl",
"rt",
@@ -1252,16 +1251,6 @@ configuration { "rpi" }
}
-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 8099f50baf2..faf0ea24664 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -38,7 +38,6 @@ newoption {
{ "osx-clang", "OSX (Clang compiler)" },
{ "rpi", "RaspberryPi" },
{ "solaris", "Solaris" },
- { "ci20", "Creator-Ci20" },
},
}
@@ -231,16 +230,6 @@ 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.")
@@ -294,10 +283,6 @@ function toolchain(_buildDir, _subDir)
if "rpi" == _OPTIONS["gcc"] then
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-rpi")
end
-
- if "ci20" == _OPTIONS["gcc"] then
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-ci20")
- end
elseif _ACTION == "vs2015" or _ACTION == "vs2015-fastbuild" then
if (_ACTION .. "-clang") == _OPTIONS["vs"] then
@@ -579,62 +564,6 @@ 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" }
buildoptions {
"-femulated-tls",