  }
  
  
-Index: dyncall/buildsys/gmake/os/darwin.gmake
-===================================================================
---- dyncall/buildsys/gmake/os/darwin.gmake	(revision 1386)
-+++ dyncall/buildsys/gmake/os/darwin.gmake	(working copy)
-@@ -23,7 +23,8 @@
- LIBTOOL_STATIC=libtool -static -o $@ $^
- 
- ifdef BUILD_ARCH_universal
--TARGET_ARCH?=-arch i386 -arch ppc -arch x86_64
-+#TARGET_ARCH?=-arch i386 -arch ppc -arch x86_64
-+TARGET_ARCH?=-arch x86_64 -arch i386 
- endif
- 
- ifdef BUILD_ARCH_ppc32
-Index: dyncall/buildsys/gmake/tool/gcc.gmake
-===================================================================
---- dyncall/buildsys/gmake/tool/gcc.gmake	(revision 1386)
-+++ dyncall/buildsys/gmake/tool/gcc.gmake	(working copy)
-@@ -86,6 +86,13 @@
- 
- #	$(CC) -MM -MT $@ $(CPPFLAGS) $(CFLAGS) $< > $(BUILD_DIR)/$*.d
- 
-+# --- Compile Objective-C ---------------------------------------------------------------
-+
-+$(BUILD_DIR)/%.o: %.m
-+	$(COMPILE.c) $< $(OUTPUT_OPTION)
-+
-+#	$(CC) -MM -MT $@ $(CPPFLAGS) $(CFLAGS) $< > $(BUILD_DIR)/$*.d
-+
- # --- Compile C++ -------------------------------------------------------------
- 
- $(BUILD_DIR)/%.o: %.cpp
+Index: dyncall/dynload/dynload_windows.c
+===================================================================
+--- dyncall/dynload/dynload_windows.c	(revision 1385)
++++ dyncall/dynload/dynload_windows.c	(working copy)
+@@ -40,7 +40,9 @@
+ DLLib* dlLoadLibrary(const char* libPath)
+ {
+   if (libPath != NULL) {
+-    return (DLLib*) LoadLibraryA(libPath);
++    return (DLLib*) LoadLibraryW((wchar_t*)(void*)libPath);
++  	// http://msdn.microsoft.com/en-us/library/windows/desktop/ms684179(v=vs.85).aspx
++    // return (DLLib*) LoadLibraryExA(libPath, NULL, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_DEFAULT_DIRS);
+     /*return (DLLib*) LoadLibraryA(libPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);*/
+   } else {
+     return (DLLib*) GetModuleHandle(NULL);

Index: dyncall/dynload/dynload_windows.c
===================================================================
--- dyncall/dynload/dynload_windows.c	(revision 1386)
+++ dyncall/dynload/dynload_windows.c	(working copy)
@@ -40,7 +40,9 @@
 DLLib* dlLoadLibrary(const char* libPath)
 {
   if (libPath != NULL) {
-    return (DLLib*) LoadLibraryA(libPath);
+    return (DLLib*) LoadLibraryW((wchar_t*)(void*)libPath);
+  	// http://msdn.microsoft.com/en-us/library/windows/desktop/ms684179(v=vs.85).aspx
+    // return (DLLib*) LoadLibraryExA(libPath, NULL, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_DEFAULT_DIRS);
     /*return (DLLib*) LoadLibraryA(libPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);*/
   } else {
     return (DLLib*) GetModuleHandle(NULL);
Index: dyncall/dynload/dynload_syms_mach-o.c
===================================================================
--- dyncall/dynload/dynload_syms_mach-o.c	(revision 1386)
+++ dyncall/dynload/dynload_syms_mach-o.c	(working copy)
@@ -28,6 +28,7 @@
  dynamic symbol resolver for Mach-O

 		return NULL;
Index: dyncall/dynload/dynload_unix.c
===================================================================
--- dyncall/dynload/dynload_unix.c	(revision 1385)
+++ dyncall/dynload/dynload_unix.c	(working copy)
@@ -40,7 +40,7 @@
 
