o switch to v46

tools/bsnes/lib/nall/Makefile.string

@@ -1,63 +0,0 @@
-# Makefile.string
-# author: byuu
-# license: public domain
-
-[A-Z] = A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
-[a-z] = a b c d e f g h i j k l m n o p q r s t u v w x y z
-[0-9] = 0 1 2 3 4 5 6 7 8 9
-[markup] = ` ~ ! @ \# $$ % ^ & * ( ) - _ = + [ { ] } \ | ; : ' " , < . > / ?
-[all] = $([A-Z]) $([a-z]) $([0-9]) $([markup])
-[space] := 
-[space] +=
-
-#####
-# function strtr(source, from, to)
-#####
-strtr = \
-  $(eval __temp := $1) \
-  $(strip \
-    $(foreach c, \
-      $(join $(addsuffix :,$2),$3), \
-      $(eval __temp := \
-        $(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)),$(__temp)) \
-      ) \
-    ) \
-    $(__temp) \
-  )
-
-#####
-# function strupper(source)
-#####
-strupper = $(call strtr,$1,$([a-z]),$([A-Z]))
-
-#####
-# function strlower(source)
-#####
-strlower = $(call strtr,$1,$([A-Z]),$([a-z]))
-
-#####
-# function strlen(source)
-#####
-strlen = \
-  $(eval __temp := $(subst $([space]),_,$1)) \
-  $(words \
-    $(strip \
-      $(foreach c, \
-        $([all]), \
-        $(eval __temp := \
-          $(subst $c,$c ,$(__temp)) \
-        ) \
-      ) \
-      $(__temp) \
-    ) \
-  )
-
-#####
-# function streq(source)
-#####
-streq = $(if $(filter-out xx,x$(subst $1,,$2)$(subst $2,,$1)x),,1)
-
-#####
-# function strne(source)
-#####
-strne = $(if $(filter-out xx,x$(subst $1,,$2)$(subst $2,,$1)x),1,)

tools/bsnes/lib/nall/file.hpp

@@ -130,6 +130,21 @@ namespace nall {
       return false;
     }
 
+    static unsigned size(const char *fn) {
+      #if !defined(_WIN32)
+      FILE *fp = fopen(fn, "rb");
+      #else
+      FILE *fp = _wfopen(utf16_t(fn), L"rb");
+      #endif
+      unsigned filesize = 0;
+      if(fp) {
+        fseek(fp, 0, SEEK_END);
+        filesize = ftell(fp);
+        fclose(fp);
+      }
+      return filesize;
+    }
+
     bool open() {
       return fp;
     }

tools/bsnes/lib/nall/function.hpp

@@ -133,7 +133,12 @@ namespace nall {
     R operator()(PL) const { return data.fn_call(data cat(CL)); }
     operator bool() const { return data.fn_call; }
 
-    function() { data.fn_call = 0; }
+    function() { data.fn_call = 0; }
+
+    function(void *fn) {
+      data.fn_call = &fn_call_global;
+      data.fn_global = (R (*)(PL))fn;
+    }
 
     function(R (*fn)(PL)) {
       data.fn_call = &fn_call_global;
@@ -155,8 +160,9 @@ namespace nall {
       assert(sizeof data.fn_member >= sizeof fn);
       data.object = obj;
     }
-
-    function &operator=(const function &source) { memcpy(&data, &source.data, sizeof(data_t)); return *this; }
+
+    function& operator=(void *fn) { return operator=(function(fn)); }
+    function& operator=(const function &source) { memcpy(&data, &source.data, sizeof(data_t)); return *this; }
     function(const function &source) { memcpy(&data, &source.data, sizeof(data_t)); }
   };
 

tools/bsnes/lib/nall/platform.hpp

@@ -20,6 +20,7 @@
   #include <io.h>
   #include <direct.h>
   #include <shlobj.h>
+  #undef interface
 #else
   #include <unistd.h>
   #include <pwd.h>
@@ -73,3 +74,4 @@
 #endif
 
 #endif
+

tools/bsnes/lib/nall/utf8.hpp

@@ -11,6 +11,7 @@
 #undef  NOMINMAX
 #define NOMINMAX
 #include <windows.h>
+#undef interface
 
 namespace nall {
   //UTF-8 to UTF-16