Преглед изворни кода

Updated mingw toolchain to 64-bit 4.8.1.

bkaradzic пре 12 година
родитељ
комит
83a178dc57
3 измењених фајлова са 3 додато и 5 уклоњено
  1. 0 1
      include/compat/mingw/unordered_map
  2. 0 1
      include/compat/mingw/unordered_set
  3. 3 3
      premake/toolchain.lua

+ 0 - 1
include/compat/mingw/unordered_map

@@ -1 +0,0 @@
-#include <tr1/unordered_map>

+ 0 - 1
include/compat/mingw/unordered_set

@@ -1 +0,0 @@
-#include <tr1/unordered_set>

+ 3 - 3
premake/toolchain.lua

@@ -110,8 +110,8 @@ function toolchain(_buildDir, _libDir)
 		end
 		end
 
 
 		if "mingw" == _OPTIONS["gcc"] then
 		if "mingw" == _OPTIONS["gcc"] then
-			premake.gcc.cc = "$(MINGW)/bin/mingw32-gcc"
-			premake.gcc.cxx = "$(MINGW)/bin/mingw32-g++"
+			premake.gcc.cc = "$(MINGW)/bin/x86_64-w64-mingw32-gcc"
+			premake.gcc.cxx = "$(MINGW)/bin/x86_64-w64-mingw32-g++"
 			premake.gcc.ar = "$(MINGW)/bin/ar"
 			premake.gcc.ar = "$(MINGW)/bin/ar"
 			location (_buildDir .. "projects/" .. _ACTION .. "-mingw")
 			location (_buildDir .. "projects/" .. _ACTION .. "-mingw")
 		end
 		end
@@ -278,7 +278,7 @@ function toolchain(_buildDir, _libDir)
 		defines { "WIN32" }
 		defines { "WIN32" }
 		includedirs { bxDir .. "include/compat/mingw" }
 		includedirs { bxDir .. "include/compat/mingw" }
 		buildoptions {
 		buildoptions {
-			"-std=c++0x",
+			"-std=c++11",
 			"-U__STRICT_ANSI__",
 			"-U__STRICT_ANSI__",
 			"-Wunused-value",
 			"-Wunused-value",
 			"-fdata-sections",
 			"-fdata-sections",