Fix the build.

This commit is contained in:
Robbbert 2015-09-14 10:43:49 +10:00
parent 1a7f8ce3ec
commit 884e4460ae

View File

@ -195,14 +195,9 @@ function toolchain(_buildDir, _subDir)
end
premake.gcc.cc = "$(MINGW32)/bin/i686-w64-mingw32-gcc"
premake.gcc.cxx = "$(MINGW32)/bin/i686-w64-mingw32-g++"
-- lto docs say to use gcc-ar so that plugin is completely setup, but this doesn't work in Windows with the current buildtool's version of gcc-ar.exe
-- if you are using LTO=1 you must have GCC 5.0+
if _OPTIONS["LTO"]=="1" then
premake.gcc.ar = "$(MINGW32)/bin/i686-w64-mingw32-gcc-ar"
else
premake.gcc.ar = "$(MINGW32)/bin/i686-w64-mingw32-ar"
end
premake.gcc.ar = "$(MINGW32)/bin/ar"
-- lto docs say to use gcc-ar so that plugin is completely setup, but this doesn't work in windows with the current build tools' copy of gcc-ar.exe
-- premake.gcc.ar = "$(MINGW32)/bin/gcc-ar"
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-mingw32-gcc")
end
@ -212,15 +207,9 @@ function toolchain(_buildDir, _subDir)
end
premake.gcc.cc = "$(MINGW64)/bin/x86_64-w64-mingw32-gcc"
premake.gcc.cxx = "$(MINGW64)/bin/x86_64-w64-mingw32-g++"
-- lto docs say to use gcc-ar so that plugin is completely setup, but this doesn't work in Windows with the current buildtool's version of gcc-ar.exe
-- if you are using LTO=1 you must have GCC 5.0+
if _OPTIONS["LTO"]=="1" then
premake.gcc.ar = "$(MINGW64)/bin/x86_64-w64-mingw32-gcc-ar"
else
premake.gcc.ar = "$(MINGW64)/bin/x86_64-w64-mingw32-ar"
end
premake.gcc.ar = "$(MINGW64)/bin/ar"
-- lto docs say to use gcc-ar so that plugin is completely setup, but this doesn't work in windows with the current build tools' copy of gcc-ar.exe
-- premake.gcc.ar = "$(MINGW64)/bin/gcc-ar"
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-mingw64-gcc")
end