diff --git a/3ds/bannertool-linux32 b/3ds/bannertool-linux32
new file mode 100755
index 0000000..7c97143
Binary files /dev/null and b/3ds/bannertool-linux32 differ
diff --git a/3ds/bannertool-linux b/3ds/bannertool-linux64
similarity index 100%
rename from 3ds/bannertool-linux
rename to 3ds/bannertool-linux64
diff --git a/3ds/bannertool.exe b/3ds/bannertool32.exe
similarity index 87%
rename from 3ds/bannertool.exe
rename to 3ds/bannertool32.exe
index eb08ba2..232b1ca 100755
Binary files a/3ds/bannertool.exe and b/3ds/bannertool32.exe differ
diff --git a/3ds/bannertool64.exe b/3ds/bannertool64.exe
new file mode 100755
index 0000000..5b28272
Binary files /dev/null and b/3ds/bannertool64.exe differ
diff --git a/3ds/citra/citra-linux b/3ds/citra/citra-linux
deleted file mode 100755
index 1313952..0000000
Binary files a/3ds/citra/citra-linux and /dev/null differ
diff --git a/3ds/citra/citra-linux64 b/3ds/citra/citra-linux64
new file mode 100755
index 0000000..04f1aab
Binary files /dev/null and b/3ds/citra/citra-linux64 differ
diff --git a/3ds/citra/citra-mac b/3ds/citra/citra-mac
index 17ab3e4..dd59461 100755
Binary files a/3ds/citra/citra-mac and b/3ds/citra/citra-mac differ
diff --git a/3ds/citra/citra.exe b/3ds/citra/citra.exe
deleted file mode 100644
index 3d4bbb4..0000000
Binary files a/3ds/citra/citra.exe and /dev/null differ
diff --git a/3ds/citra/citra64.exe b/3ds/citra/citra64.exe
new file mode 100755
index 0000000..9b6d8f5
Binary files /dev/null and b/3ds/citra/citra64.exe differ
diff --git a/3ds/citra/libs/libSDL2-2.0.0.dylib b/3ds/citra/libs/libSDL2-2.0.0.dylib
new file mode 100644
index 0000000..e62dbe5
Binary files /dev/null and b/3ds/citra/libs/libSDL2-2.0.0.dylib differ
diff --git a/3ds/citra/libs/libpng16.16.dylib b/3ds/citra/libs/libpng16.16.dylib
new file mode 100644
index 0000000..0c8dcf4
Binary files /dev/null and b/3ds/citra/libs/libpng16.16.dylib differ
diff --git a/3ds/makerom-linux32 b/3ds/makerom-linux32
new file mode 100755
index 0000000..d52be43
Binary files /dev/null and b/3ds/makerom-linux32 differ
diff --git a/3ds/makerom-linux b/3ds/makerom-linux64
similarity index 99%
rename from 3ds/makerom-linux
rename to 3ds/makerom-linux64
index 3f03bc7..57d0a34 100755
Binary files a/3ds/makerom-linux and b/3ds/makerom-linux64 differ
diff --git a/3ds/makerom.exe b/3ds/makerom32.exe
similarity index 99%
rename from 3ds/makerom.exe
rename to 3ds/makerom32.exe
index 20da604..671162a 100755
Binary files a/3ds/makerom.exe and b/3ds/makerom32.exe differ
diff --git a/3ds/makerom64.exe b/3ds/makerom64.exe
new file mode 100755
index 0000000..38ed1f4
Binary files /dev/null and b/3ds/makerom64.exe differ
diff --git a/make_base b/make_base
index f6be7ec..4104606 100644
--- a/make_base
+++ b/make_base
@@ -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