Update tools.

2016-05-28 18:29:47 -07:00 · 2016-05-28 18:29:47 -07:00 · d84c344339
commit d84c344339
parent 3908147305
16 changed files with 5 additions and 10 deletions
--- a/3ds/bannertool-linux32
+++ b/3ds/bannertool-linux32
--- a/3ds/bannertool-linux64
+++ b/3ds/bannertool-linux64
--- a/3ds/bannertool32.exe
+++ b/3ds/bannertool32.exe
--- a/3ds/bannertool64.exe
+++ b/3ds/bannertool64.exe
--- a/3ds/citra/citra-linux
+++ b/3ds/citra/citra-linux
--- a/3ds/citra/citra-linux64
+++ b/3ds/citra/citra-linux64
--- a/3ds/citra/citra-mac
+++ b/3ds/citra/citra-mac
--- a/3ds/citra/citra.exe
+++ b/3ds/citra/citra.exe
--- a/3ds/citra/citra64.exe
+++ b/3ds/citra/citra64.exe
--- a/3ds/citra/libs/libSDL2-2.0.0.dylib
+++ b/3ds/citra/libs/libSDL2-2.0.0.dylib
--- a/3ds/citra/libs/libpng16.16.dylib
+++ b/3ds/citra/libs/libpng16.16.dylib
--- a/3ds/makerom-linux32
+++ b/3ds/makerom-linux32
--- a/3ds/makerom-linux64
+++ b/3ds/makerom-linux64
--- a/3ds/makerom32.exe
+++ b/3ds/makerom32.exe
--- a/3ds/makerom64.exe
+++ b/3ds/makerom64.exe
--- a/15
+++ b/15
@ -198,22 +198,17 @@ else
        endif
    else
        ifeq ($(TARGET),$(filter $(TARGET),WIN32 WIN64))
-            UNAME_P := $(shell uname -p)
-            ifeq ($(UNAME_P),x86_64)
-                AR := x86_64-w64-mingw32-ar
-                AS := x86_64-w64-mingw32-as
-                CC := x86_64-w64-mingw32-gcc
-                CXX := x86_64-w64-mingw32-g++
-            else
+            ifeq ($(TARGET),WIN32)
                AR := i686-w64-mingw32-ar
                AS := i686-w64-mingw32-as
                CC := i686-w64-mingw32-gcc
                CXX := i686-w64-mingw32-g++
-            endif
-
-            ifeq ($(TARGET),WIN32)
                COMMON_CC_FLAGS += -m32
            else ifeq ($(TARGET),WIN64)
+                AR := x86_64-w64-mingw32-ar
+                AS := x86_64-w64-mingw32-as
+                CC := x86_64-w64-mingw32-gcc
+                CXX := x86_64-w64-mingw32-g++
                COMMON_CC_FLAGS += -m64
            endif