From 19d79eea2e2141e9867ac782c183ba4261c8150c Mon Sep 17 00:00:00 2001
From: jmdejong <jmdejong@users.noreply.github.com>
Date: Sun, 6 Jan 2019 19:35:42 +0100
Subject: [PATCH 01/15] Fix zenity --filename argument

The prefix and path are just concatenated so without this change the argument would be `--filename/path/to/file`.
This is not a valid argument to zenity; it need a `=` character between to make it `--filename=/path/to/file`.
---
 src/nfd_zenity.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nfd_zenity.c b/src/nfd_zenity.c
index 1890eec..1b89037 100644
--- a/src/nfd_zenity.c
+++ b/src/nfd_zenity.c
@@ -92,7 +92,7 @@ static nfdresult_t ZenityCommon(char** command, int commandLen, const char* defa
 {
     if(defaultPath != NULL)
     {
-        char* prefix = "--filename";
+        char* prefix = "--filename=";
         int len = strlen(prefix) + strlen(defaultPath) + 1;
 
         char* tmp = (char*) calloc(len, 1);

From 081cce2903f25e5e9e2727cbdc1b38fb4eed342e Mon Sep 17 00:00:00 2001
From: michael Labbe <mike@frogtoss.com>
Date: Fri, 27 Sep 2019 22:25:52 -0700
Subject: [PATCH 02/15] fix mingw32 compilation

Gotos no longer skip over initialization, could help others
---
 docs/build.md   | 13 ++++++++++++-
 src/nfd_win.cpp | 26 ++++++++++++++------------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/docs/build.md b/docs/build.md
index d6de402..93fb759 100644
--- a/docs/build.md
+++ b/docs/build.md
@@ -26,4 +26,15 @@ After installing SCons, build it with:
 
 ## Compiling with Mingw ##
 
-Use the Makefile in `build/gmake_windows` to build Native File Dialog with mingw.  This is tested against the [msys2 distribution](https://msys2.github.io/).
+Use the Makefile in `build/gmake_windows` to build Native File Dialog with mingw.  Mingw has many distributions and not all of them are reliable.  Here is what worked for me, the primary author of Native File Dialog:
+
+1. Use mingw64, not mingw32.  Downloaded from [sourceforge.net](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/installer/mingw-w64-install.exe/download).
+2. When prompted in the intsaller, install the basic compiler and g++.
+3. Add the installed bin dir to command prompt path.
+4. Run `set CC=g++` to enforce `g++` instead of the default, `cc` for compiling and linking.
+5. In `build/gmake_windows`, run `mingw32-make config=release_x64 clean`.  Running clean ensures no Visual Studio build products conflict which can cause link errors.
+6. Now run `mingw32-make config=release_x64`.
+
+The author has not attempted to build or even install an x86 toolchain for mingw.
+
+If you report an issue, be sure to run make with `verbose=1` so commands are visible.
diff --git a/src/nfd_win.cpp b/src/nfd_win.cpp
index 49ea890..d171856 100644
--- a/src/nfd_win.cpp
+++ b/src/nfd_win.cpp
@@ -4,6 +4,13 @@
   http://www.frogtoss.com/labs
  */
 
+
+#ifdef __MINGW32__
+// Explicitly setting NTDDI version, this is necessary for the MinGW compiler
+#define NTDDI_VERSION NTDDI_VISTA
+#define _WIN32_WINNT _WIN32_WINNT_VISTA
+#endif
+
 #define _CRTDBG_MAP_ALLOC
 #include <stdlib.h>
 #include <crtdbg.h>
@@ -13,12 +20,6 @@
 #define UNICODE
 #endif
 
-#ifdef __MINGW32__
-// Explicitly setting NTDDI version, this is necessary for the MinGW compiler
-#define NTDDI_VERSION NTDDI_VISTA
-#define _WIN32_WINNT _WIN32_WINNT_VISTA
-#endif
-
 #include <wchar.h>
 #include <stdio.h>
 #include <assert.h>
@@ -666,6 +667,7 @@ nfdresult_t NFD_PickFolder(const nfdchar_t *defaultPath,
     nfdchar_t **outPath)
 {
     nfdresult_t nfdResult = NFD_ERROR;
+    DWORD dwOptions = 0;
 
     HRESULT coResult = COMInit();
     if (!COMIsInitialized(coResult))
@@ -676,10 +678,11 @@ nfdresult_t NFD_PickFolder(const nfdchar_t *defaultPath,
 
     // Create dialog
     ::IFileOpenDialog *fileDialog(NULL);
-    if (!SUCCEEDED(CoCreateInstance(CLSID_FileOpenDialog,
-                                    NULL,
-                                    CLSCTX_ALL,
-                                    IID_PPV_ARGS(&fileDialog))))
+    HRESULT result = CoCreateInstance(CLSID_FileOpenDialog,
+                                      NULL,
+                                      CLSCTX_ALL,
+                                      IID_PPV_ARGS(&fileDialog));
+    if ( !SUCCEEDED(result) )
     {        
         NFDi_SetError("CoCreateInstance for CLSID_FileOpenDialog failed.");
         goto end;
@@ -693,7 +696,6 @@ nfdresult_t NFD_PickFolder(const nfdchar_t *defaultPath,
     }
 
     // Get the dialogs options
-    DWORD dwOptions = 0;
     if (!SUCCEEDED(fileDialog->GetOptions(&dwOptions)))
     {
         NFDi_SetError("GetOptions for IFileDialog failed.");
@@ -708,7 +710,7 @@ nfdresult_t NFD_PickFolder(const nfdchar_t *defaultPath,
     }
 
     // Show the dialog to the user
-    HRESULT result = fileDialog->Show(NULL);
+    result = fileDialog->Show(NULL);
     if ( SUCCEEDED(result) )
     {
         // Get the folder name

From f939b05568fd258c900b928f10626ca217c3d450 Mon Sep 17 00:00:00 2001
From: Michael Labbe <mike@frogtoss.com>
Date: Sat, 28 Sep 2019 11:09:27 -0700
Subject: [PATCH 03/15] cocoa fix filter list not always working correctly

---
 src/nfd_cocoa.m | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/nfd_cocoa.m b/src/nfd_cocoa.m
index 39a0931..776152d 100644
--- a/src/nfd_cocoa.m
+++ b/src/nfd_cocoa.m
@@ -22,8 +22,10 @@
     {
         if ( filterList[i] == ',' || filterList[i] == ';' || filterList[i] == '\0' )
         {
-            ++p_typebuf;
+            if (filterList[i] != '\0')
+                ++p_typebuf;
             *p_typebuf = '\0';
+
             NSString *thisType = [NSString stringWithUTF8String: typebuf];
             [buildFilterList addObject:thisType];
             p_typebuf = typebuf;

From 1e2d447c197739ac425d5f0b4809ff5284f60419 Mon Sep 17 00:00:00 2001
From: michael Labbe <mike@frogtoss.com>
Date: Sat, 28 Sep 2019 11:23:48 -0700
Subject: [PATCH 04/15] regenerate win32 projects with premake5 a14

---
 build/gmake_windows/Makefile                  |  2 +-
 build/gmake_windows/nfd.make                  | 49 ++++++++---------
 build/gmake_windows/test_opendialog.make      | 52 ++++++++++---------
 .../test_opendialogmultiple.make              | 52 ++++++++++---------
 build/gmake_windows/test_pickfolder.make      | 52 ++++++++++---------
 build/gmake_windows/test_savedialog.make      | 52 ++++++++++---------
 build/vs2010/NativeFileDialog.sln             | 22 ++++----
 7 files changed, 143 insertions(+), 138 deletions(-)

diff --git a/build/gmake_windows/Makefile b/build/gmake_windows/Makefile
index ffe0945..fb00580 100644
--- a/build/gmake_windows/Makefile
+++ b/build/gmake_windows/Makefile
@@ -98,4 +98,4 @@ help:
 	@echo "   test_opendialogmultiple"
 	@echo "   test_savedialog"
 	@echo ""
-	@echo "For more information, see http://industriousone.com/premake/quick-start"
\ No newline at end of file
+	@echo "For more information, see https://github.com/premake/premake-core/wiki"
\ No newline at end of file
diff --git a/build/gmake_windows/nfd.make b/build/gmake_windows/nfd.make
index d736536..41615be 100644
--- a/build/gmake_windows/nfd.make
+++ b/build/gmake_windows/nfd.make
@@ -126,23 +126,33 @@ RESOURCES := \
 
 CUSTOMFILES := \
 
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
+SHELLTYPE := posix
+ifeq (.exe,$(findstring .exe,$(ComSpec)))
+	SHELLTYPE := msdos
 endif
 
-$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
+$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
 	@echo Linking nfd
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(CUSTOMFILES): | $(OBJDIR)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
 ifeq (posix,$(SHELLTYPE))
 	$(SILENT) mkdir -p $(TARGETDIR)
 else
 	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
 endif
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
+
+$(OBJDIR):
+	@echo Creating $(OBJDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(OBJDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
+endif
 
 clean:
 	@echo Cleaning nfd
@@ -161,32 +171,19 @@ prelink:
 	$(PRELINKCMDS)
 
 ifneq (,$(PCH))
-$(OBJECTS): $(GCH) $(PCH)
-$(GCH): $(PCH)
+$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
+$(GCH): $(PCH) | $(OBJDIR)
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CXX) -x c++-header $(ALL_CXXFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
+else
+$(OBJECTS): | $(OBJDIR)
 endif
 
 $(OBJDIR)/nfd_common.o: ../../src/nfd_common.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 $(OBJDIR)/nfd_win.o: ../../src/nfd_win.cpp
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake_windows/test_opendialog.make b/build/gmake_windows/test_opendialog.make
index ad7137e..ad77941 100644
--- a/build/gmake_windows/test_opendialog.make
+++ b/build/gmake_windows/test_opendialog.make
@@ -24,7 +24,7 @@ ifeq ($(config),release_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x64/nfd.lib -lole32 -luuid
   LDDEPS += ../lib/Release/x64/nfd.lib
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Release/x64 -m64 -s
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x64 -L/usr/lib64 -m64 -s
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -51,7 +51,7 @@ ifeq ($(config),release_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x86/nfd.lib -lole32 -luuid
   LDDEPS += ../lib/Release/x86/nfd.lib
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Release/x86 -m32 -s
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x86 -L/usr/lib32 -m32 -s
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -78,7 +78,7 @@ ifeq ($(config),debug_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d -lole32 -luuid
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Debug/x64 -m64
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x64 -L/usr/lib64 -m64
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -105,7 +105,7 @@ ifeq ($(config),debug_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d -lole32 -luuid
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Debug/x86 -m32
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x86 -L/usr/lib32 -m32
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -125,23 +125,33 @@ RESOURCES := \
 
 CUSTOMFILES := \
 
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
+SHELLTYPE := posix
+ifeq (.exe,$(findstring .exe,$(ComSpec)))
+	SHELLTYPE := msdos
 endif
 
-$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
+$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
 	@echo Linking test_opendialog
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(CUSTOMFILES): | $(OBJDIR)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
 ifeq (posix,$(SHELLTYPE))
 	$(SILENT) mkdir -p $(TARGETDIR)
 else
 	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
 endif
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
+
+$(OBJDIR):
+	@echo Creating $(OBJDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(OBJDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
+endif
 
 clean:
 	@echo Cleaning test_opendialog
@@ -160,24 +170,16 @@ prelink:
 	$(PRELINKCMDS)
 
 ifneq (,$(PCH))
-$(OBJECTS): $(GCH) $(PCH)
-$(GCH): $(PCH)
+$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
+$(GCH): $(PCH) | $(OBJDIR)
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
+else
+$(OBJECTS): | $(OBJDIR)
 endif
 
 $(OBJDIR)/test_opendialog.o: ../../test/test_opendialog.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake_windows/test_opendialogmultiple.make b/build/gmake_windows/test_opendialogmultiple.make
index e72a67b..d09cb6d 100644
--- a/build/gmake_windows/test_opendialogmultiple.make
+++ b/build/gmake_windows/test_opendialogmultiple.make
@@ -24,7 +24,7 @@ ifeq ($(config),release_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x64/nfd.lib -lole32 -luuid
   LDDEPS += ../lib/Release/x64/nfd.lib
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Release/x64 -m64 -s
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x64 -L/usr/lib64 -m64 -s
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -51,7 +51,7 @@ ifeq ($(config),release_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x86/nfd.lib -lole32 -luuid
   LDDEPS += ../lib/Release/x86/nfd.lib
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Release/x86 -m32 -s
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x86 -L/usr/lib32 -m32 -s
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -78,7 +78,7 @@ ifeq ($(config),debug_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d -lole32 -luuid
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Debug/x64 -m64
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x64 -L/usr/lib64 -m64
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -105,7 +105,7 @@ ifeq ($(config),debug_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d -lole32 -luuid
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Debug/x86 -m32
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x86 -L/usr/lib32 -m32
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -125,23 +125,33 @@ RESOURCES := \
 
 CUSTOMFILES := \
 
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
+SHELLTYPE := posix
+ifeq (.exe,$(findstring .exe,$(ComSpec)))
+	SHELLTYPE := msdos
 endif
 
-$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
+$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
 	@echo Linking test_opendialogmultiple
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(CUSTOMFILES): | $(OBJDIR)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
 ifeq (posix,$(SHELLTYPE))
 	$(SILENT) mkdir -p $(TARGETDIR)
 else
 	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
 endif
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
+
+$(OBJDIR):
+	@echo Creating $(OBJDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(OBJDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
+endif
 
 clean:
 	@echo Cleaning test_opendialogmultiple
@@ -160,24 +170,16 @@ prelink:
 	$(PRELINKCMDS)
 
 ifneq (,$(PCH))
-$(OBJECTS): $(GCH) $(PCH)
-$(GCH): $(PCH)
+$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
+$(GCH): $(PCH) | $(OBJDIR)
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
+else
+$(OBJECTS): | $(OBJDIR)
 endif
 
 $(OBJDIR)/test_opendialogmultiple.o: ../../test/test_opendialogmultiple.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake_windows/test_pickfolder.make b/build/gmake_windows/test_pickfolder.make
index c004690..f440fa2 100644
--- a/build/gmake_windows/test_pickfolder.make
+++ b/build/gmake_windows/test_pickfolder.make
@@ -24,7 +24,7 @@ ifeq ($(config),release_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x64/nfd.lib -lole32 -luuid
   LDDEPS += ../lib/Release/x64/nfd.lib
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Release/x64 -m64 -s
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x64 -L/usr/lib64 -m64 -s
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -51,7 +51,7 @@ ifeq ($(config),release_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x86/nfd.lib -lole32 -luuid
   LDDEPS += ../lib/Release/x86/nfd.lib
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Release/x86 -m32 -s
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x86 -L/usr/lib32 -m32 -s
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -78,7 +78,7 @@ ifeq ($(config),debug_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d -lole32 -luuid
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Debug/x64 -m64
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x64 -L/usr/lib64 -m64
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -105,7 +105,7 @@ ifeq ($(config),debug_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d -lole32 -luuid
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Debug/x86 -m32
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x86 -L/usr/lib32 -m32
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -125,23 +125,33 @@ RESOURCES := \
 
 CUSTOMFILES := \
 
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
+SHELLTYPE := posix
+ifeq (.exe,$(findstring .exe,$(ComSpec)))
+	SHELLTYPE := msdos
 endif
 
-$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
+$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
 	@echo Linking test_pickfolder
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(CUSTOMFILES): | $(OBJDIR)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
 ifeq (posix,$(SHELLTYPE))
 	$(SILENT) mkdir -p $(TARGETDIR)
 else
 	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
 endif
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
+
+$(OBJDIR):
+	@echo Creating $(OBJDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(OBJDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
+endif
 
 clean:
 	@echo Cleaning test_pickfolder
@@ -160,24 +170,16 @@ prelink:
 	$(PRELINKCMDS)
 
 ifneq (,$(PCH))
-$(OBJECTS): $(GCH) $(PCH)
-$(GCH): $(PCH)
+$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
+$(GCH): $(PCH) | $(OBJDIR)
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
+else
+$(OBJECTS): | $(OBJDIR)
 endif
 
 $(OBJDIR)/test_pickfolder.o: ../../test/test_pickfolder.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake_windows/test_savedialog.make b/build/gmake_windows/test_savedialog.make
index f608fb0..1325a5a 100644
--- a/build/gmake_windows/test_savedialog.make
+++ b/build/gmake_windows/test_savedialog.make
@@ -24,7 +24,7 @@ ifeq ($(config),release_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x64/nfd.lib -lole32 -luuid
   LDDEPS += ../lib/Release/x64/nfd.lib
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Release/x64 -m64 -s
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x64 -L/usr/lib64 -m64 -s
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -51,7 +51,7 @@ ifeq ($(config),release_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x86/nfd.lib -lole32 -luuid
   LDDEPS += ../lib/Release/x86/nfd.lib
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Release/x86 -m32 -s
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x86 -L/usr/lib32 -m32 -s
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -78,7 +78,7 @@ ifeq ($(config),debug_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d -lole32 -luuid
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Debug/x64 -m64
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x64 -L/usr/lib64 -m64
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -105,7 +105,7 @@ ifeq ($(config),debug_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d -lole32 -luuid
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Debug/x86 -m32
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x86 -L/usr/lib32 -m32
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -125,23 +125,33 @@ RESOURCES := \
 
 CUSTOMFILES := \
 
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
+SHELLTYPE := posix
+ifeq (.exe,$(findstring .exe,$(ComSpec)))
+	SHELLTYPE := msdos
 endif
 
-$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
+$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
 	@echo Linking test_savedialog
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(CUSTOMFILES): | $(OBJDIR)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
 ifeq (posix,$(SHELLTYPE))
 	$(SILENT) mkdir -p $(TARGETDIR)
 else
 	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
 endif
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
+
+$(OBJDIR):
+	@echo Creating $(OBJDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(OBJDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
+endif
 
 clean:
 	@echo Cleaning test_savedialog
@@ -160,24 +170,16 @@ prelink:
 	$(PRELINKCMDS)
 
 ifneq (,$(PCH))
-$(OBJECTS): $(GCH) $(PCH)
-$(GCH): $(PCH)
+$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
+$(GCH): $(PCH) | $(OBJDIR)
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
+else
+$(OBJECTS): | $(OBJDIR)
 endif
 
 $(OBJDIR)/test_savedialog.o: ../../test/test_savedialog.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)
diff --git a/build/vs2010/NativeFileDialog.sln b/build/vs2010/NativeFileDialog.sln
index 43f28a8..60d72f9 100644
--- a/build/vs2010/NativeFileDialog.sln
+++ b/build/vs2010/NativeFileDialog.sln
@@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nfd", "nfd.vcxproj", "{5D94880B-C99D-887C-5219-9F7CBE21947C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_pickfolder", "test_pickfolder.vcxproj", "{C7D1F254-335D-6019-3C6E-E30DA878BC19}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_opendialog", "test_opendialog.vcxproj", "{86EEA43A-F279-12FF-FB8A-95F367956EFF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{5D94880B-C99D-887C-5219-9F7CBE21947C} = {5D94880B-C99D-887C-5219-9F7CBE21947C}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_opendialog", "test_opendialog.vcxproj", "{86EEA43A-F279-12FF-FB8A-95F367956EFF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_opendialogmultiple", "test_opendialogmultiple.vcxproj", "{72399713-DE70-DFAA-E77A-43CE533106A4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{5D94880B-C99D-887C-5219-9F7CBE21947C} = {5D94880B-C99D-887C-5219-9F7CBE21947C}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_opendialogmultiple", "test_opendialogmultiple.vcxproj", "{72399713-DE70-DFAA-E77A-43CE533106A4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_pickfolder", "test_pickfolder.vcxproj", "{C7D1F254-335D-6019-3C6E-E30DA878BC19}"
 	ProjectSection(ProjectDependencies) = postProject
 		{5D94880B-C99D-887C-5219-9F7CBE21947C} = {5D94880B-C99D-887C-5219-9F7CBE21947C}
 	EndProjectSection
@@ -39,14 +39,6 @@ Global
 		{5D94880B-C99D-887C-5219-9F7CBE21947C}.Release|Win32.Build.0 = Release|Win32
 		{5D94880B-C99D-887C-5219-9F7CBE21947C}.Release|x64.ActiveCfg = Release|x64
 		{5D94880B-C99D-887C-5219-9F7CBE21947C}.Release|x64.Build.0 = Release|x64
-		{C7D1F254-335D-6019-3C6E-E30DA878BC19}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C7D1F254-335D-6019-3C6E-E30DA878BC19}.Debug|Win32.Build.0 = Debug|Win32
-		{C7D1F254-335D-6019-3C6E-E30DA878BC19}.Debug|x64.ActiveCfg = Debug|x64
-		{C7D1F254-335D-6019-3C6E-E30DA878BC19}.Debug|x64.Build.0 = Debug|x64
-		{C7D1F254-335D-6019-3C6E-E30DA878BC19}.Release|Win32.ActiveCfg = Release|Win32
-		{C7D1F254-335D-6019-3C6E-E30DA878BC19}.Release|Win32.Build.0 = Release|Win32
-		{C7D1F254-335D-6019-3C6E-E30DA878BC19}.Release|x64.ActiveCfg = Release|x64
-		{C7D1F254-335D-6019-3C6E-E30DA878BC19}.Release|x64.Build.0 = Release|x64
 		{86EEA43A-F279-12FF-FB8A-95F367956EFF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{86EEA43A-F279-12FF-FB8A-95F367956EFF}.Debug|Win32.Build.0 = Debug|Win32
 		{86EEA43A-F279-12FF-FB8A-95F367956EFF}.Debug|x64.ActiveCfg = Debug|x64
@@ -63,6 +55,14 @@ Global
 		{72399713-DE70-DFAA-E77A-43CE533106A4}.Release|Win32.Build.0 = Release|Win32
 		{72399713-DE70-DFAA-E77A-43CE533106A4}.Release|x64.ActiveCfg = Release|x64
 		{72399713-DE70-DFAA-E77A-43CE533106A4}.Release|x64.Build.0 = Release|x64
+		{C7D1F254-335D-6019-3C6E-E30DA878BC19}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C7D1F254-335D-6019-3C6E-E30DA878BC19}.Debug|Win32.Build.0 = Debug|Win32
+		{C7D1F254-335D-6019-3C6E-E30DA878BC19}.Debug|x64.ActiveCfg = Debug|x64
+		{C7D1F254-335D-6019-3C6E-E30DA878BC19}.Debug|x64.Build.0 = Debug|x64
+		{C7D1F254-335D-6019-3C6E-E30DA878BC19}.Release|Win32.ActiveCfg = Release|Win32
+		{C7D1F254-335D-6019-3C6E-E30DA878BC19}.Release|Win32.Build.0 = Release|Win32
+		{C7D1F254-335D-6019-3C6E-E30DA878BC19}.Release|x64.ActiveCfg = Release|x64
+		{C7D1F254-335D-6019-3C6E-E30DA878BC19}.Release|x64.Build.0 = Release|x64
 		{23941773-8F1F-8537-9830-082C043BE137}.Debug|Win32.ActiveCfg = Debug|Win32
 		{23941773-8F1F-8537-9830-082C043BE137}.Debug|Win32.Build.0 = Debug|Win32
 		{23941773-8F1F-8537-9830-082C043BE137}.Debug|x64.ActiveCfg = Debug|x64

From 8831c6857f3d44e3f6d1d123b33caaa140b1122d Mon Sep 17 00:00:00 2001
From: Michael Labbe <mike@frogtoss.com>
Date: Sat, 28 Sep 2019 11:47:56 -0700
Subject: [PATCH 05/15] fix xcode 11 failing to build due to x86 arch presence

---
 build/gmake_macosx/Makefile                   |  18 +-
 build/gmake_macosx/nfd.make                   | 123 +++--------
 build/gmake_macosx/test_opendialog.make       | 118 +++-------
 .../gmake_macosx/test_opendialogmultiple.make | 118 +++-------
 build/gmake_macosx/test_pickfolder.make       | 118 +++-------
 build/gmake_macosx/test_savedialog.make       | 118 +++-------
 build/premake5.lua                            |  11 +-
 .../contents.xcworkspacedata                  |   6 +-
 build/xcode4/nfd.xcodeproj/project.pbxproj    | 134 ++++++------
 .../test_opendialog.xcodeproj/project.pbxproj | 206 +++++++++---------
 .../project.pbxproj                           | 196 ++++++++---------
 .../test_pickfolder.xcodeproj/project.pbxproj | 194 ++++++++---------
 .../test_savedialog.xcodeproj/project.pbxproj | 196 ++++++++---------
 13 files changed, 582 insertions(+), 974 deletions(-)

diff --git a/build/gmake_macosx/Makefile b/build/gmake_macosx/Makefile
index ffe0945..f431868 100644
--- a/build/gmake_macosx/Makefile
+++ b/build/gmake_macosx/Makefile
@@ -15,13 +15,6 @@ ifeq ($(config),release_x64)
   test_opendialogmultiple_config = release_x64
   test_savedialog_config = release_x64
 endif
-ifeq ($(config),release_x86)
-  nfd_config = release_x86
-  test_pickfolder_config = release_x86
-  test_opendialog_config = release_x86
-  test_opendialogmultiple_config = release_x86
-  test_savedialog_config = release_x86
-endif
 ifeq ($(config),debug_x64)
   nfd_config = debug_x64
   test_pickfolder_config = debug_x64
@@ -29,13 +22,6 @@ ifeq ($(config),debug_x64)
   test_opendialogmultiple_config = debug_x64
   test_savedialog_config = debug_x64
 endif
-ifeq ($(config),debug_x86)
-  nfd_config = debug_x86
-  test_pickfolder_config = debug_x86
-  test_opendialog_config = debug_x86
-  test_opendialogmultiple_config = debug_x86
-  test_savedialog_config = debug_x86
-endif
 
 PROJECTS := nfd test_pickfolder test_opendialog test_opendialogmultiple test_savedialog
 
@@ -85,9 +71,7 @@ help:
 	@echo ""
 	@echo "CONFIGURATIONS:"
 	@echo "  release_x64"
-	@echo "  release_x86"
 	@echo "  debug_x64"
-	@echo "  debug_x86"
 	@echo ""
 	@echo "TARGETS:"
 	@echo "   all (default)"
@@ -98,4 +82,4 @@ help:
 	@echo "   test_opendialogmultiple"
 	@echo "   test_savedialog"
 	@echo ""
-	@echo "For more information, see http://industriousone.com/premake/quick-start"
\ No newline at end of file
+	@echo "For more information, see https://github.com/premake/premake-core/wiki"
\ No newline at end of file
diff --git a/build/gmake_macosx/nfd.make b/build/gmake_macosx/nfd.make
index 1851b63..a46d407 100644
--- a/build/gmake_macosx/nfd.make
+++ b/build/gmake_macosx/nfd.make
@@ -22,7 +22,7 @@ ifeq ($(config),release_x64)
   endif
   TARGETDIR = ../lib/Release/x64
   TARGET = $(TARGETDIR)/libnfd.a
-  OBJDIR = ../obj/x64/Release/nfd
+  OBJDIR = obj/x64/Release/nfd
   DEFINES += -DNDEBUG
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
@@ -45,41 +45,6 @@ all: prebuild prelink $(TARGET)
 
 endif
 
-ifeq ($(config),release_x86)
-  ifeq ($(origin CC), default)
-    CC = clang
-  endif
-  ifeq ($(origin CXX), default)
-    CXX = clang++
-  endif
-  ifeq ($(origin AR), default)
-    AR = ar
-  endif
-  TARGETDIR = ../lib/Release/x86
-  TARGET = $(TARGETDIR)/libnfd.a
-  OBJDIR = ../obj/x86/Release/nfd
-  DEFINES += -DNDEBUG
-  INCLUDES += -I../../src/include
-  FORCE_INCLUDE +=
-  ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fno-exceptions
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fno-exceptions
-  ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  LIBS +=
-  LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -m32
-  LINKCMD = $(AR) -rcs "$@" $(OBJECTS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-all: prebuild prelink $(TARGET)
-	@:
-
-endif
-
 ifeq ($(config),debug_x64)
   ifeq ($(origin CC), default)
     CC = clang
@@ -92,7 +57,7 @@ ifeq ($(config),debug_x64)
   endif
   TARGETDIR = ../lib/Debug/x64
   TARGET = $(TARGETDIR)/libnfd_d.a
-  OBJDIR = ../obj/x64/Debug/nfd
+  OBJDIR = obj/x64/Debug/nfd
   DEFINES += -DDEBUG
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
@@ -115,41 +80,6 @@ all: prebuild prelink $(TARGET)
 
 endif
 
-ifeq ($(config),debug_x86)
-  ifeq ($(origin CC), default)
-    CC = clang
-  endif
-  ifeq ($(origin CXX), default)
-    CXX = clang++
-  endif
-  ifeq ($(origin AR), default)
-    AR = ar
-  endif
-  TARGETDIR = ../lib/Debug/x86
-  TARGET = $(TARGETDIR)/libnfd_d.a
-  OBJDIR = ../obj/x86/Debug/nfd
-  DEFINES += -DDEBUG
-  INCLUDES += -I../../src/include
-  FORCE_INCLUDE +=
-  ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -g -fno-exceptions
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -g -fno-exceptions
-  ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  LIBS +=
-  LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -m32
-  LINKCMD = $(AR) -rcs "$@" $(OBJECTS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-all: prebuild prelink $(TARGET)
-	@:
-
-endif
-
 OBJECTS := \
 	$(OBJDIR)/nfd_cocoa.o \
 	$(OBJDIR)/nfd_common.o \
@@ -158,23 +88,33 @@ RESOURCES := \
 
 CUSTOMFILES := \
 
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
+SHELLTYPE := posix
+ifeq (.exe,$(findstring .exe,$(ComSpec)))
+	SHELLTYPE := msdos
 endif
 
-$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
+$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
 	@echo Linking nfd
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(CUSTOMFILES): | $(OBJDIR)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
 ifeq (posix,$(SHELLTYPE))
 	$(SILENT) mkdir -p $(TARGETDIR)
 else
 	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
 endif
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
+
+$(OBJDIR):
+	@echo Creating $(OBJDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(OBJDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
+endif
 
 clean:
 	@echo Cleaning nfd
@@ -193,32 +133,19 @@ prelink:
 	$(PRELINKCMDS)
 
 ifneq (,$(PCH))
-$(OBJECTS): $(GCH) $(PCH)
-$(GCH): $(PCH)
+$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
+$(GCH): $(PCH) | $(OBJDIR)
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
+else
+$(OBJECTS): | $(OBJDIR)
 endif
 
 $(OBJDIR)/nfd_cocoa.o: ../../src/nfd_cocoa.m
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 $(OBJDIR)/nfd_common.o: ../../src/nfd_common.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake_macosx/test_opendialog.make b/build/gmake_macosx/test_opendialog.make
index 52a9c92..d4c861c 100644
--- a/build/gmake_macosx/test_opendialog.make
+++ b/build/gmake_macosx/test_opendialog.make
@@ -22,7 +22,7 @@ ifeq ($(config),release_x64)
   endif
   TARGETDIR = ../bin
   TARGET = $(TARGETDIR)/test_opendialog
-  OBJDIR = ../obj/x64/Release/test_opendialog
+  OBJDIR = obj/x64/Release/test_opendialog
   DEFINES += -DNDEBUG
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
@@ -45,41 +45,6 @@ all: prebuild prelink $(TARGET)
 
 endif
 
-ifeq ($(config),release_x86)
-  ifeq ($(origin CC), default)
-    CC = clang
-  endif
-  ifeq ($(origin CXX), default)
-    CXX = clang++
-  endif
-  ifeq ($(origin AR), default)
-    AR = ar
-  endif
-  TARGETDIR = ../bin
-  TARGET = $(TARGETDIR)/test_opendialog
-  OBJDIR = ../obj/x86/Release/test_opendialog
-  DEFINES += -DNDEBUG
-  INCLUDES += -I../../src/include
-  FORCE_INCLUDE +=
-  ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2
-  ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  LIBS += ../lib/Release/x86/libnfd.a -framework Foundation -framework AppKit
-  LDDEPS += ../lib/Release/x86/libnfd.a
-  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x86 -m32
-  LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-all: prebuild prelink $(TARGET)
-	@:
-
-endif
-
 ifeq ($(config),debug_x64)
   ifeq ($(origin CC), default)
     CC = clang
@@ -92,7 +57,7 @@ ifeq ($(config),debug_x64)
   endif
   TARGETDIR = ../bin
   TARGET = $(TARGETDIR)/test_opendialog_d
-  OBJDIR = ../obj/x64/Debug/test_opendialog
+  OBJDIR = obj/x64/Debug/test_opendialog
   DEFINES += -DDEBUG
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
@@ -115,41 +80,6 @@ all: prebuild prelink $(TARGET)
 
 endif
 
-ifeq ($(config),debug_x86)
-  ifeq ($(origin CC), default)
-    CC = clang
-  endif
-  ifeq ($(origin CXX), default)
-    CXX = clang++
-  endif
-  ifeq ($(origin AR), default)
-    AR = ar
-  endif
-  TARGETDIR = ../bin
-  TARGET = $(TARGETDIR)/test_opendialog_d
-  OBJDIR = ../obj/x86/Debug/test_opendialog
-  DEFINES += -DDEBUG
-  INCLUDES += -I../../src/include
-  FORCE_INCLUDE +=
-  ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -g
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -g
-  ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  LIBS += -framework Foundation -framework AppKit -lnfd_d
-  LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x86 -m32
-  LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-all: prebuild prelink $(TARGET)
-	@:
-
-endif
-
 OBJECTS := \
 	$(OBJDIR)/test_opendialog.o \
 
@@ -157,23 +87,33 @@ RESOURCES := \
 
 CUSTOMFILES := \
 
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
+SHELLTYPE := posix
+ifeq (.exe,$(findstring .exe,$(ComSpec)))
+	SHELLTYPE := msdos
 endif
 
-$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
+$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
 	@echo Linking test_opendialog
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(CUSTOMFILES): | $(OBJDIR)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
 ifeq (posix,$(SHELLTYPE))
 	$(SILENT) mkdir -p $(TARGETDIR)
 else
 	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
 endif
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
+
+$(OBJDIR):
+	@echo Creating $(OBJDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(OBJDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
+endif
 
 clean:
 	@echo Cleaning test_opendialog
@@ -192,24 +132,16 @@ prelink:
 	$(PRELINKCMDS)
 
 ifneq (,$(PCH))
-$(OBJECTS): $(GCH) $(PCH)
-$(GCH): $(PCH)
+$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
+$(GCH): $(PCH) | $(OBJDIR)
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
+else
+$(OBJECTS): | $(OBJDIR)
 endif
 
 $(OBJDIR)/test_opendialog.o: ../../test/test_opendialog.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake_macosx/test_opendialogmultiple.make b/build/gmake_macosx/test_opendialogmultiple.make
index db513b2..ef6c746 100644
--- a/build/gmake_macosx/test_opendialogmultiple.make
+++ b/build/gmake_macosx/test_opendialogmultiple.make
@@ -22,7 +22,7 @@ ifeq ($(config),release_x64)
   endif
   TARGETDIR = ../bin
   TARGET = $(TARGETDIR)/test_opendialogmultiple
-  OBJDIR = ../obj/x64/Release/test_opendialogmultiple
+  OBJDIR = obj/x64/Release/test_opendialogmultiple
   DEFINES += -DNDEBUG
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
@@ -45,41 +45,6 @@ all: prebuild prelink $(TARGET)
 
 endif
 
-ifeq ($(config),release_x86)
-  ifeq ($(origin CC), default)
-    CC = clang
-  endif
-  ifeq ($(origin CXX), default)
-    CXX = clang++
-  endif
-  ifeq ($(origin AR), default)
-    AR = ar
-  endif
-  TARGETDIR = ../bin
-  TARGET = $(TARGETDIR)/test_opendialogmultiple
-  OBJDIR = ../obj/x86/Release/test_opendialogmultiple
-  DEFINES += -DNDEBUG
-  INCLUDES += -I../../src/include
-  FORCE_INCLUDE +=
-  ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2
-  ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  LIBS += ../lib/Release/x86/libnfd.a -framework Foundation -framework AppKit
-  LDDEPS += ../lib/Release/x86/libnfd.a
-  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x86 -m32
-  LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-all: prebuild prelink $(TARGET)
-	@:
-
-endif
-
 ifeq ($(config),debug_x64)
   ifeq ($(origin CC), default)
     CC = clang
@@ -92,7 +57,7 @@ ifeq ($(config),debug_x64)
   endif
   TARGETDIR = ../bin
   TARGET = $(TARGETDIR)/test_opendialogmultiple_d
-  OBJDIR = ../obj/x64/Debug/test_opendialogmultiple
+  OBJDIR = obj/x64/Debug/test_opendialogmultiple
   DEFINES += -DDEBUG
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
@@ -115,41 +80,6 @@ all: prebuild prelink $(TARGET)
 
 endif
 
-ifeq ($(config),debug_x86)
-  ifeq ($(origin CC), default)
-    CC = clang
-  endif
-  ifeq ($(origin CXX), default)
-    CXX = clang++
-  endif
-  ifeq ($(origin AR), default)
-    AR = ar
-  endif
-  TARGETDIR = ../bin
-  TARGET = $(TARGETDIR)/test_opendialogmultiple_d
-  OBJDIR = ../obj/x86/Debug/test_opendialogmultiple
-  DEFINES += -DDEBUG
-  INCLUDES += -I../../src/include
-  FORCE_INCLUDE +=
-  ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -g
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -g
-  ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  LIBS += -framework Foundation -framework AppKit -lnfd_d
-  LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x86 -m32
-  LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-all: prebuild prelink $(TARGET)
-	@:
-
-endif
-
 OBJECTS := \
 	$(OBJDIR)/test_opendialogmultiple.o \
 
@@ -157,23 +87,33 @@ RESOURCES := \
 
 CUSTOMFILES := \
 
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
+SHELLTYPE := posix
+ifeq (.exe,$(findstring .exe,$(ComSpec)))
+	SHELLTYPE := msdos
 endif
 
-$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
+$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
 	@echo Linking test_opendialogmultiple
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(CUSTOMFILES): | $(OBJDIR)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
 ifeq (posix,$(SHELLTYPE))
 	$(SILENT) mkdir -p $(TARGETDIR)
 else
 	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
 endif
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
+
+$(OBJDIR):
+	@echo Creating $(OBJDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(OBJDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
+endif
 
 clean:
 	@echo Cleaning test_opendialogmultiple
@@ -192,24 +132,16 @@ prelink:
 	$(PRELINKCMDS)
 
 ifneq (,$(PCH))
-$(OBJECTS): $(GCH) $(PCH)
-$(GCH): $(PCH)
+$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
+$(GCH): $(PCH) | $(OBJDIR)
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
+else
+$(OBJECTS): | $(OBJDIR)
 endif
 
 $(OBJDIR)/test_opendialogmultiple.o: ../../test/test_opendialogmultiple.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake_macosx/test_pickfolder.make b/build/gmake_macosx/test_pickfolder.make
index 54d433f..85469da 100644
--- a/build/gmake_macosx/test_pickfolder.make
+++ b/build/gmake_macosx/test_pickfolder.make
@@ -22,7 +22,7 @@ ifeq ($(config),release_x64)
   endif
   TARGETDIR = ../bin
   TARGET = $(TARGETDIR)/test_pickfolder
-  OBJDIR = ../obj/x64/Release/test_pickfolder
+  OBJDIR = obj/x64/Release/test_pickfolder
   DEFINES += -DNDEBUG
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
@@ -45,41 +45,6 @@ all: prebuild prelink $(TARGET)
 
 endif
 
-ifeq ($(config),release_x86)
-  ifeq ($(origin CC), default)
-    CC = clang
-  endif
-  ifeq ($(origin CXX), default)
-    CXX = clang++
-  endif
-  ifeq ($(origin AR), default)
-    AR = ar
-  endif
-  TARGETDIR = ../bin
-  TARGET = $(TARGETDIR)/test_pickfolder
-  OBJDIR = ../obj/x86/Release/test_pickfolder
-  DEFINES += -DNDEBUG
-  INCLUDES += -I../../src/include
-  FORCE_INCLUDE +=
-  ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2
-  ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  LIBS += ../lib/Release/x86/libnfd.a -framework Foundation -framework AppKit
-  LDDEPS += ../lib/Release/x86/libnfd.a
-  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x86 -m32
-  LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-all: prebuild prelink $(TARGET)
-	@:
-
-endif
-
 ifeq ($(config),debug_x64)
   ifeq ($(origin CC), default)
     CC = clang
@@ -92,7 +57,7 @@ ifeq ($(config),debug_x64)
   endif
   TARGETDIR = ../bin
   TARGET = $(TARGETDIR)/test_pickfolder_d
-  OBJDIR = ../obj/x64/Debug/test_pickfolder
+  OBJDIR = obj/x64/Debug/test_pickfolder
   DEFINES += -DDEBUG
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
@@ -115,41 +80,6 @@ all: prebuild prelink $(TARGET)
 
 endif
 
-ifeq ($(config),debug_x86)
-  ifeq ($(origin CC), default)
-    CC = clang
-  endif
-  ifeq ($(origin CXX), default)
-    CXX = clang++
-  endif
-  ifeq ($(origin AR), default)
-    AR = ar
-  endif
-  TARGETDIR = ../bin
-  TARGET = $(TARGETDIR)/test_pickfolder_d
-  OBJDIR = ../obj/x86/Debug/test_pickfolder
-  DEFINES += -DDEBUG
-  INCLUDES += -I../../src/include
-  FORCE_INCLUDE +=
-  ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -g
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -g
-  ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  LIBS += -framework Foundation -framework AppKit -lnfd_d
-  LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x86 -m32
-  LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-all: prebuild prelink $(TARGET)
-	@:
-
-endif
-
 OBJECTS := \
 	$(OBJDIR)/test_pickfolder.o \
 
@@ -157,23 +87,33 @@ RESOURCES := \
 
 CUSTOMFILES := \
 
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
+SHELLTYPE := posix
+ifeq (.exe,$(findstring .exe,$(ComSpec)))
+	SHELLTYPE := msdos
 endif
 
-$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
+$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
 	@echo Linking test_pickfolder
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(CUSTOMFILES): | $(OBJDIR)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
 ifeq (posix,$(SHELLTYPE))
 	$(SILENT) mkdir -p $(TARGETDIR)
 else
 	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
 endif
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
+
+$(OBJDIR):
+	@echo Creating $(OBJDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(OBJDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
+endif
 
 clean:
 	@echo Cleaning test_pickfolder
@@ -192,24 +132,16 @@ prelink:
 	$(PRELINKCMDS)
 
 ifneq (,$(PCH))
-$(OBJECTS): $(GCH) $(PCH)
-$(GCH): $(PCH)
+$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
+$(GCH): $(PCH) | $(OBJDIR)
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
+else
+$(OBJECTS): | $(OBJDIR)
 endif
 
 $(OBJDIR)/test_pickfolder.o: ../../test/test_pickfolder.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake_macosx/test_savedialog.make b/build/gmake_macosx/test_savedialog.make
index 657e906..401e992 100644
--- a/build/gmake_macosx/test_savedialog.make
+++ b/build/gmake_macosx/test_savedialog.make
@@ -22,7 +22,7 @@ ifeq ($(config),release_x64)
   endif
   TARGETDIR = ../bin
   TARGET = $(TARGETDIR)/test_savedialog
-  OBJDIR = ../obj/x64/Release/test_savedialog
+  OBJDIR = obj/x64/Release/test_savedialog
   DEFINES += -DNDEBUG
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
@@ -45,41 +45,6 @@ all: prebuild prelink $(TARGET)
 
 endif
 
-ifeq ($(config),release_x86)
-  ifeq ($(origin CC), default)
-    CC = clang
-  endif
-  ifeq ($(origin CXX), default)
-    CXX = clang++
-  endif
-  ifeq ($(origin AR), default)
-    AR = ar
-  endif
-  TARGETDIR = ../bin
-  TARGET = $(TARGETDIR)/test_savedialog
-  OBJDIR = ../obj/x86/Release/test_savedialog
-  DEFINES += -DNDEBUG
-  INCLUDES += -I../../src/include
-  FORCE_INCLUDE +=
-  ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2
-  ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  LIBS += ../lib/Release/x86/libnfd.a -framework Foundation -framework AppKit
-  LDDEPS += ../lib/Release/x86/libnfd.a
-  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x86 -m32
-  LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-all: prebuild prelink $(TARGET)
-	@:
-
-endif
-
 ifeq ($(config),debug_x64)
   ifeq ($(origin CC), default)
     CC = clang
@@ -92,7 +57,7 @@ ifeq ($(config),debug_x64)
   endif
   TARGETDIR = ../bin
   TARGET = $(TARGETDIR)/test_savedialog_d
-  OBJDIR = ../obj/x64/Debug/test_savedialog
+  OBJDIR = obj/x64/Debug/test_savedialog
   DEFINES += -DDEBUG
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
@@ -115,41 +80,6 @@ all: prebuild prelink $(TARGET)
 
 endif
 
-ifeq ($(config),debug_x86)
-  ifeq ($(origin CC), default)
-    CC = clang
-  endif
-  ifeq ($(origin CXX), default)
-    CXX = clang++
-  endif
-  ifeq ($(origin AR), default)
-    AR = ar
-  endif
-  TARGETDIR = ../bin
-  TARGET = $(TARGETDIR)/test_savedialog_d
-  OBJDIR = ../obj/x86/Debug/test_savedialog
-  DEFINES += -DDEBUG
-  INCLUDES += -I../../src/include
-  FORCE_INCLUDE +=
-  ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -g
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -g
-  ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  LIBS += -framework Foundation -framework AppKit -lnfd_d
-  LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x86 -m32
-  LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-all: prebuild prelink $(TARGET)
-	@:
-
-endif
-
 OBJECTS := \
 	$(OBJDIR)/test_savedialog.o \
 
@@ -157,23 +87,33 @@ RESOURCES := \
 
 CUSTOMFILES := \
 
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
+SHELLTYPE := posix
+ifeq (.exe,$(findstring .exe,$(ComSpec)))
+	SHELLTYPE := msdos
 endif
 
-$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
+$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
 	@echo Linking test_savedialog
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(CUSTOMFILES): | $(OBJDIR)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
 ifeq (posix,$(SHELLTYPE))
 	$(SILENT) mkdir -p $(TARGETDIR)
 else
 	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
 endif
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
+
+$(OBJDIR):
+	@echo Creating $(OBJDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(OBJDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
+endif
 
 clean:
 	@echo Cleaning test_savedialog
@@ -192,24 +132,16 @@ prelink:
 	$(PRELINKCMDS)
 
 ifneq (,$(PCH))
-$(OBJECTS): $(GCH) $(PCH)
-$(GCH): $(PCH)
+$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
+$(GCH): $(PCH) | $(OBJDIR)
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
+else
+$(OBJECTS): | $(OBJDIR)
 endif
 
 $(OBJDIR)/test_savedialog.o: ../../test/test_savedialog.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)
diff --git a/build/premake5.lua b/build/premake5.lua
index 20a8286..3e13fb5 100644
--- a/build/premake5.lua
+++ b/build/premake5.lua
@@ -28,7 +28,16 @@ workspace "NativeFileDialog"
   local root_dir = path.join(path.getdirectory(_SCRIPT),"../../")
   local build_dir = path.join(root_dir,"build/")
   configurations { "Release", "Debug" }
-  platforms {"x64", "x86"}
+
+  -- Apple stopped distributing an x86 toolchain.  Xcode 11 now fails to build with an 
+  -- error if the invalid architecture is present.
+  --
+  -- Add it back in here to build for legacy systems.
+  filter "system:macosx"
+    platforms {"x64"}
+  filter "system:windows or system:linux"
+    platforms {"x64", "x86"}
+  
 
   objdir(path.join(build_dir, "obj/"))
 
diff --git a/build/xcode4/NativeFileDialog.xcworkspace/contents.xcworkspacedata b/build/xcode4/NativeFileDialog.xcworkspace/contents.xcworkspacedata
index ae086c2..322b382 100644
--- a/build/xcode4/NativeFileDialog.xcworkspace/contents.xcworkspacedata
+++ b/build/xcode4/NativeFileDialog.xcworkspace/contents.xcworkspacedata
@@ -4,15 +4,15 @@
 	<FileRef
 		location = "group:nfd.xcodeproj">
 	</FileRef>
-	<FileRef
-		location = "group:test_pickfolder.xcodeproj">
-	</FileRef>
 	<FileRef
 		location = "group:test_opendialog.xcodeproj">
 	</FileRef>
 	<FileRef
 		location = "group:test_opendialogmultiple.xcodeproj">
 	</FileRef>
+	<FileRef
+		location = "group:test_pickfolder.xcodeproj">
+	</FileRef>
 	<FileRef
 		location = "group:test_savedialog.xcodeproj">
 	</FileRef>
diff --git a/build/xcode4/nfd.xcodeproj/project.pbxproj b/build/xcode4/nfd.xcodeproj/project.pbxproj
index 3e6b4dc..4e28e87 100644
--- a/build/xcode4/nfd.xcodeproj/project.pbxproj
+++ b/build/xcode4/nfd.xcodeproj/project.pbxproj
@@ -7,22 +7,22 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		1C90C430815210EDACF88C838F91900E86F3E974C114F4E /* nfd_cocoa.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E106E7906CCB5636EF0483B692FB084BFD2E771D99F196 /* nfd_cocoa.m */; };
-		462F490FF946FD227AC6FBA4F308B9946F2B61852D07BB62 /* nfd_common.c in Sources */ = {isa = PBXBuildFile; fileRef = EE4CAC755A7B972AABD081B3A2EC7B5C3D10F61CE78B4D6A /* nfd_common.c */; };
+		0815210E38F919004C114F4E /* nfd_cocoa.m in Sources */ = {isa = PBXBuildFile; fileRef = 906CCB56B692FB081D99F196 /* nfd_cocoa.m */; };
+		F946FD22F308B9942D07BB62 /* nfd_common.c in Sources */ = {isa = PBXBuildFile; fileRef = 5A7B972AA2EC7B5CE78B4D6A /* nfd_common.c */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		2D5FAE075E955E064E132FE62063038F3D4856EE372D446 /* common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = common.h; path = ../../src/common.h; sourceTree = "<group>"; };
-		34E106E7906CCB5636EF0483B692FB084BFD2E771D99F196 /* nfd_cocoa.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = nfd_cocoa.m; path = ../../src/nfd_cocoa.m; sourceTree = "<group>"; };
-		BEE4B8BD4E280AA796E0E38E7CCE5E9967D0FD53D60FB8E7 /* libnfd.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = libnfd.a; path = libnfd.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		C64D5F6A6832C6178443FE300B20ECC9FD55AEC69A46CC57 /* nfd.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = nfd.h; path = ../../src/include/nfd.h; sourceTree = "<group>"; };
-		CD5B55A942F539D0FB29739B6B2FF282DE58A76852CB8010 /* simple_exec.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = simple_exec.h; path = ../../src/simple_exec.h; sourceTree = "<group>"; };
-		D038169AF016F6348DBBEBD93887DA661EFC60427D26AC74 /* nfd_common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = nfd_common.h; path = ../../src/nfd_common.h; sourceTree = "<group>"; };
-		EE4CAC755A7B972AABD081B3A2EC7B5C3D10F61CE78B4D6A /* nfd_common.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = nfd_common.c; path = ../../src/nfd_common.c; sourceTree = "<group>"; };
+		42F539D06B2FF28252CB8010 /* simple_exec.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = simple_exec.h; path = ../../src/simple_exec.h; sourceTree = "<group>"; };
+		4E280AA77CCE5E99D60FB8E7 /* libnfd.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = libnfd.a; path = libnfd.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		5A7B972AA2EC7B5CE78B4D6A /* nfd_common.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = nfd_common.c; path = ../../src/nfd_common.c; sourceTree = "<group>"; };
+		5E955E0662063038E372D446 /* common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = common.h; path = ../../src/common.h; sourceTree = "<group>"; };
+		6832C6170B20ECC99A46CC57 /* nfd.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = nfd.h; path = ../../src/include/nfd.h; sourceTree = "<group>"; };
+		906CCB56B692FB081D99F196 /* nfd_cocoa.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = nfd_cocoa.m; path = ../../src/nfd_cocoa.m; sourceTree = "<group>"; };
+		F016F6343887DA667D26AC74 /* nfd_common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = nfd_common.h; path = ../../src/nfd_common.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		751A9FD95AC8C49737A99755AD4EEF89DD31D92C7F9352D7 /* Frameworks */ = {
+		5AC8C497AD4EEF897F9352D7 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -32,32 +32,32 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		7806C7175E8C72505F8A8A5402DF10029C2CF7B715175890 /* include */ = {
+		50F305D85C23B5CAB5C63418 /* nfd */ = {
 			isa = PBXGroup;
 			children = (
-				C64D5F6A6832C6178443FE300B20ECC9FD55AEC69A46CC57 /* nfd.h */,
+				5E955E0662063038E372D446 /* common.h */,
+				5E8C725002DF100215175890 /* include */,
+				906CCB56B692FB081D99F196 /* nfd_cocoa.m */,
+				5A7B972AA2EC7B5CE78B4D6A /* nfd_common.c */,
+				F016F6343887DA667D26AC74 /* nfd_common.h */,
+				42F539D06B2FF28252CB8010 /* simple_exec.h */,
+				A6C936B49B3FADE6EA134CF4 /* Products */,
 			);
-			name = include;
+			name = nfd;
 			sourceTree = "<group>";
 		};
-		A07348950F305D815022F345C23B5CA1BA741BAB5C63418 /* nfd */ = {
+		5E8C725002DF100215175890 /* include */ = {
 			isa = PBXGroup;
 			children = (
-				2D5FAE075E955E064E132FE62063038F3D4856EE372D446 /* common.h */,
-				7806C7175E8C72505F8A8A5402DF10029C2CF7B715175890 /* include */,
-				34E106E7906CCB5636EF0483B692FB084BFD2E771D99F196 /* nfd_cocoa.m */,
-				EE4CAC755A7B972AABD081B3A2EC7B5C3D10F61CE78B4D6A /* nfd_common.c */,
-				D038169AF016F6348DBBEBD93887DA661EFC60427D26AC74 /* nfd_common.h */,
-				CD5B55A942F539D0FB29739B6B2FF282DE58A76852CB8010 /* simple_exec.h */,
-				DE2FD571A6C936B48E134D4D9B3FADE6BA17F9BDEA134CF4 /* Products */,
+				6832C6170B20ECC99A46CC57 /* nfd.h */,
 			);
-			name = nfd;
+			name = include;
 			sourceTree = "<group>";
 		};
-		DE2FD571A6C936B48E134D4D9B3FADE6BA17F9BDEA134CF4 /* Products */ = {
+		A6C936B49B3FADE6EA134CF4 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				BEE4B8BD4E280AA796E0E38E7CCE5E9967D0FD53D60FB8E7 /* libnfd.a */,
+				4E280AA77CCE5E99D60FB8E7 /* libnfd.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -65,13 +65,13 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		EE83A092ED35A9ADD60763CF9188475F12A9D132A3C08FED /* nfd */ = {
+		ED35A9AD9188475FA3C08FED /* nfd */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 751A9FD849040CF637A997549B8A37E8DD31D92B6DCE9B36 /* Build configuration list for PBXNativeTarget "nfd" */;
+			buildConfigurationList = 49040CF69B8A37E86DCE9B36 /* Build configuration list for PBXNativeTarget "nfd" */;
 			buildPhases = (
-				751A9FDCCAB0453737A997591D367029DD31D92FEF7AD377 /* Resources */,
-				751A9FDD345D5E8E37A9975986E38980DD31D9305927ECCE /* Sources */,
-				751A9FD95AC8C49737A99755AD4EEF89DD31D92C7F9352D7 /* Frameworks */,
+				CAB045371D367029EF7AD377 /* Resources */,
+				345D5E8E86E389805927ECCE /* Sources */,
+				5AC8C497AD4EEF897F9352D7 /* Frameworks */,
 			);
 			buildRules = (
 			);
@@ -79,7 +79,7 @@
 			);
 			name = nfd;
 			productName = nfd;
-			productReference = BEE4B8BD4E280AA796E0E38E7CCE5E9967D0FD53D60FB8E7 /* libnfd.a */;
+			productReference = 4E280AA77CCE5E99D60FB8E7 /* libnfd.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 /* End PBXNativeTarget section */
@@ -90,17 +90,17 @@
 			buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "nfd" */;
 			compatibilityVersion = "Xcode 3.2";
 			hasScannedForEncodings = 1;
-			mainGroup = A07348950F305D815022F345C23B5CA1BA741BAB5C63418 /* nfd */;
+			mainGroup = 50F305D85C23B5CAB5C63418 /* nfd */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				EE83A092ED35A9ADD60763CF9188475F12A9D132A3C08FED /* libnfd.a */,
+				ED35A9AD9188475FA3C08FED /* libnfd.a */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
-		751A9FDCCAB0453737A997591D367029DD31D92FEF7AD377 /* Resources */ = {
+		CAB045371D367029EF7AD377 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -110,12 +110,12 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-		751A9FDD345D5E8E37A9975986E38980DD31D9305927ECCE /* Sources */ = {
+		345D5E8E86E389805927ECCE /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1C90C430815210EDACF88C838F91900E86F3E974C114F4E /* nfd_cocoa.m in Sources */,
-				462F490FF946FD227AC6FBA4F308B9946F2B61852D07BB62 /* nfd_common.c in Sources */,
+				0815210E38F919004C114F4E /* nfd_cocoa.m in Sources */,
+				F946FD22F308B9942D07BB62 /* nfd_common.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -125,26 +125,12 @@
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
-		113D36768FABFCB67F3BB37DE6396728388AB50FBEB27AF6 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CONFIGURATION_BUILD_DIR = ../lib/Release/x86;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_DYNAMIC_NO_PIC = NO;
-				INSTALL_PATH = /usr/local/lib;
-				PRODUCT_NAME = nfd;
-			};
-			name = Release;
-		};
-		848988B667308967E6DCBDCC13934999A547B4A8D21BBFA7 /* Debug */ = {
+		6730896713934999D21BBFA7 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = i386;
 				CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
 				CONFIGURATION_TEMP_DIR = "$(OBJROOT)";
 				COPY_PHASE_STRIP = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -153,37 +139,35 @@
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				OBJROOT = ../obj/x86/Debug/nfd;
+				OBJROOT = obj/x64/Debug/nfd;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"-fno-exceptions",
 				);
-				SYMROOT = ../lib/Debug/x86;
+				SYMROOT = ../lib/Debug/x64;
 				USER_HEADER_SEARCH_PATHS = (
 					../../src/include,
 				);
 			};
 			name = Debug;
 		};
-		A979A906F08D42BCED475A27DB7968AEA41AC288235F30FC /* Debug */ = {
+		8FABFCB6E6396728BEB27AF6 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CONFIGURATION_BUILD_DIR = ../lib/Debug/x86;
+				CONFIGURATION_BUILD_DIR = ../lib/Release/x64;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_DYNAMIC_NO_PIC = NO;
 				INSTALL_PATH = /usr/local/lib;
-				PRODUCT_NAME = nfd_d;
+				PRODUCT_NAME = nfd;
 			};
-			name = Debug;
+			name = Release;
 		};
-		CD5AC992E9E05961114F9AC539F3EE131653BBCBBC721FA1 /* Release */ = {
+		E9E0596139F3EE13BC721FA1 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = i386;
 				CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
 				CONFIGURATION_TEMP_DIR = "$(OBJROOT)";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					NDEBUG,
@@ -191,39 +175,47 @@
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				OBJROOT = ../obj/x86/Release/nfd;
+				OBJROOT = obj/x64/Release/nfd;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"-fno-exceptions",
 				);
-				SYMROOT = ../lib/Release/x86;
+				SYMROOT = ../lib/Release/x64;
 				USER_HEADER_SEARCH_PATHS = (
 					../../src/include,
 				);
 			};
 			name = Release;
 		};
+		F08D42BCDB7968AE235F30FC /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CONFIGURATION_BUILD_DIR = ../lib/Debug/x64;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_DYNAMIC_NO_PIC = NO;
+				INSTALL_PATH = /usr/local/lib;
+				PRODUCT_NAME = nfd_d;
+			};
+			name = Debug;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
 		1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "nfd" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				CD5AC992E9E05961114F9AC539F3EE131653BBCBBC721FA1 /* Release */,
-				CD5AC992E9E05961114F9AC539F3EE131653BBCBBC721FA1 /* Release */,
-				848988B667308967E6DCBDCC13934999A547B4A8D21BBFA7 /* Debug */,
-				848988B667308967E6DCBDCC13934999A547B4A8D21BBFA7 /* Debug */,
+				E9E0596139F3EE13BC721FA1 /* Release */,
+				6730896713934999D21BBFA7 /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		751A9FD849040CF637A997549B8A37E8DD31D92B6DCE9B36 /* Build configuration list for PBXNativeTarget "libnfd.a" */ = {
+		49040CF69B8A37E86DCE9B36 /* Build configuration list for PBXNativeTarget "libnfd.a" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				113D36768FABFCB67F3BB37DE6396728388AB50FBEB27AF6 /* Release */,
-				113D36768FABFCB67F3BB37DE6396728388AB50FBEB27AF6 /* Release */,
-				A979A906F08D42BCED475A27DB7968AEA41AC288235F30FC /* Debug */,
-				A979A906F08D42BCED475A27DB7968AEA41AC288235F30FC /* Debug */,
+				8FABFCB6E6396728BEB27AF6 /* Release */,
+				F08D42BCDB7968AE235F30FC /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
diff --git a/build/xcode4/test_opendialog.xcodeproj/project.pbxproj b/build/xcode4/test_opendialog.xcodeproj/project.pbxproj
index a799d12..60616c6 100644
--- a/build/xcode4/test_opendialog.xcodeproj/project.pbxproj
+++ b/build/xcode4/test_opendialog.xcodeproj/project.pbxproj
@@ -7,117 +7,117 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		600DF7C85EB9CACFD69BF52FB5CF7341318BA799E218090F /* libnfd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EDF42C3AA2F9D637D2AB422FE4526695D9A0C5EC770C77 /* libnfd.a */; };
-		711A18F3DA9A5B441104237031FFCE368A1BB9E8E40DE984 /* test_opendialog.c in Sources */ = {isa = PBXBuildFile; fileRef = 1FBF5AAD3014192CE74D5FE1620D63DE683E81C8DBEC9F6C /* test_opendialog.c */; };
-		D4E5D913B762408A71DC6C0248A4EFC541918B2261D3ECA /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DBBC4EDA893A8412D5925C05D69D7A449728CBB74CBC7A52 /* AppKit.framework */; };
-		ED4CE49BDAA66E6A01B51B5806AC75838E21E50DD9FA526 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71D6295A4B74DEAEC0EF210A2FBBE6E04EE73ACBB3A914EE /* Foundation.framework */; };
+		62D586CEA6E958009ABADD0E /* libnfd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 164F31368771D2283D387F76 /* libnfd.a */; };
+		B762408A248A4EFC261D3ECA /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 893A8412D69D7A444CBC7A52 /* AppKit.framework */; };
+		BDAA66E6806AC758DD9FA526 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B74DEAE2FBBE6E0B3A914EE /* Foundation.framework */; };
+		DA9A5B4431FFCE36E40DE984 /* test_opendialog.c in Sources */ = {isa = PBXBuildFile; fileRef = 3014192C620D63DEDBEC9F6C /* test_opendialog.c */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		F815FDB657D02ABAD15C3BB351362C2C5DA27B0844D188FA /* PBXContainerItemProxy */ = {
+		57D02ABA51362C2C44D188FA /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */;
+			containerPortal = 360631F05E40EAA245DC7830 /* nfd.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = BEE4B8BD4E280AA796E0E38E7CCE5E9967D0FD53D60FB8E7;
+			remoteGlobalIDString = 4E280AA77CCE5E99D60FB8E7;
 			remoteInfo = libnfd.a;
 		};
-		FA883EECAA0A9D53D3CE7CE9A3709EC56014BC3E970BFB93 /* PBXContainerItemProxy */ = {
+		AA0A9D53A3709EC5970BFB93 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */;
+			containerPortal = 360631F05E40EAA245DC7830 /* nfd.xcodeproj */;
 			proxyType = 1;
-			remoteGlobalIDString = EE83A092ED35A9ADD60763CF9188475F12A9D132A3C08FED;
+			remoteGlobalIDString = ED35A9AD9188475FA3C08FED;
 			remoteInfo = libnfd.a;
 		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		1FBF5AAD3014192CE74D5FE1620D63DE683E81C8DBEC9F6C /* test_opendialog.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = test_opendialog.c; path = ../../test/test_opendialog.c; sourceTree = "<group>"; };
-		71D6295A4B74DEAEC0EF210A2FBBE6E04EE73ACBB3A914EE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* libnfd.a */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "nfd.xcodeproj"; path = nfd.xcodeproj; sourceTree = SOURCE_ROOT; };
-		DBBC4EDA893A8412D5925C05D69D7A449728CBB74CBC7A52 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
-		E34C4B4560AA47EAE55A48E186D0779CFA6872D4EDD76E2A /* test_opendialog */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = test_opendialog; path = test_opendialog; sourceTree = BUILT_PRODUCTS_DIR; };
+		3014192C620D63DEDBEC9F6C /* test_opendialog.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = test_opendialog.c; path = ../../test/test_opendialog.c; sourceTree = "<group>"; };
+		360631F05E40EAA245DC7830 /* libnfd.a */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "nfd.xcodeproj"; path = nfd.xcodeproj; sourceTree = SOURCE_ROOT; };
+		4B74DEAE2FBBE6E0B3A914EE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		60AA47EA86D0779CEDD76E2A /* test_opendialog */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = test_opendialog; path = test_opendialog; sourceTree = BUILT_PRODUCTS_DIR; };
+		893A8412D69D7A444CBC7A52 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		C757F47DD3B0D85A854E9343769EFF0CFE6043DA05C4DE9A /* Frameworks */ = {
+		D3B0D85A769EFF0C05C4DE9A /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				ED4CE49BDAA66E6A01B51B5806AC75838E21E50DD9FA526 /* Foundation.framework in Frameworks */,
-				D4E5D913B762408A71DC6C0248A4EFC541918B2261D3ECA /* AppKit.framework in Frameworks */,
-				600DF7C85EB9CACFD69BF52FB5CF7341318BA799E218090F /* libnfd.a in Frameworks */,
+				BDAA66E6806AC758DD9FA526 /* Foundation.framework in Frameworks */,
+				B762408A248A4EFC261D3ECA /* AppKit.framework in Frameworks */,
+				62D586CEA6E958009ABADD0E /* libnfd.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		49755AD7BBF7678180163982A7E87333BFF7C341FA200DC1 /* Frameworks */ = {
+		5D4848BA745AE3EC6476DEFA /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				71D6295A4B74DEAEC0EF210A2FBBE6E04EE73ACBB3A914EE /* Foundation.framework */,
-				DBBC4EDA893A8412D5925C05D69D7A449728CBB74CBC7A52 /* AppKit.framework */,
+				164F31368771D2283D387F76 /* libnfd.a */,
 			);
-			name = Frameworks;
+			name = Products;
 			sourceTree = "<group>";
 		};
-		696CD58FDE62101C925C4D5506C4BF36EAE06AC22B0AF41 /* test_opendialog */ = {
+		9D968EAA920D05DCE0E0A4EA /* Projects */ = {
 			isa = PBXGroup;
 			children = (
-				1FBF5AAD3014192CE74D5FE1620D63DE683E81C8DBEC9F6C /* test_opendialog.c */,
-				49755AD7BBF7678180163982A7E87333BFF7C341FA200DC1 /* Frameworks */,
-				DE2FD571A6C936B48E134D4D9B3FADE6BA17F9BDEA134CF4 /* Products */,
-				DE2FDC7F9D968EAA8E13545B920D05DCBA1800CBE0E0A4EA /* Projects */,
+				360631F05E40EAA245DC7830 /* nfd.xcodeproj */,
+				360631F05E40EAA245DC7830 /* nfd.xcodeproj */,
 			);
-			name = test_opendialog;
+			name = Projects;
 			sourceTree = "<group>";
 		};
-		C1B317315D4848BAD7CC7DEB745AE3ECDC0CAE626476DEFA /* Products */ = {
+		A6C936B49B3FADE6EA134CF4 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				EDF42C3AA2F9D637D2AB422FE4526695D9A0C5EC770C77 /* libnfd.a */,
+				60AA47EA86D0779CEDD76E2A /* test_opendialog */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		DE2FD571A6C936B48E134D4D9B3FADE6BA17F9BDEA134CF4 /* Products */ = {
+		BBF76781A7E87333FA200DC1 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				E34C4B4560AA47EAE55A48E186D0779CFA6872D4EDD76E2A /* test_opendialog */,
+				4B74DEAE2FBBE6E0B3A914EE /* Foundation.framework */,
+				893A8412D69D7A444CBC7A52 /* AppKit.framework */,
 			);
-			name = Products;
+			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		DE2FDC7F9D968EAA8E13545B920D05DCBA1800CBE0E0A4EA /* Projects */ = {
+		FDE62101506C4BF322B0AF41 /* test_opendialog */ = {
 			isa = PBXGroup;
 			children = (
-				9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */,
-				9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */,
+				3014192C620D63DEDBEC9F6C /* test_opendialog.c */,
+				BBF76781A7E87333FA200DC1 /* Frameworks */,
+				A6C936B49B3FADE6EA134CF4 /* Products */,
+				9D968EAA920D05DCE0E0A4EA /* Projects */,
 			);
-			name = Projects;
+			name = test_opendialog;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		A20AA503A7F3CA907B50E300A159CC02797225594F528D0 /* test_opendialog */ = {
+		A7F3CA90A159CC0294F528D0 /* test_opendialog */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = C757F47CC1EC20B9854E934264DA476BFE6043D8F40026F9 /* Build configuration list for PBXNativeTarget "test_opendialog" */;
+			buildConfigurationList = C1EC20B964DA476BF40026F9 /* Build configuration list for PBXNativeTarget "test_opendialog" */;
 			buildPhases = (
-				C757F481439858FA854E9346E6867FACFE6043DD75AC5F3A /* Resources */,
-				C757F481AD457251854E934750339903FE6043DDDF597891 /* Sources */,
-				C757F47DD3B0D85A854E9343769EFF0CFE6043DA05C4DE9A /* Frameworks */,
+				439858FAE6867FAC75AC5F3A /* Resources */,
+				AD45725150339903DF597891 /* Sources */,
+				D3B0D85A769EFF0C05C4DE9A /* Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				C1C611684B0085C3D7DF7822621320F5DC1FA899522F1C03 /* PBXTargetDependency */,
-				C1C611684B0085C3D7DF7822621320F5DC1FA899522F1C03 /* PBXTargetDependency */,
+				4B0085C3621320F5522F1C03 /* PBXTargetDependency */,
+				4B0085C3621320F5522F1C03 /* PBXTargetDependency */,
 			);
 			name = test_opendialog;
 			productInstallPath = "$(HOME)/bin";
 			productName = test_opendialog;
-			productReference = E34C4B4560AA47EAE55A48E186D0779CFA6872D4EDD76E2A /* test_opendialog */;
+			productReference = 60AA47EA86D0779CEDD76E2A /* test_opendialog */;
 			productType = "com.apple.product-type.tool";
 		};
 /* End PBXNativeTarget section */
@@ -128,37 +128,37 @@
 			buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "test_opendialog" */;
 			compatibilityVersion = "Xcode 3.2";
 			hasScannedForEncodings = 1;
-			mainGroup = 696CD58FDE62101C925C4D5506C4BF36EAE06AC22B0AF41 /* test_opendialog */;
+			mainGroup = FDE62101506C4BF322B0AF41 /* test_opendialog */;
 			projectDirPath = "";
 			projectReferences = (
 				{
-					ProductGroup = C1B317315D4848BAD7CC7DEB745AE3ECDC0CAE626476DEFA /* Products */;
-					ProjectRef = 9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */;
+					ProductGroup = 5D4848BA745AE3EC6476DEFA /* Products */;
+					ProjectRef = 360631F05E40EAA245DC7830 /* nfd.xcodeproj */;
 				},
 				{
-					ProductGroup = C1B317315D4848BAD7CC7DEB745AE3ECDC0CAE626476DEFA /* Products */;
-					ProjectRef = 9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */;
+					ProductGroup = 5D4848BA745AE3EC6476DEFA /* Products */;
+					ProjectRef = 360631F05E40EAA245DC7830 /* nfd.xcodeproj */;
 				},
 			);
 			projectRoot = "";
 			targets = (
-				A20AA503A7F3CA907B50E300A159CC02797225594F528D0 /* test_opendialog */,
+				A7F3CA90A159CC0294F528D0 /* test_opendialog */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		EDF42C3AA2F9D637D2AB422FE4526695D9A0C5EC770C77 /* libnfd.a */ = {
+		164F31368771D2283D387F76 /* libnfd.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = libnfd.a;
-			remoteRef = F815FDB657D02ABAD15C3BB351362C2C5DA27B0844D188FA /* PBXContainerItemProxy */;
+			remoteRef = 57D02ABA51362C2C44D188FA /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
-		C757F481439858FA854E9346E6867FACFE6043DD75AC5F3A /* Resources */ = {
+		439858FAE6867FAC75AC5F3A /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -168,21 +168,21 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-		C757F481AD457251854E934750339903FE6043DDDF597891 /* Sources */ = {
+		AD45725150339903DF597891 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				711A18F3DA9A5B441104237031FFCE368A1BB9E8E40DE984 /* test_opendialog.c in Sources */,
+				DA9A5B4431FFCE36E40DE984 /* test_opendialog.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		C1C611684B0085C3D7DF7822621320F5DC1FA899522F1C03 /* PBXTargetDependency */ = {
+		4B0085C3621320F5522F1C03 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = libnfd.a;
-			targetProxy = FA883EECAA0A9D53D3CE7CE9A3709EC56014BC3E970BFB93 /* PBXContainerItemProxy */;
+			targetProxy = AA0A9D53A3709EC5970BFB93 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
@@ -190,19 +190,36 @@
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
-		CC378727888E12FF4EEA26144BF9D4B1DAF6BEFB8A9D793F /* Debug */ = {
+		188342B02F95DDE21FB1D8F0 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CONFIGURATION_BUILD_DIR = ../bin;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_DYNAMIC_NO_PIC = NO;
-				INSTALL_PATH = /usr/local/bin;
-				PRODUCT_NAME = test_opendialog_d;
+				CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
+				CONFIGURATION_TEMP_DIR = "$(OBJROOT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					DEBUG,
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					../lib/Debug/x64,
+				);
+				OBJROOT = obj/x64/Debug/test_opendialog;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = (
+					"-lnfd_d",
+				);
+				SYMROOT = ../bin;
+				USER_HEADER_SEARCH_PATHS = (
+					../../src/include,
+				);
 			};
 			name = Debug;
 		};
-		DAEB1F1D2B21E9B9D4C12C487884DFEB96579BF9EEA3DFF9 /* Release */ = {
+		2B21E9B97884DFEBEEA3DFF9 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -214,13 +231,11 @@
 			};
 			name = Release;
 		};
-		E2A6E5D13AC688EAE4B4E36D60ECB89CF9C30D60C7F3AF2A /* Release */ = {
+		3AC688EA60ECB89CC7F3AF2A /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = i386;
 				CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
 				CONFIGURATION_TEMP_DIR = "$(OBJROOT)";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					NDEBUG,
@@ -229,9 +244,9 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				LIBRARY_SEARCH_PATHS = (
-					../lib/Release/x86,
+					../lib/Release/x64,
 				);
-				OBJROOT = ../obj/x86/Release/test_opendialog;
+				OBJROOT = obj/x64/Release/test_opendialog;
 				ONLY_ACTIVE_ARCH = NO;
 				SYMROOT = ../bin;
 				USER_HEADER_SEARCH_PATHS = (
@@ -240,34 +255,15 @@
 			};
 			name = Release;
 		};
-		FD26DF03188342B0134045BD2F95DDE2178076341FB1D8F0 /* Debug */ = {
+		888E12FF4BF9D4B18A9D793F /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = i386;
-				CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
-				CONFIGURATION_TEMP_DIR = "$(OBJROOT)";
-				COPY_PHASE_STRIP = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					DEBUG,
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				LIBRARY_SEARCH_PATHS = (
-					../lib/Debug/x86,
-				);
-				OBJROOT = ../obj/x86/Debug/test_opendialog;
-				ONLY_ACTIVE_ARCH = YES;
-				OTHER_LDFLAGS = (
-					"-lnfd_d",
-				);
-				SYMROOT = ../bin;
-				USER_HEADER_SEARCH_PATHS = (
-					../../src/include,
-				);
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CONFIGURATION_BUILD_DIR = ../bin;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_DYNAMIC_NO_PIC = NO;
+				INSTALL_PATH = /usr/local/bin;
+				PRODUCT_NAME = test_opendialog_d;
 			};
 			name = Debug;
 		};
@@ -277,21 +273,17 @@
 		1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "test_opendialog" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				E2A6E5D13AC688EAE4B4E36D60ECB89CF9C30D60C7F3AF2A /* Release */,
-				E2A6E5D13AC688EAE4B4E36D60ECB89CF9C30D60C7F3AF2A /* Release */,
-				FD26DF03188342B0134045BD2F95DDE2178076341FB1D8F0 /* Debug */,
-				FD26DF03188342B0134045BD2F95DDE2178076341FB1D8F0 /* Debug */,
+				3AC688EA60ECB89CC7F3AF2A /* Release */,
+				188342B02F95DDE21FB1D8F0 /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		C757F47CC1EC20B9854E934264DA476BFE6043D8F40026F9 /* Build configuration list for PBXNativeTarget "test_opendialog" */ = {
+		C1EC20B964DA476BF40026F9 /* Build configuration list for PBXNativeTarget "test_opendialog" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				DAEB1F1D2B21E9B9D4C12C487884DFEB96579BF9EEA3DFF9 /* Release */,
-				DAEB1F1D2B21E9B9D4C12C487884DFEB96579BF9EEA3DFF9 /* Release */,
-				CC378727888E12FF4EEA26144BF9D4B1DAF6BEFB8A9D793F /* Debug */,
-				CC378727888E12FF4EEA26144BF9D4B1DAF6BEFB8A9D793F /* Debug */,
+				2B21E9B97884DFEBEEA3DFF9 /* Release */,
+				888E12FF4BF9D4B18A9D793F /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
diff --git a/build/xcode4/test_opendialogmultiple.xcodeproj/project.pbxproj b/build/xcode4/test_opendialogmultiple.xcodeproj/project.pbxproj
index 427e514..057fd75 100644
--- a/build/xcode4/test_opendialogmultiple.xcodeproj/project.pbxproj
+++ b/build/xcode4/test_opendialogmultiple.xcodeproj/project.pbxproj
@@ -7,117 +7,117 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		600DF7C85EB9CACFD69BF52FB5CF7341318BA799E218090F /* libnfd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EDF42C3AA2F9D637D2AB422FE4526695D9A0C5EC770C77 /* libnfd.a */; };
-		B6597D4BFD8CFC1CDC5C8924578E130E7B9F8FAD1ED50A5C /* test_opendialogmultiple.c in Sources */ = {isa = PBXBuildFile; fileRef = 78D846004522884C1A475441F1E97367344D54B22EF2EC4 /* test_opendialogmultiple.c */; };
-		D4E5D913B762408A71DC6C0248A4EFC541918B2261D3ECA /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DBBC4EDA893A8412D5925C05D69D7A449728CBB74CBC7A52 /* AppKit.framework */; };
-		ED4CE49BDAA66E6A01B51B5806AC75838E21E50DD9FA526 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71D6295A4B74DEAEC0EF210A2FBBE6E04EE73ACBB3A914EE /* Foundation.framework */; };
+		62D586CEA6E958009ABADD0E /* libnfd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 164F31368771D2283D387F76 /* libnfd.a */; };
+		B762408A248A4EFC261D3ECA /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 893A8412D69D7A444CBC7A52 /* AppKit.framework */; };
+		BDAA66E6806AC758DD9FA526 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B74DEAE2FBBE6E0B3A914EE /* Foundation.framework */; };
+		FD8CFC1C578E130E1ED50A5C /* test_opendialogmultiple.c in Sources */ = {isa = PBXBuildFile; fileRef = 045228841F1E973622EF2EC4 /* test_opendialogmultiple.c */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		F815FDB657D02ABAD15C3BB351362C2C5DA27B0844D188FA /* PBXContainerItemProxy */ = {
+		57D02ABA51362C2C44D188FA /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */;
+			containerPortal = 360631F05E40EAA245DC7830 /* nfd.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = BEE4B8BD4E280AA796E0E38E7CCE5E9967D0FD53D60FB8E7;
+			remoteGlobalIDString = 4E280AA77CCE5E99D60FB8E7;
 			remoteInfo = libnfd.a;
 		};
-		FA883EECAA0A9D53D3CE7CE9A3709EC56014BC3E970BFB93 /* PBXContainerItemProxy */ = {
+		AA0A9D53A3709EC5970BFB93 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */;
+			containerPortal = 360631F05E40EAA245DC7830 /* nfd.xcodeproj */;
 			proxyType = 1;
-			remoteGlobalIDString = EE83A092ED35A9ADD60763CF9188475F12A9D132A3C08FED;
+			remoteGlobalIDString = ED35A9AD9188475FA3C08FED;
 			remoteInfo = libnfd.a;
 		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		71D6295A4B74DEAEC0EF210A2FBBE6E04EE73ACBB3A914EE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		78D846004522884C1A475441F1E97367344D54B22EF2EC4 /* test_opendialogmultiple.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = test_opendialogmultiple.c; path = ../../test/test_opendialogmultiple.c; sourceTree = "<group>"; };
-		9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* libnfd.a */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "nfd.xcodeproj"; path = nfd.xcodeproj; sourceTree = SOURCE_ROOT; };
-		B767DBEF5EEA00563A1A7ADC2255C208C62713C360F96696 /* test_opendialogmultiple */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = test_opendialogmultiple; path = test_opendialogmultiple; sourceTree = BUILT_PRODUCTS_DIR; };
-		DBBC4EDA893A8412D5925C05D69D7A449728CBB74CBC7A52 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
+		045228841F1E973622EF2EC4 /* test_opendialogmultiple.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = test_opendialogmultiple.c; path = ../../test/test_opendialogmultiple.c; sourceTree = "<group>"; };
+		360631F05E40EAA245DC7830 /* libnfd.a */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "nfd.xcodeproj"; path = nfd.xcodeproj; sourceTree = SOURCE_ROOT; };
+		4B74DEAE2FBBE6E0B3A914EE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		5EEA00562255C20860F96696 /* test_opendialogmultiple */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = test_opendialogmultiple; path = test_opendialogmultiple; sourceTree = BUILT_PRODUCTS_DIR; };
+		893A8412D69D7A444CBC7A52 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		136C43F59EED3AC6413A61E7C727F378246995B4AEC38106 /* Frameworks */ = {
+		9EED3AC6C727F378AEC38106 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				ED4CE49BDAA66E6A01B51B5806AC75838E21E50DD9FA526 /* Foundation.framework in Frameworks */,
-				D4E5D913B762408A71DC6C0248A4EFC541918B2261D3ECA /* AppKit.framework in Frameworks */,
-				600DF7C85EB9CACFD69BF52FB5CF7341318BA799E218090F /* libnfd.a in Frameworks */,
+				BDAA66E6806AC758DD9FA526 /* Foundation.framework in Frameworks */,
+				B762408A248A4EFC261D3ECA /* AppKit.framework in Frameworks */,
+				62D586CEA6E958009ABADD0E /* libnfd.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		49755AD7BBF7678180163982A7E87333BFF7C341FA200DC1 /* Frameworks */ = {
+		3323A4ED33D6A1DFA7B8732D /* test_opendialogmultiple */ = {
 			isa = PBXGroup;
 			children = (
-				71D6295A4B74DEAEC0EF210A2FBBE6E04EE73ACBB3A914EE /* Foundation.framework */,
-				DBBC4EDA893A8412D5925C05D69D7A449728CBB74CBC7A52 /* AppKit.framework */,
+				045228841F1E973622EF2EC4 /* test_opendialogmultiple.c */,
+				BBF76781A7E87333FA200DC1 /* Frameworks */,
+				A6C936B49B3FADE6EA134CF4 /* Products */,
+				9D968EAA920D05DCE0E0A4EA /* Projects */,
 			);
-			name = Frameworks;
+			name = test_opendialogmultiple;
 			sourceTree = "<group>";
 		};
-		C1B317315D4848BAD7CC7DEB745AE3ECDC0CAE626476DEFA /* Products */ = {
+		5D4848BA745AE3EC6476DEFA /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				EDF42C3AA2F9D637D2AB422FE4526695D9A0C5EC770C77 /* libnfd.a */,
+				164F31368771D2283D387F76 /* libnfd.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		DE2FD571A6C936B48E134D4D9B3FADE6BA17F9BDEA134CF4 /* Products */ = {
+		9D968EAA920D05DCE0E0A4EA /* Projects */ = {
 			isa = PBXGroup;
 			children = (
-				B767DBEF5EEA00563A1A7ADC2255C208C62713C360F96696 /* test_opendialogmultiple */,
+				360631F05E40EAA245DC7830 /* nfd.xcodeproj */,
+				360631F05E40EAA245DC7830 /* nfd.xcodeproj */,
 			);
-			name = Products;
+			name = Projects;
 			sourceTree = "<group>";
 		};
-		DE2FDC7F9D968EAA8E13545B920D05DCBA1800CBE0E0A4EA /* Projects */ = {
+		A6C936B49B3FADE6EA134CF4 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */,
-				9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */,
+				5EEA00562255C20860F96696 /* test_opendialogmultiple */,
 			);
-			name = Projects;
+			name = Products;
 			sourceTree = "<group>";
 		};
-		E2F87E433323A4ED5FC2F5BD33D6A1DFFB0AB925A7B8732D /* test_opendialogmultiple */ = {
+		BBF76781A7E87333FA200DC1 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				78D846004522884C1A475441F1E97367344D54B22EF2EC4 /* test_opendialogmultiple.c */,
-				49755AD7BBF7678180163982A7E87333BFF7C341FA200DC1 /* Frameworks */,
-				DE2FD571A6C936B48E134D4D9B3FADE6BA17F9BDEA134CF4 /* Products */,
-				DE2FDC7F9D968EAA8E13545B920D05DCBA1800CBE0E0A4EA /* Projects */,
+				4B74DEAE2FBBE6E0B3A914EE /* Foundation.framework */,
+				893A8412D69D7A444CBC7A52 /* AppKit.framework */,
 			);
-			name = test_opendialogmultiple;
+			name = Frameworks;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		9132448CAFA8257CA4AC0B4E0AE978EE89E2BA9ADE43C3BC /* test_opendialogmultiple */ = {
+		AFA8257C0AE978EEDE43C3BC /* test_opendialogmultiple */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 136C43F48D288325413A61E6B5633BD7246995B39CFEC965 /* Build configuration list for PBXNativeTarget "test_opendialogmultiple" */;
+			buildConfigurationList = 8D288325B5633BD79CFEC965 /* Build configuration list for PBXNativeTarget "test_opendialogmultiple" */;
 			buildPhases = (
-				136C43F90ED4BB66413A61EB370F7418246995B81EAB01A6 /* Resources */,
-				136C43F97881D4BD413A61EBA0BC8D6F246995B888581AFD /* Sources */,
-				136C43F59EED3AC6413A61E7C727F378246995B4AEC38106 /* Frameworks */,
+				0ED4BB66370F74181EAB01A6 /* Resources */,
+				7881D4BDA0BC8D6F88581AFD /* Sources */,
+				9EED3AC6C727F378AEC38106 /* Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				C1C611684B0085C3D7DF7822621320F5DC1FA899522F1C03 /* PBXTargetDependency */,
-				C1C611684B0085C3D7DF7822621320F5DC1FA899522F1C03 /* PBXTargetDependency */,
+				4B0085C3621320F5522F1C03 /* PBXTargetDependency */,
+				4B0085C3621320F5522F1C03 /* PBXTargetDependency */,
 			);
 			name = test_opendialogmultiple;
 			productInstallPath = "$(HOME)/bin";
 			productName = test_opendialogmultiple;
-			productReference = B767DBEF5EEA00563A1A7ADC2255C208C62713C360F96696 /* test_opendialogmultiple */;
+			productReference = 5EEA00562255C20860F96696 /* test_opendialogmultiple */;
 			productType = "com.apple.product-type.tool";
 		};
 /* End PBXNativeTarget section */
@@ -128,37 +128,37 @@
 			buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "test_opendialogmultiple" */;
 			compatibilityVersion = "Xcode 3.2";
 			hasScannedForEncodings = 1;
-			mainGroup = E2F87E433323A4ED5FC2F5BD33D6A1DFFB0AB925A7B8732D /* test_opendialogmultiple */;
+			mainGroup = 3323A4ED33D6A1DFA7B8732D /* test_opendialogmultiple */;
 			projectDirPath = "";
 			projectReferences = (
 				{
-					ProductGroup = C1B317315D4848BAD7CC7DEB745AE3ECDC0CAE626476DEFA /* Products */;
-					ProjectRef = 9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */;
+					ProductGroup = 5D4848BA745AE3EC6476DEFA /* Products */;
+					ProjectRef = 360631F05E40EAA245DC7830 /* nfd.xcodeproj */;
 				},
 				{
-					ProductGroup = C1B317315D4848BAD7CC7DEB745AE3ECDC0CAE626476DEFA /* Products */;
-					ProjectRef = 9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */;
+					ProductGroup = 5D4848BA745AE3EC6476DEFA /* Products */;
+					ProjectRef = 360631F05E40EAA245DC7830 /* nfd.xcodeproj */;
 				},
 			);
 			projectRoot = "";
 			targets = (
-				9132448CAFA8257CA4AC0B4E0AE978EE89E2BA9ADE43C3BC /* test_opendialogmultiple */,
+				AFA8257C0AE978EEDE43C3BC /* test_opendialogmultiple */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		EDF42C3AA2F9D637D2AB422FE4526695D9A0C5EC770C77 /* libnfd.a */ = {
+		164F31368771D2283D387F76 /* libnfd.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = libnfd.a;
-			remoteRef = F815FDB657D02ABAD15C3BB351362C2C5DA27B0844D188FA /* PBXContainerItemProxy */;
+			remoteRef = 57D02ABA51362C2C44D188FA /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
-		136C43F90ED4BB66413A61EB370F7418246995B81EAB01A6 /* Resources */ = {
+		0ED4BB66370F74181EAB01A6 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -168,21 +168,21 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-		136C43F97881D4BD413A61EBA0BC8D6F246995B888581AFD /* Sources */ = {
+		7881D4BDA0BC8D6F88581AFD /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B6597D4BFD8CFC1CDC5C8924578E130E7B9F8FAD1ED50A5C /* test_opendialogmultiple.c in Sources */,
+				FD8CFC1C578E130E1ED50A5C /* test_opendialogmultiple.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		C1C611684B0085C3D7DF7822621320F5DC1FA899522F1C03 /* PBXTargetDependency */ = {
+		4B0085C3621320F5522F1C03 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = libnfd.a;
-			targetProxy = FA883EECAA0A9D53D3CE7CE9A3709EC56014BC3E970BFB93 /* PBXContainerItemProxy */;
+			targetProxy = AA0A9D53A3709EC5970BFB93 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
@@ -190,7 +190,7 @@
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
-		4D67FC88298419259C80F4380DCB21572A790DF991B84F65 /* Release */ = {
+		298419250DCB215791B84F65 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -202,14 +202,36 @@
 			};
 			name = Release;
 		};
-		9F8CEB9AA461F01C795A4EB7C62D9D4EE525A95D02E2C65C /* Debug */ = {
+		39064156FC7203083B15A796 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
+				CONFIGURATION_TEMP_DIR = "$(OBJROOT)";
+				GCC_OPTIMIZATION_LEVEL = 3;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					NDEBUG,
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					../lib/Release/x64,
+				);
+				OBJROOT = obj/x64/Release/test_opendialogmultiple;
+				ONLY_ACTIVE_ARCH = NO;
+				SYMROOT = ../bin;
+				USER_HEADER_SEARCH_PATHS = (
+					../../src/include,
+				);
+			};
+			name = Release;
+		};
+		A461F01CC62D9D4E02E2C65C /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = i386;
 				CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
 				CONFIGURATION_TEMP_DIR = "$(OBJROOT)";
 				COPY_PHASE_STRIP = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -219,9 +241,9 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				LIBRARY_SEARCH_PATHS = (
-					../lib/Debug/x86,
+					../lib/Debug/x64,
 				);
-				OBJROOT = ../obj/x86/Debug/test_opendialogmultiple;
+				OBJROOT = obj/x64/Debug/test_opendialogmultiple;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-lnfd_d",
@@ -233,7 +255,7 @@
 			};
 			name = Debug;
 		};
-		A81EB96DEB85776BE4D7C0F1B9A8CB1DDBCE1BB540B71DAB /* Debug */ = {
+		EB85776BB9A8CB1D40B71DAB /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -245,53 +267,23 @@
 			};
 			name = Debug;
 		};
-		B6C2767B3906415639751567FC720308C581AE4F3B15A796 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = i386;
-				CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
-				CONFIGURATION_TEMP_DIR = "$(OBJROOT)";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					NDEBUG,
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				LIBRARY_SEARCH_PATHS = (
-					../lib/Release/x86,
-				);
-				OBJROOT = ../obj/x86/Release/test_opendialogmultiple;
-				ONLY_ACTIVE_ARCH = NO;
-				SYMROOT = ../bin;
-				USER_HEADER_SEARCH_PATHS = (
-					../../src/include,
-				);
-			};
-			name = Release;
-		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		136C43F48D288325413A61E6B5633BD7246995B39CFEC965 /* Build configuration list for PBXNativeTarget "test_opendialogmultiple" */ = {
+		1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "test_opendialogmultiple" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				4D67FC88298419259C80F4380DCB21572A790DF991B84F65 /* Release */,
-				4D67FC88298419259C80F4380DCB21572A790DF991B84F65 /* Release */,
-				A81EB96DEB85776BE4D7C0F1B9A8CB1DDBCE1BB540B71DAB /* Debug */,
-				A81EB96DEB85776BE4D7C0F1B9A8CB1DDBCE1BB540B71DAB /* Debug */,
+				39064156FC7203083B15A796 /* Release */,
+				A461F01CC62D9D4E02E2C65C /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "test_opendialogmultiple" */ = {
+		8D288325B5633BD79CFEC965 /* Build configuration list for PBXNativeTarget "test_opendialogmultiple" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				B6C2767B3906415639751567FC720308C581AE4F3B15A796 /* Release */,
-				B6C2767B3906415639751567FC720308C581AE4F3B15A796 /* Release */,
-				9F8CEB9AA461F01C795A4EB7C62D9D4EE525A95D02E2C65C /* Debug */,
-				9F8CEB9AA461F01C795A4EB7C62D9D4EE525A95D02E2C65C /* Debug */,
+				298419250DCB215791B84F65 /* Release */,
+				EB85776BB9A8CB1D40B71DAB /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
diff --git a/build/xcode4/test_pickfolder.xcodeproj/project.pbxproj b/build/xcode4/test_pickfolder.xcodeproj/project.pbxproj
index 619e9b7..d02dc65 100644
--- a/build/xcode4/test_pickfolder.xcodeproj/project.pbxproj
+++ b/build/xcode4/test_pickfolder.xcodeproj/project.pbxproj
@@ -7,117 +7,117 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		600DF7C85EB9CACFD69BF52FB5CF7341318BA799E218090F /* libnfd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EDF42C3AA2F9D637D2AB422FE4526695D9A0C5EC770C77 /* libnfd.a */; };
-		9260D3122DE64B06324ADD8E854BBDF8AB6274073759D946 /* test_pickfolder.c in Sources */ = {isa = PBXBuildFile; fileRef = 5F17C4F6A6C583CE26A5CA2AD8BECE80A796EC12529E0A0E /* test_pickfolder.c */; };
-		D4E5D913B762408A71DC6C0248A4EFC541918B2261D3ECA /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DBBC4EDA893A8412D5925C05D69D7A449728CBB74CBC7A52 /* AppKit.framework */; };
-		ED4CE49BDAA66E6A01B51B5806AC75838E21E50DD9FA526 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71D6295A4B74DEAEC0EF210A2FBBE6E04EE73ACBB3A914EE /* Foundation.framework */; };
+		2DE64B06854BBDF83759D946 /* test_pickfolder.c in Sources */ = {isa = PBXBuildFile; fileRef = A6C583CED8BECE80529E0A0E /* test_pickfolder.c */; };
+		62D586CEA6E958009ABADD0E /* libnfd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 164F31368771D2283D387F76 /* libnfd.a */; };
+		B762408A248A4EFC261D3ECA /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 893A8412D69D7A444CBC7A52 /* AppKit.framework */; };
+		BDAA66E6806AC758DD9FA526 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B74DEAE2FBBE6E0B3A914EE /* Foundation.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		F815FDB657D02ABAD15C3BB351362C2C5DA27B0844D188FA /* PBXContainerItemProxy */ = {
+		57D02ABA51362C2C44D188FA /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */;
+			containerPortal = 360631F05E40EAA245DC7830 /* nfd.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = BEE4B8BD4E280AA796E0E38E7CCE5E9967D0FD53D60FB8E7;
+			remoteGlobalIDString = 4E280AA77CCE5E99D60FB8E7;
 			remoteInfo = libnfd.a;
 		};
-		FA883EECAA0A9D53D3CE7CE9A3709EC56014BC3E970BFB93 /* PBXContainerItemProxy */ = {
+		AA0A9D53A3709EC5970BFB93 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */;
+			containerPortal = 360631F05E40EAA245DC7830 /* nfd.xcodeproj */;
 			proxyType = 1;
-			remoteGlobalIDString = EE83A092ED35A9ADD60763CF9188475F12A9D132A3C08FED;
+			remoteGlobalIDString = ED35A9AD9188475FA3C08FED;
 			remoteInfo = libnfd.a;
 		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		43FDC050D96C690B460BBDECFF9298BD5B19E7E066998F4B /* test_pickfolder */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = test_pickfolder; path = test_pickfolder; sourceTree = BUILT_PRODUCTS_DIR; };
-		5F17C4F6A6C583CE26A5CA2AD8BECE80A796EC12529E0A0E /* test_pickfolder.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = test_pickfolder.c; path = ../../test/test_pickfolder.c; sourceTree = "<group>"; };
-		71D6295A4B74DEAEC0EF210A2FBBE6E04EE73ACBB3A914EE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* libnfd.a */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "nfd.xcodeproj"; path = nfd.xcodeproj; sourceTree = SOURCE_ROOT; };
-		DBBC4EDA893A8412D5925C05D69D7A449728CBB74CBC7A52 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
+		360631F05E40EAA245DC7830 /* libnfd.a */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "nfd.xcodeproj"; path = nfd.xcodeproj; sourceTree = SOURCE_ROOT; };
+		4B74DEAE2FBBE6E0B3A914EE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		893A8412D69D7A444CBC7A52 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
+		A6C583CED8BECE80529E0A0E /* test_pickfolder.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = test_pickfolder.c; path = ../../test/test_pickfolder.c; sourceTree = "<group>"; };
+		D96C690BFF9298BD66998F4B /* test_pickfolder */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = test_pickfolder; path = test_pickfolder; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		A1207234FD7590FB5F1710FAA063B7ADD828C1912F89973B /* Frameworks */ = {
+		FD7590FBA063B7AD2F89973B /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				ED4CE49BDAA66E6A01B51B5806AC75838E21E50DD9FA526 /* Foundation.framework in Frameworks */,
-				D4E5D913B762408A71DC6C0248A4EFC541918B2261D3ECA /* AppKit.framework in Frameworks */,
-				600DF7C85EB9CACFD69BF52FB5CF7341318BA799E218090F /* libnfd.a in Frameworks */,
+				BDAA66E6806AC758DD9FA526 /* Foundation.framework in Frameworks */,
+				B762408A248A4EFC261D3ECA /* AppKit.framework in Frameworks */,
+				62D586CEA6E958009ABADD0E /* libnfd.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		49755AD7BBF7678180163982A7E87333BFF7C341FA200DC1 /* Frameworks */ = {
+		5D4848BA745AE3EC6476DEFA /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				71D6295A4B74DEAEC0EF210A2FBBE6E04EE73ACBB3A914EE /* Foundation.framework */,
-				DBBC4EDA893A8412D5925C05D69D7A449728CBB74CBC7A52 /* AppKit.framework */,
+				164F31368771D2283D387F76 /* libnfd.a */,
 			);
-			name = Frameworks;
+			name = Products;
 			sourceTree = "<group>";
 		};
-		5EEF99048705BCC2217E9080D98BE7B4C706D257ABD04B02 /* test_pickfolder */ = {
+		8705BCC2D98BE7B4ABD04B02 /* test_pickfolder */ = {
 			isa = PBXGroup;
 			children = (
-				5F17C4F6A6C583CE26A5CA2AD8BECE80A796EC12529E0A0E /* test_pickfolder.c */,
-				49755AD7BBF7678180163982A7E87333BFF7C341FA200DC1 /* Frameworks */,
-				DE2FD571A6C936B48E134D4D9B3FADE6BA17F9BDEA134CF4 /* Products */,
-				DE2FDC7F9D968EAA8E13545B920D05DCBA1800CBE0E0A4EA /* Projects */,
+				A6C583CED8BECE80529E0A0E /* test_pickfolder.c */,
+				BBF76781A7E87333FA200DC1 /* Frameworks */,
+				A6C936B49B3FADE6EA134CF4 /* Products */,
+				9D968EAA920D05DCE0E0A4EA /* Projects */,
 			);
 			name = test_pickfolder;
 			sourceTree = "<group>";
 		};
-		C1B317315D4848BAD7CC7DEB745AE3ECDC0CAE626476DEFA /* Products */ = {
+		9D968EAA920D05DCE0E0A4EA /* Projects */ = {
 			isa = PBXGroup;
 			children = (
-				EDF42C3AA2F9D637D2AB422FE4526695D9A0C5EC770C77 /* libnfd.a */,
+				360631F05E40EAA245DC7830 /* nfd.xcodeproj */,
+				360631F05E40EAA245DC7830 /* nfd.xcodeproj */,
 			);
-			name = Products;
+			name = Projects;
 			sourceTree = "<group>";
 		};
-		DE2FD571A6C936B48E134D4D9B3FADE6BA17F9BDEA134CF4 /* Products */ = {
+		A6C936B49B3FADE6EA134CF4 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				43FDC050D96C690B460BBDECFF9298BD5B19E7E066998F4B /* test_pickfolder */,
+				D96C690BFF9298BD66998F4B /* test_pickfolder */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		DE2FDC7F9D968EAA8E13545B920D05DCBA1800CBE0E0A4EA /* Projects */ = {
+		BBF76781A7E87333FA200DC1 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */,
-				9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */,
+				4B74DEAE2FBBE6E0B3A914EE /* Foundation.framework */,
+				893A8412D69D7A444CBC7A52 /* AppKit.framework */,
 			);
-			name = Projects;
+			name = Frameworks;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		CBC272421075CB91A508B03F09DBCD03314EEF93FD7729D1 /* test_pickfolder */ = {
+		1075CB9109DBCD03FD7729D1 /* test_pickfolder */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = A1207233EBB0D95A5F1710F98E9F000CD828C1901DC4DF9A /* Build configuration list for PBXNativeTarget "test_pickfolder" */;
+			buildConfigurationList = EBB0D95A8E9F000C1DC4DF9A /* Build configuration list for PBXNativeTarget "test_pickfolder" */;
 			buildPhases = (
-				A12072386D5D119B5F1710FE104B384DD828C1949F7117DB /* Resources */,
-				A1207238D70A2AF25F1710FE79F851A4D828C195091E3132 /* Sources */,
-				A1207234FD7590FB5F1710FAA063B7ADD828C1912F89973B /* Frameworks */,
+				6D5D119B104B384D9F7117DB /* Resources */,
+				D70A2AF279F851A4091E3132 /* Sources */,
+				FD7590FBA063B7AD2F89973B /* Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				C1C611684B0085C3D7DF7822621320F5DC1FA899522F1C03 /* PBXTargetDependency */,
-				C1C611684B0085C3D7DF7822621320F5DC1FA899522F1C03 /* PBXTargetDependency */,
+				4B0085C3621320F5522F1C03 /* PBXTargetDependency */,
+				4B0085C3621320F5522F1C03 /* PBXTargetDependency */,
 			);
 			name = test_pickfolder;
 			productInstallPath = "$(HOME)/bin";
 			productName = test_pickfolder;
-			productReference = 43FDC050D96C690B460BBDECFF9298BD5B19E7E066998F4B /* test_pickfolder */;
+			productReference = D96C690BFF9298BD66998F4B /* test_pickfolder */;
 			productType = "com.apple.product-type.tool";
 		};
 /* End PBXNativeTarget section */
@@ -128,37 +128,37 @@
 			buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "test_pickfolder" */;
 			compatibilityVersion = "Xcode 3.2";
 			hasScannedForEncodings = 1;
-			mainGroup = 5EEF99048705BCC2217E9080D98BE7B4C706D257ABD04B02 /* test_pickfolder */;
+			mainGroup = 8705BCC2D98BE7B4ABD04B02 /* test_pickfolder */;
 			projectDirPath = "";
 			projectReferences = (
 				{
-					ProductGroup = C1B317315D4848BAD7CC7DEB745AE3ECDC0CAE626476DEFA /* Products */;
-					ProjectRef = 9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */;
+					ProductGroup = 5D4848BA745AE3EC6476DEFA /* Products */;
+					ProjectRef = 360631F05E40EAA245DC7830 /* nfd.xcodeproj */;
 				},
 				{
-					ProductGroup = C1B317315D4848BAD7CC7DEB745AE3ECDC0CAE626476DEFA /* Products */;
-					ProjectRef = 9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */;
+					ProductGroup = 5D4848BA745AE3EC6476DEFA /* Products */;
+					ProjectRef = 360631F05E40EAA245DC7830 /* nfd.xcodeproj */;
 				},
 			);
 			projectRoot = "";
 			targets = (
-				CBC272421075CB91A508B03F09DBCD03314EEF93FD7729D1 /* test_pickfolder */,
+				1075CB9109DBCD03FD7729D1 /* test_pickfolder */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		EDF42C3AA2F9D637D2AB422FE4526695D9A0C5EC770C77 /* libnfd.a */ = {
+		164F31368771D2283D387F76 /* libnfd.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = libnfd.a;
-			remoteRef = F815FDB657D02ABAD15C3BB351362C2C5DA27B0844D188FA /* PBXContainerItemProxy */;
+			remoteRef = 57D02ABA51362C2C44D188FA /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
-		A12072386D5D119B5F1710FE104B384DD828C1949F7117DB /* Resources */ = {
+		6D5D119B104B384D9F7117DB /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -168,21 +168,21 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-		A1207238D70A2AF25F1710FE79F851A4D828C195091E3132 /* Sources */ = {
+		D70A2AF279F851A4091E3132 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9260D3122DE64B06324ADD8E854BBDF8AB6274073759D946 /* test_pickfolder.c in Sources */,
+				2DE64B06854BBDF83759D946 /* test_pickfolder.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		C1C611684B0085C3D7DF7822621320F5DC1FA899522F1C03 /* PBXTargetDependency */ = {
+		4B0085C3621320F5522F1C03 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = libnfd.a;
-			targetProxy = FA883EECAA0A9D53D3CE7CE9A3709EC56014BC3E970BFB93 /* PBXContainerItemProxy */;
+			targetProxy = AA0A9D53A3709EC5970BFB93 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
@@ -190,13 +190,35 @@
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
-		43585ADCB388AA0B45665878D9AED9BD5A74826C40B5D04B /* Release */ = {
+		22B4A81A70179E4CE6369E5A /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CONFIGURATION_BUILD_DIR = ../bin;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_DYNAMIC_NO_PIC = NO;
+				INSTALL_PATH = /usr/local/bin;
+				PRODUCT_NAME = test_pickfolder;
+			};
+			name = Release;
+		};
+		B1EBC520755786D2B3FB2B60 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CONFIGURATION_BUILD_DIR = ../bin;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_DYNAMIC_NO_PIC = NO;
+				INSTALL_PATH = /usr/local/bin;
+				PRODUCT_NAME = test_pickfolder_d;
+			};
+			name = Debug;
+		};
+		B388AA0BD9AED9BD40B5D04B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = i386;
 				CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
 				CONFIGURATION_TEMP_DIR = "$(OBJROOT)";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					NDEBUG,
@@ -205,9 +227,9 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				LIBRARY_SEARCH_PATHS = (
-					../lib/Release/x86,
+					../lib/Release/x64,
 				);
-				OBJROOT = ../obj/x86/Release/test_pickfolder;
+				OBJROOT = obj/x64/Release/test_pickfolder;
 				ONLY_ACTIVE_ARCH = NO;
 				SYMROOT = ../bin;
 				USER_HEADER_SEARCH_PATHS = (
@@ -216,14 +238,12 @@
 			};
 			name = Release;
 		};
-		6B05A72BC658A791811F0DE5DD6B42C3855F3E5CCD873DD1 /* Debug */ = {
+		C658A791DD6B42C3CD873DD1 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = i386;
 				CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
 				CONFIGURATION_TEMP_DIR = "$(OBJROOT)";
 				COPY_PHASE_STRIP = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -233,9 +253,9 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				LIBRARY_SEARCH_PATHS = (
-					../lib/Debug/x86,
+					../lib/Debug/x64,
 				);
-				OBJROOT = ../obj/x86/Debug/test_pickfolder;
+				OBJROOT = obj/x64/Debug/test_pickfolder;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-lnfd_d",
@@ -247,51 +267,23 @@
 			};
 			name = Debug;
 		};
-		84467A1822B4A81A7E1C874370179E4C3FB2F6F4E6369E5A /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CONFIGURATION_BUILD_DIR = ../bin;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_DYNAMIC_NO_PIC = NO;
-				INSTALL_PATH = /usr/local/bin;
-				PRODUCT_NAME = test_pickfolder;
-			};
-			name = Release;
-		};
-		A5D1D2B2B1EBC5202884719F755786D2B4910A86B3FB2B60 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CONFIGURATION_BUILD_DIR = ../bin;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_DYNAMIC_NO_PIC = NO;
-				INSTALL_PATH = /usr/local/bin;
-				PRODUCT_NAME = test_pickfolder_d;
-			};
-			name = Debug;
-		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
 		1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "test_pickfolder" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				43585ADCB388AA0B45665878D9AED9BD5A74826C40B5D04B /* Release */,
-				43585ADCB388AA0B45665878D9AED9BD5A74826C40B5D04B /* Release */,
-				6B05A72BC658A791811F0DE5DD6B42C3855F3E5CCD873DD1 /* Debug */,
-				6B05A72BC658A791811F0DE5DD6B42C3855F3E5CCD873DD1 /* Debug */,
+				B388AA0BD9AED9BD40B5D04B /* Release */,
+				C658A791DD6B42C3CD873DD1 /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		A1207233EBB0D95A5F1710F98E9F000CD828C1901DC4DF9A /* Build configuration list for PBXNativeTarget "test_pickfolder" */ = {
+		EBB0D95A8E9F000C1DC4DF9A /* Build configuration list for PBXNativeTarget "test_pickfolder" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				84467A1822B4A81A7E1C874370179E4C3FB2F6F4E6369E5A /* Release */,
-				84467A1822B4A81A7E1C874370179E4C3FB2F6F4E6369E5A /* Release */,
-				A5D1D2B2B1EBC5202884719F755786D2B4910A86B3FB2B60 /* Debug */,
-				A5D1D2B2B1EBC5202884719F755786D2B4910A86B3FB2B60 /* Debug */,
+				22B4A81A70179E4CE6369E5A /* Release */,
+				B1EBC520755786D2B3FB2B60 /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
diff --git a/build/xcode4/test_savedialog.xcodeproj/project.pbxproj b/build/xcode4/test_savedialog.xcodeproj/project.pbxproj
index 47b093f..6c7d1f0 100644
--- a/build/xcode4/test_savedialog.xcodeproj/project.pbxproj
+++ b/build/xcode4/test_savedialog.xcodeproj/project.pbxproj
@@ -7,117 +7,117 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		600DF7C85EB9CACFD69BF52FB5CF7341318BA799E218090F /* libnfd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EDF42C3AA2F9D637D2AB422FE4526695D9A0C5EC770C77 /* libnfd.a */; };
-		D4E5D913B762408A71DC6C0248A4EFC541918B2261D3ECA /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DBBC4EDA893A8412D5925C05D69D7A449728CBB74CBC7A52 /* AppKit.framework */; };
-		ED4CE49BDAA66E6A01B51B5806AC75838E21E50DD9FA526 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71D6295A4B74DEAEC0EF210A2FBBE6E04EE73ACBB3A914EE /* Foundation.framework */; };
-		F9C6A671D68362BE99B0B0EE2DE8D5B012C84766DFF6F0FE /* test_savedialog.c in Sources */ = {isa = PBXBuildFile; fileRef = 6753EC0B8B1CE4062EE1F13FBD162EB8AFD3132736F56A46 /* test_savedialog.c */; };
+		62D586CEA6E958009ABADD0E /* libnfd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 164F31368771D2283D387F76 /* libnfd.a */; };
+		B762408A248A4EFC261D3ECA /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 893A8412D69D7A444CBC7A52 /* AppKit.framework */; };
+		BDAA66E6806AC758DD9FA526 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B74DEAE2FBBE6E0B3A914EE /* Foundation.framework */; };
+		D68362BE2DE8D5B0DFF6F0FE /* test_savedialog.c in Sources */ = {isa = PBXBuildFile; fileRef = 8B1CE406BD162EB836F56A46 /* test_savedialog.c */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		F815FDB657D02ABAD15C3BB351362C2C5DA27B0844D188FA /* PBXContainerItemProxy */ = {
+		57D02ABA51362C2C44D188FA /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */;
+			containerPortal = 360631F05E40EAA245DC7830 /* nfd.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = BEE4B8BD4E280AA796E0E38E7CCE5E9967D0FD53D60FB8E7;
+			remoteGlobalIDString = 4E280AA77CCE5E99D60FB8E7;
 			remoteInfo = libnfd.a;
 		};
-		FA883EECAA0A9D53D3CE7CE9A3709EC56014BC3E970BFB93 /* PBXContainerItemProxy */ = {
+		AA0A9D53A3709EC5970BFB93 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */;
+			containerPortal = 360631F05E40EAA245DC7830 /* nfd.xcodeproj */;
 			proxyType = 1;
-			remoteGlobalIDString = EE83A092ED35A9ADD60763CF9188475F12A9D132A3C08FED;
+			remoteGlobalIDString = ED35A9AD9188475FA3C08FED;
 			remoteInfo = libnfd.a;
 		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		6753EC0B8B1CE4062EE1F13FBD162EB8AFD3132736F56A46 /* test_savedialog.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = test_savedialog.c; path = ../../test/test_savedialog.c; sourceTree = "<group>"; };
-		71D6295A4B74DEAEC0EF210A2FBBE6E04EE73ACBB3A914EE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* libnfd.a */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "nfd.xcodeproj"; path = nfd.xcodeproj; sourceTree = SOURCE_ROOT; };
-		AC2BFB5434DE87E7AE39F8F05B04B799C34822E3C20BAE27 /* test_savedialog */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = test_savedialog; path = test_savedialog; sourceTree = BUILT_PRODUCTS_DIR; };
-		DBBC4EDA893A8412D5925C05D69D7A449728CBB74CBC7A52 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
+		34DE87E75B04B799C20BAE27 /* test_savedialog */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = test_savedialog; path = test_savedialog; sourceTree = BUILT_PRODUCTS_DIR; };
+		360631F05E40EAA245DC7830 /* libnfd.a */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "nfd.xcodeproj"; path = nfd.xcodeproj; sourceTree = SOURCE_ROOT; };
+		4B74DEAE2FBBE6E0B3A914EE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		893A8412D69D7A444CBC7A52 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
+		8B1CE406BD162EB836F56A46 /* test_savedialog.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = test_savedialog.c; path = ../../test/test_savedialog.c; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		D68D68E8152A1D7CB5F75542440C889447125EAB366A817 /* Frameworks */ = {
+		8152A1D72440C889B366A817 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				ED4CE49BDAA66E6A01B51B5806AC75838E21E50DD9FA526 /* Foundation.framework in Frameworks */,
-				D4E5D913B762408A71DC6C0248A4EFC541918B2261D3ECA /* AppKit.framework in Frameworks */,
-				600DF7C85EB9CACFD69BF52FB5CF7341318BA799E218090F /* libnfd.a in Frameworks */,
+				BDAA66E6806AC758DD9FA526 /* Foundation.framework in Frameworks */,
+				B762408A248A4EFC261D3ECA /* AppKit.framework in Frameworks */,
+				62D586CEA6E958009ABADD0E /* libnfd.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		49755AD7BBF7678180163982A7E87333BFF7C341FA200DC1 /* Frameworks */ = {
+		5D4848BA745AE3EC6476DEFA /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				71D6295A4B74DEAEC0EF210A2FBBE6E04EE73ACBB3A914EE /* Foundation.framework */,
-				DBBC4EDA893A8412D5925C05D69D7A449728CBB74CBC7A52 /* AppKit.framework */,
+				164F31368771D2283D387F76 /* libnfd.a */,
 			);
-			name = Frameworks;
+			name = Products;
 			sourceTree = "<group>";
 		};
-		A679D81DD43C4D1E6908CF9A26C27810E911170F906DB5E /* test_savedialog */ = {
+		9D968EAA920D05DCE0E0A4EA /* Projects */ = {
 			isa = PBXGroup;
 			children = (
-				6753EC0B8B1CE4062EE1F13FBD162EB8AFD3132736F56A46 /* test_savedialog.c */,
-				49755AD7BBF7678180163982A7E87333BFF7C341FA200DC1 /* Frameworks */,
-				DE2FD571A6C936B48E134D4D9B3FADE6BA17F9BDEA134CF4 /* Products */,
-				DE2FDC7F9D968EAA8E13545B920D05DCBA1800CBE0E0A4EA /* Projects */,
+				360631F05E40EAA245DC7830 /* nfd.xcodeproj */,
+				360631F05E40EAA245DC7830 /* nfd.xcodeproj */,
 			);
-			name = test_savedialog;
+			name = Projects;
 			sourceTree = "<group>";
 		};
-		C1B317315D4848BAD7CC7DEB745AE3ECDC0CAE626476DEFA /* Products */ = {
+		A6C936B49B3FADE6EA134CF4 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				EDF42C3AA2F9D637D2AB422FE4526695D9A0C5EC770C77 /* libnfd.a */,
+				34DE87E75B04B799C20BAE27 /* test_savedialog */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		DE2FD571A6C936B48E134D4D9B3FADE6BA17F9BDEA134CF4 /* Products */ = {
+		BBF76781A7E87333FA200DC1 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				AC2BFB5434DE87E7AE39F8F05B04B799C34822E3C20BAE27 /* test_savedialog */,
+				4B74DEAE2FBBE6E0B3A914EE /* Foundation.framework */,
+				893A8412D69D7A444CBC7A52 /* AppKit.framework */,
 			);
-			name = Products;
+			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		DE2FDC7F9D968EAA8E13545B920D05DCBA1800CBE0E0A4EA /* Projects */ = {
+		D43C4D1E26C27810F906DB5E /* test_savedialog */ = {
 			isa = PBXGroup;
 			children = (
-				9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */,
-				9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */,
+				8B1CE406BD162EB836F56A46 /* test_savedialog.c */,
+				BBF76781A7E87333FA200DC1 /* Frameworks */,
+				A6C936B49B3FADE6EA134CF4 /* Products */,
+				9D968EAA920D05DCE0E0A4EA /* Projects */,
 			);
-			name = Projects;
+			name = test_savedialog;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		6A116C49EC717EED4357AA46E5D7805FCF9DE99BD972DD2D /* test_savedialog */ = {
+		EC717EEDE5D7805FD972DD2D /* test_savedialog */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = D68D68D6F8DEA36CB5F7553127C10E8447125E9A1A1F076 /* Build configuration list for PBXNativeTarget "test_savedialog" */;
+			buildConfigurationList = 6F8DEA36127C10E8A1A1F076 /* Build configuration list for PBXNativeTarget "test_savedialog" */;
 			buildPhases = (
-				D68D691F13A2277CB5F755794284929447125EE234E28B7 /* Resources */,
-				D68D6925AE73BCECB5F7557FDD56280447125EE8CFB420E /* Sources */,
-				D68D68E8152A1D7CB5F75542440C889447125EAB366A817 /* Frameworks */,
+				F13A227794284929234E28B7 /* Resources */,
+				5AE73BCEFDD562808CFB420E /* Sources */,
+				8152A1D72440C889B366A817 /* Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				C1C611684B0085C3D7DF7822621320F5DC1FA899522F1C03 /* PBXTargetDependency */,
-				C1C611684B0085C3D7DF7822621320F5DC1FA899522F1C03 /* PBXTargetDependency */,
+				4B0085C3621320F5522F1C03 /* PBXTargetDependency */,
+				4B0085C3621320F5522F1C03 /* PBXTargetDependency */,
 			);
 			name = test_savedialog;
 			productInstallPath = "$(HOME)/bin";
 			productName = test_savedialog;
-			productReference = AC2BFB5434DE87E7AE39F8F05B04B799C34822E3C20BAE27 /* test_savedialog */;
+			productReference = 34DE87E75B04B799C20BAE27 /* test_savedialog */;
 			productType = "com.apple.product-type.tool";
 		};
 /* End PBXNativeTarget section */
@@ -128,37 +128,37 @@
 			buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "test_savedialog" */;
 			compatibilityVersion = "Xcode 3.2";
 			hasScannedForEncodings = 1;
-			mainGroup = A679D81DD43C4D1E6908CF9A26C27810E911170F906DB5E /* test_savedialog */;
+			mainGroup = D43C4D1E26C27810F906DB5E /* test_savedialog */;
 			projectDirPath = "";
 			projectReferences = (
 				{
-					ProductGroup = C1B317315D4848BAD7CC7DEB745AE3ECDC0CAE626476DEFA /* Products */;
-					ProjectRef = 9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */;
+					ProductGroup = 5D4848BA745AE3EC6476DEFA /* Products */;
+					ProjectRef = 360631F05E40EAA245DC7830 /* nfd.xcodeproj */;
 				},
 				{
-					ProductGroup = C1B317315D4848BAD7CC7DEB745AE3ECDC0CAE626476DEFA /* Products */;
-					ProjectRef = 9C4B208142B285D2A252A5750767DC44B0DF2675BBD68412 /* nfd.xcodeproj */;
+					ProductGroup = 5D4848BA745AE3EC6476DEFA /* Products */;
+					ProjectRef = 360631F05E40EAA245DC7830 /* nfd.xcodeproj */;
 				},
 			);
 			projectRoot = "";
 			targets = (
-				6A116C49EC717EED4357AA46E5D7805FCF9DE99BD972DD2D /* test_savedialog */,
+				EC717EEDE5D7805FD972DD2D /* test_savedialog */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		EDF42C3AA2F9D637D2AB422FE4526695D9A0C5EC770C77 /* libnfd.a */ = {
+		164F31368771D2283D387F76 /* libnfd.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = libnfd.a;
-			remoteRef = F815FDB657D02ABAD15C3BB351362C2C5DA27B0844D188FA /* PBXContainerItemProxy */;
+			remoteRef = 57D02ABA51362C2C44D188FA /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
-		D68D691F13A2277CB5F755794284929447125EE234E28B7 /* Resources */ = {
+		F13A227794284929234E28B7 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -168,21 +168,21 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-		D68D6925AE73BCECB5F7557FDD56280447125EE8CFB420E /* Sources */ = {
+		5AE73BCEFDD562808CFB420E /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F9C6A671D68362BE99B0B0EE2DE8D5B012C84766DFF6F0FE /* test_savedialog.c in Sources */,
+				D68362BE2DE8D5B0DFF6F0FE /* test_savedialog.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		C1C611684B0085C3D7DF7822621320F5DC1FA899522F1C03 /* PBXTargetDependency */ = {
+		4B0085C3621320F5522F1C03 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = libnfd.a;
-			targetProxy = FA883EECAA0A9D53D3CE7CE9A3709EC56014BC3E970BFB93 /* PBXContainerItemProxy */;
+			targetProxy = AA0A9D53A3709EC5970BFB93 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
@@ -190,37 +190,11 @@
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
-		2E9E40D6D9009F6FCBFF138BAF30028BE5660EA31120036 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CONFIGURATION_BUILD_DIR = ../bin;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_DYNAMIC_NO_PIC = NO;
-				INSTALL_PATH = /usr/local/bin;
-				PRODUCT_NAME = test_savedialog;
-			};
-			name = Release;
-		};
-		5FE1F55A0F8CFFFCE2949446D2F8C1AE6EA12D2E119C663C /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CONFIGURATION_BUILD_DIR = ../bin;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_DYNAMIC_NO_PIC = NO;
-				INSTALL_PATH = /usr/local/bin;
-				PRODUCT_NAME = test_savedialog_d;
-			};
-			name = Debug;
-		};
-		AB8695E00EFAC8E7AD94937C3520F899C2A2BD6F9C27EF27 /* Release */ = {
+		0EFAC8E73520F8999C27EF27 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = i386;
 				CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
 				CONFIGURATION_TEMP_DIR = "$(OBJROOT)";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					NDEBUG,
@@ -229,9 +203,9 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				LIBRARY_SEARCH_PATHS = (
-					../lib/Release/x86,
+					../lib/Release/x64,
 				);
-				OBJROOT = ../obj/x86/Release/test_savedialog;
+				OBJROOT = obj/x64/Release/test_savedialog;
 				ONLY_ACTIVE_ARCH = NO;
 				SYMROOT = ../bin;
 				USER_HEADER_SEARCH_PATHS = (
@@ -240,14 +214,36 @@
 			};
 			name = Release;
 		};
-		AF887F5B5BD5F6D2111EEAFCCCFFA9F25521F26BCEBF5AD /* Debug */ = {
+		0F8CFFFCD2F8C1AE119C663C /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CONFIGURATION_BUILD_DIR = ../bin;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_DYNAMIC_NO_PIC = NO;
+				INSTALL_PATH = /usr/local/bin;
+				PRODUCT_NAME = test_savedialog_d;
+			};
+			name = Debug;
+		};
+		6D9009F6BAF3002831120036 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CONFIGURATION_BUILD_DIR = ../bin;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_DYNAMIC_NO_PIC = NO;
+				INSTALL_PATH = /usr/local/bin;
+				PRODUCT_NAME = test_savedialog;
+			};
+			name = Release;
+		};
+		B5BD5F6DCCCFFA9FBCEBF5AD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = i386;
 				CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
 				CONFIGURATION_TEMP_DIR = "$(OBJROOT)";
 				COPY_PHASE_STRIP = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -257,9 +253,9 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				LIBRARY_SEARCH_PATHS = (
-					../lib/Debug/x86,
+					../lib/Debug/x64,
 				);
-				OBJROOT = ../obj/x86/Debug/test_savedialog;
+				OBJROOT = obj/x64/Debug/test_savedialog;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-lnfd_d",
@@ -277,21 +273,17 @@
 		1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "test_savedialog" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				AB8695E00EFAC8E7AD94937C3520F899C2A2BD6F9C27EF27 /* Release */,
-				AB8695E00EFAC8E7AD94937C3520F899C2A2BD6F9C27EF27 /* Release */,
-				AF887F5B5BD5F6D2111EEAFCCCFFA9F25521F26BCEBF5AD /* Debug */,
-				AF887F5B5BD5F6D2111EEAFCCCFFA9F25521F26BCEBF5AD /* Debug */,
+				0EFAC8E73520F8999C27EF27 /* Release */,
+				B5BD5F6DCCCFFA9FBCEBF5AD /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		D68D68D6F8DEA36CB5F7553127C10E8447125E9A1A1F076 /* Build configuration list for PBXNativeTarget "test_savedialog" */ = {
+		6F8DEA36127C10E8A1A1F076 /* Build configuration list for PBXNativeTarget "test_savedialog" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				2E9E40D6D9009F6FCBFF138BAF30028BE5660EA31120036 /* Release */,
-				2E9E40D6D9009F6FCBFF138BAF30028BE5660EA31120036 /* Release */,
-				5FE1F55A0F8CFFFCE2949446D2F8C1AE6EA12D2E119C663C /* Debug */,
-				5FE1F55A0F8CFFFCE2949446D2F8C1AE6EA12D2E119C663C /* Debug */,
+				6D9009F6BAF3002831120036 /* Release */,
+				0F8CFFFCD2F8C1AE119C663C /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;

From 945c2362d769d2265c649afafcb08b8aa4d29b67 Mon Sep 17 00:00:00 2001
From: Michael Labbe <mike@frogtoss.com>
Date: Mon, 30 Sep 2019 09:40:37 -0700
Subject: [PATCH 06/15] fix warnings

---
 src/simple_exec.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/simple_exec.h b/src/simple_exec.h
index b85327b..7640479 100644
--- a/src/simple_exec.h
+++ b/src/simple_exec.h
@@ -96,7 +96,8 @@ int runCommandArray(char** stdOut, int* stdOutByteCount, int* returnCode, int in
             execvp(command, allArgs);
 
             char err = 1;
-            write(errPipe[WRITE_FD], &err, 1);
+            ssize_t result = write(errPipe[WRITE_FD], &err, 1);
+            release_assert(result != -1);
             
             close(errPipe[WRITE_FD]);
             close(parentToChild[READ_FD]);
@@ -128,7 +129,8 @@ int runCommandArray(char** stdOut, int* stdOutByteCount, int* returnCode, int in
                         release_assert(close(childToParent[READ_FD]) == 0);
 
                         char errChar = 0;
-                        read(errPipe[READ_FD], &errChar, 1);
+                        ssize_t result = read(errPipe[READ_FD], &errChar, 1);
+                        release_assert(result != -1);
                         close(errPipe[READ_FD]);
 
                         if(errChar)

From 334905745fc09d64475f0027184fc7e5964e86fd Mon Sep 17 00:00:00 2001
From: Michael Labbe <mike@frogtoss.com>
Date: Mon, 30 Sep 2019 09:54:54 -0700
Subject: [PATCH 07/15] linux premake a14 generated build script update

---
 build/gmake_linux/Makefile                    |  2 +-
 build/gmake_linux/nfd.make                    | 49 ++++++++---------
 build/gmake_linux/test_opendialog.make        | 52 ++++++++++---------
 .../gmake_linux/test_opendialogmultiple.make  | 52 ++++++++++---------
 build/gmake_linux/test_pickfolder.make        | 52 ++++++++++---------
 build/gmake_linux/test_savedialog.make        | 52 ++++++++++---------
 build/gmake_linux_zenity/Makefile             |  2 +-
 build/gmake_linux_zenity/nfd.make             | 49 ++++++++---------
 build/gmake_linux_zenity/test_opendialog.make | 52 ++++++++++---------
 .../test_opendialogmultiple.make              | 52 ++++++++++---------
 build/gmake_linux_zenity/test_pickfolder.make | 52 ++++++++++---------
 build/gmake_linux_zenity/test_savedialog.make | 52 ++++++++++---------
 12 files changed, 264 insertions(+), 254 deletions(-)

diff --git a/build/gmake_linux/Makefile b/build/gmake_linux/Makefile
index ffe0945..fb00580 100644
--- a/build/gmake_linux/Makefile
+++ b/build/gmake_linux/Makefile
@@ -98,4 +98,4 @@ help:
 	@echo "   test_opendialogmultiple"
 	@echo "   test_savedialog"
 	@echo ""
-	@echo "For more information, see http://industriousone.com/premake/quick-start"
\ No newline at end of file
+	@echo "For more information, see https://github.com/premake/premake-core/wiki"
\ No newline at end of file
diff --git a/build/gmake_linux/nfd.make b/build/gmake_linux/nfd.make
index f211024..d7e1beb 100644
--- a/build/gmake_linux/nfd.make
+++ b/build/gmake_linux/nfd.make
@@ -126,23 +126,33 @@ RESOURCES := \
 
 CUSTOMFILES := \
 
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
+SHELLTYPE := posix
+ifeq (.exe,$(findstring .exe,$(ComSpec)))
+	SHELLTYPE := msdos
 endif
 
-$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
+$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
 	@echo Linking nfd
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(CUSTOMFILES): | $(OBJDIR)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
 ifeq (posix,$(SHELLTYPE))
 	$(SILENT) mkdir -p $(TARGETDIR)
 else
 	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
 endif
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
+
+$(OBJDIR):
+	@echo Creating $(OBJDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(OBJDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
+endif
 
 clean:
 	@echo Cleaning nfd
@@ -161,32 +171,19 @@ prelink:
 	$(PRELINKCMDS)
 
 ifneq (,$(PCH))
-$(OBJECTS): $(GCH) $(PCH)
-$(GCH): $(PCH)
+$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
+$(GCH): $(PCH) | $(OBJDIR)
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
+else
+$(OBJECTS): | $(OBJDIR)
 endif
 
 $(OBJDIR)/nfd_common.o: ../../src/nfd_common.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 $(OBJDIR)/nfd_gtk.o: ../../src/nfd_gtk.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake_linux/test_opendialog.make b/build/gmake_linux/test_opendialog.make
index cb7b89f..223b1bb 100644
--- a/build/gmake_linux/test_opendialog.make
+++ b/build/gmake_linux/test_opendialog.make
@@ -24,7 +24,7 @@ ifeq ($(config),release_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x64/libnfd.a
   LDDEPS += ../lib/Release/x64/libnfd.a
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Release/x64 -m64 -s -lnfd `pkg-config --libs gtk+-3.0`
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x64 -L/usr/lib64 -m64 -s -lnfd `pkg-config --libs gtk+-3.0`
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -51,7 +51,7 @@ ifeq ($(config),release_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x86/libnfd.a
   LDDEPS += ../lib/Release/x86/libnfd.a
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Release/x86 -m32 -s -lnfd `pkg-config --libs gtk+-3.0`
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x86 -L/usr/lib32 -m32 -s -lnfd `pkg-config --libs gtk+-3.0`
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -78,7 +78,7 @@ ifeq ($(config),debug_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Debug/x64 -m64 -lnfd_d `pkg-config --libs gtk+-3.0`
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x64 -L/usr/lib64 -m64 -lnfd_d `pkg-config --libs gtk+-3.0`
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -105,7 +105,7 @@ ifeq ($(config),debug_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Debug/x86 -m32 -lnfd_d `pkg-config --libs gtk+-3.0`
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x86 -L/usr/lib32 -m32 -lnfd_d `pkg-config --libs gtk+-3.0`
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -125,23 +125,33 @@ RESOURCES := \
 
 CUSTOMFILES := \
 
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
+SHELLTYPE := posix
+ifeq (.exe,$(findstring .exe,$(ComSpec)))
+	SHELLTYPE := msdos
 endif
 
-$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
+$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
 	@echo Linking test_opendialog
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(CUSTOMFILES): | $(OBJDIR)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
 ifeq (posix,$(SHELLTYPE))
 	$(SILENT) mkdir -p $(TARGETDIR)
 else
 	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
 endif
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
+
+$(OBJDIR):
+	@echo Creating $(OBJDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(OBJDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
+endif
 
 clean:
 	@echo Cleaning test_opendialog
@@ -160,24 +170,16 @@ prelink:
 	$(PRELINKCMDS)
 
 ifneq (,$(PCH))
-$(OBJECTS): $(GCH) $(PCH)
-$(GCH): $(PCH)
+$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
+$(GCH): $(PCH) | $(OBJDIR)
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
+else
+$(OBJECTS): | $(OBJDIR)
 endif
 
 $(OBJDIR)/test_opendialog.o: ../../test/test_opendialog.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake_linux/test_opendialogmultiple.make b/build/gmake_linux/test_opendialogmultiple.make
index 6928dfb..8b0e224 100644
--- a/build/gmake_linux/test_opendialogmultiple.make
+++ b/build/gmake_linux/test_opendialogmultiple.make
@@ -24,7 +24,7 @@ ifeq ($(config),release_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x64/libnfd.a
   LDDEPS += ../lib/Release/x64/libnfd.a
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Release/x64 -m64 -s -lnfd `pkg-config --libs gtk+-3.0`
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x64 -L/usr/lib64 -m64 -s -lnfd `pkg-config --libs gtk+-3.0`
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -51,7 +51,7 @@ ifeq ($(config),release_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x86/libnfd.a
   LDDEPS += ../lib/Release/x86/libnfd.a
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Release/x86 -m32 -s -lnfd `pkg-config --libs gtk+-3.0`
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x86 -L/usr/lib32 -m32 -s -lnfd `pkg-config --libs gtk+-3.0`
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -78,7 +78,7 @@ ifeq ($(config),debug_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Debug/x64 -m64 -lnfd_d `pkg-config --libs gtk+-3.0`
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x64 -L/usr/lib64 -m64 -lnfd_d `pkg-config --libs gtk+-3.0`
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -105,7 +105,7 @@ ifeq ($(config),debug_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Debug/x86 -m32 -lnfd_d `pkg-config --libs gtk+-3.0`
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x86 -L/usr/lib32 -m32 -lnfd_d `pkg-config --libs gtk+-3.0`
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -125,23 +125,33 @@ RESOURCES := \
 
 CUSTOMFILES := \
 
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
+SHELLTYPE := posix
+ifeq (.exe,$(findstring .exe,$(ComSpec)))
+	SHELLTYPE := msdos
 endif
 
-$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
+$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
 	@echo Linking test_opendialogmultiple
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(CUSTOMFILES): | $(OBJDIR)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
 ifeq (posix,$(SHELLTYPE))
 	$(SILENT) mkdir -p $(TARGETDIR)
 else
 	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
 endif
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
+
+$(OBJDIR):
+	@echo Creating $(OBJDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(OBJDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
+endif
 
 clean:
 	@echo Cleaning test_opendialogmultiple
@@ -160,24 +170,16 @@ prelink:
 	$(PRELINKCMDS)
 
 ifneq (,$(PCH))
-$(OBJECTS): $(GCH) $(PCH)
-$(GCH): $(PCH)
+$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
+$(GCH): $(PCH) | $(OBJDIR)
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
+else
+$(OBJECTS): | $(OBJDIR)
 endif
 
 $(OBJDIR)/test_opendialogmultiple.o: ../../test/test_opendialogmultiple.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake_linux/test_pickfolder.make b/build/gmake_linux/test_pickfolder.make
index 7d6833d..28760ef 100644
--- a/build/gmake_linux/test_pickfolder.make
+++ b/build/gmake_linux/test_pickfolder.make
@@ -24,7 +24,7 @@ ifeq ($(config),release_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x64/libnfd.a
   LDDEPS += ../lib/Release/x64/libnfd.a
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Release/x64 -m64 -s -lnfd `pkg-config --libs gtk+-3.0`
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x64 -L/usr/lib64 -m64 -s -lnfd `pkg-config --libs gtk+-3.0`
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -51,7 +51,7 @@ ifeq ($(config),release_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x86/libnfd.a
   LDDEPS += ../lib/Release/x86/libnfd.a
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Release/x86 -m32 -s -lnfd `pkg-config --libs gtk+-3.0`
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x86 -L/usr/lib32 -m32 -s -lnfd `pkg-config --libs gtk+-3.0`
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -78,7 +78,7 @@ ifeq ($(config),debug_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Debug/x64 -m64 -lnfd_d `pkg-config --libs gtk+-3.0`
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x64 -L/usr/lib64 -m64 -lnfd_d `pkg-config --libs gtk+-3.0`
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -105,7 +105,7 @@ ifeq ($(config),debug_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Debug/x86 -m32 -lnfd_d `pkg-config --libs gtk+-3.0`
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x86 -L/usr/lib32 -m32 -lnfd_d `pkg-config --libs gtk+-3.0`
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -125,23 +125,33 @@ RESOURCES := \
 
 CUSTOMFILES := \
 
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
+SHELLTYPE := posix
+ifeq (.exe,$(findstring .exe,$(ComSpec)))
+	SHELLTYPE := msdos
 endif
 
-$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
+$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
 	@echo Linking test_pickfolder
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(CUSTOMFILES): | $(OBJDIR)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
 ifeq (posix,$(SHELLTYPE))
 	$(SILENT) mkdir -p $(TARGETDIR)
 else
 	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
 endif
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
+
+$(OBJDIR):
+	@echo Creating $(OBJDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(OBJDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
+endif
 
 clean:
 	@echo Cleaning test_pickfolder
@@ -160,24 +170,16 @@ prelink:
 	$(PRELINKCMDS)
 
 ifneq (,$(PCH))
-$(OBJECTS): $(GCH) $(PCH)
-$(GCH): $(PCH)
+$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
+$(GCH): $(PCH) | $(OBJDIR)
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
+else
+$(OBJECTS): | $(OBJDIR)
 endif
 
 $(OBJDIR)/test_pickfolder.o: ../../test/test_pickfolder.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake_linux/test_savedialog.make b/build/gmake_linux/test_savedialog.make
index 1f2d055..5cfd1b8 100644
--- a/build/gmake_linux/test_savedialog.make
+++ b/build/gmake_linux/test_savedialog.make
@@ -24,7 +24,7 @@ ifeq ($(config),release_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x64/libnfd.a
   LDDEPS += ../lib/Release/x64/libnfd.a
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Release/x64 -m64 -s -lnfd `pkg-config --libs gtk+-3.0`
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x64 -L/usr/lib64 -m64 -s -lnfd `pkg-config --libs gtk+-3.0`
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -51,7 +51,7 @@ ifeq ($(config),release_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x86/libnfd.a
   LDDEPS += ../lib/Release/x86/libnfd.a
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Release/x86 -m32 -s -lnfd `pkg-config --libs gtk+-3.0`
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x86 -L/usr/lib32 -m32 -s -lnfd `pkg-config --libs gtk+-3.0`
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -78,7 +78,7 @@ ifeq ($(config),debug_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Debug/x64 -m64 -lnfd_d `pkg-config --libs gtk+-3.0`
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x64 -L/usr/lib64 -m64 -lnfd_d `pkg-config --libs gtk+-3.0`
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -105,7 +105,7 @@ ifeq ($(config),debug_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Debug/x86 -m32 -lnfd_d `pkg-config --libs gtk+-3.0`
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x86 -L/usr/lib32 -m32 -lnfd_d `pkg-config --libs gtk+-3.0`
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -125,23 +125,33 @@ RESOURCES := \
 
 CUSTOMFILES := \
 
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
+SHELLTYPE := posix
+ifeq (.exe,$(findstring .exe,$(ComSpec)))
+	SHELLTYPE := msdos
 endif
 
-$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
+$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
 	@echo Linking test_savedialog
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(CUSTOMFILES): | $(OBJDIR)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
 ifeq (posix,$(SHELLTYPE))
 	$(SILENT) mkdir -p $(TARGETDIR)
 else
 	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
 endif
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
+
+$(OBJDIR):
+	@echo Creating $(OBJDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(OBJDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
+endif
 
 clean:
 	@echo Cleaning test_savedialog
@@ -160,24 +170,16 @@ prelink:
 	$(PRELINKCMDS)
 
 ifneq (,$(PCH))
-$(OBJECTS): $(GCH) $(PCH)
-$(GCH): $(PCH)
+$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
+$(GCH): $(PCH) | $(OBJDIR)
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
+else
+$(OBJECTS): | $(OBJDIR)
 endif
 
 $(OBJDIR)/test_savedialog.o: ../../test/test_savedialog.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake_linux_zenity/Makefile b/build/gmake_linux_zenity/Makefile
index ffe0945..fb00580 100644
--- a/build/gmake_linux_zenity/Makefile
+++ b/build/gmake_linux_zenity/Makefile
@@ -98,4 +98,4 @@ help:
 	@echo "   test_opendialogmultiple"
 	@echo "   test_savedialog"
 	@echo ""
-	@echo "For more information, see http://industriousone.com/premake/quick-start"
\ No newline at end of file
+	@echo "For more information, see https://github.com/premake/premake-core/wiki"
\ No newline at end of file
diff --git a/build/gmake_linux_zenity/nfd.make b/build/gmake_linux_zenity/nfd.make
index e2e86ab..ae83276 100644
--- a/build/gmake_linux_zenity/nfd.make
+++ b/build/gmake_linux_zenity/nfd.make
@@ -126,23 +126,33 @@ RESOURCES := \
 
 CUSTOMFILES := \
 
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
+SHELLTYPE := posix
+ifeq (.exe,$(findstring .exe,$(ComSpec)))
+	SHELLTYPE := msdos
 endif
 
-$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
+$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
 	@echo Linking nfd
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(CUSTOMFILES): | $(OBJDIR)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
 ifeq (posix,$(SHELLTYPE))
 	$(SILENT) mkdir -p $(TARGETDIR)
 else
 	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
 endif
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
+
+$(OBJDIR):
+	@echo Creating $(OBJDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(OBJDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
+endif
 
 clean:
 	@echo Cleaning nfd
@@ -161,32 +171,19 @@ prelink:
 	$(PRELINKCMDS)
 
 ifneq (,$(PCH))
-$(OBJECTS): $(GCH) $(PCH)
-$(GCH): $(PCH)
+$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
+$(GCH): $(PCH) | $(OBJDIR)
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
+else
+$(OBJECTS): | $(OBJDIR)
 endif
 
 $(OBJDIR)/nfd_common.o: ../../src/nfd_common.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 $(OBJDIR)/nfd_zenity.o: ../../src/nfd_zenity.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake_linux_zenity/test_opendialog.make b/build/gmake_linux_zenity/test_opendialog.make
index 08e1e48..7f1a1cb 100644
--- a/build/gmake_linux_zenity/test_opendialog.make
+++ b/build/gmake_linux_zenity/test_opendialog.make
@@ -24,7 +24,7 @@ ifeq ($(config),release_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x64/libnfd.a
   LDDEPS += ../lib/Release/x64/libnfd.a
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Release/x64 -m64 -s -lnfd
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x64 -L/usr/lib64 -m64 -s -lnfd
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -51,7 +51,7 @@ ifeq ($(config),release_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x86/libnfd.a
   LDDEPS += ../lib/Release/x86/libnfd.a
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Release/x86 -m32 -s -lnfd
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x86 -L/usr/lib32 -m32 -s -lnfd
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -78,7 +78,7 @@ ifeq ($(config),debug_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Debug/x64 -m64 -lnfd_d
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x64 -L/usr/lib64 -m64 -lnfd_d
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -105,7 +105,7 @@ ifeq ($(config),debug_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Debug/x86 -m32 -lnfd_d
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x86 -L/usr/lib32 -m32 -lnfd_d
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -125,23 +125,33 @@ RESOURCES := \
 
 CUSTOMFILES := \
 
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
+SHELLTYPE := posix
+ifeq (.exe,$(findstring .exe,$(ComSpec)))
+	SHELLTYPE := msdos
 endif
 
-$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
+$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
 	@echo Linking test_opendialog
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(CUSTOMFILES): | $(OBJDIR)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
 ifeq (posix,$(SHELLTYPE))
 	$(SILENT) mkdir -p $(TARGETDIR)
 else
 	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
 endif
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
+
+$(OBJDIR):
+	@echo Creating $(OBJDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(OBJDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
+endif
 
 clean:
 	@echo Cleaning test_opendialog
@@ -160,24 +170,16 @@ prelink:
 	$(PRELINKCMDS)
 
 ifneq (,$(PCH))
-$(OBJECTS): $(GCH) $(PCH)
-$(GCH): $(PCH)
+$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
+$(GCH): $(PCH) | $(OBJDIR)
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
+else
+$(OBJECTS): | $(OBJDIR)
 endif
 
 $(OBJDIR)/test_opendialog.o: ../../test/test_opendialog.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake_linux_zenity/test_opendialogmultiple.make b/build/gmake_linux_zenity/test_opendialogmultiple.make
index e21c805..dd2dab1 100644
--- a/build/gmake_linux_zenity/test_opendialogmultiple.make
+++ b/build/gmake_linux_zenity/test_opendialogmultiple.make
@@ -24,7 +24,7 @@ ifeq ($(config),release_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x64/libnfd.a
   LDDEPS += ../lib/Release/x64/libnfd.a
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Release/x64 -m64 -s -lnfd
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x64 -L/usr/lib64 -m64 -s -lnfd
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -51,7 +51,7 @@ ifeq ($(config),release_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x86/libnfd.a
   LDDEPS += ../lib/Release/x86/libnfd.a
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Release/x86 -m32 -s -lnfd
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x86 -L/usr/lib32 -m32 -s -lnfd
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -78,7 +78,7 @@ ifeq ($(config),debug_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Debug/x64 -m64 -lnfd_d
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x64 -L/usr/lib64 -m64 -lnfd_d
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -105,7 +105,7 @@ ifeq ($(config),debug_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Debug/x86 -m32 -lnfd_d
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x86 -L/usr/lib32 -m32 -lnfd_d
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -125,23 +125,33 @@ RESOURCES := \
 
 CUSTOMFILES := \
 
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
+SHELLTYPE := posix
+ifeq (.exe,$(findstring .exe,$(ComSpec)))
+	SHELLTYPE := msdos
 endif
 
-$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
+$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
 	@echo Linking test_opendialogmultiple
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(CUSTOMFILES): | $(OBJDIR)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
 ifeq (posix,$(SHELLTYPE))
 	$(SILENT) mkdir -p $(TARGETDIR)
 else
 	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
 endif
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
+
+$(OBJDIR):
+	@echo Creating $(OBJDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(OBJDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
+endif
 
 clean:
 	@echo Cleaning test_opendialogmultiple
@@ -160,24 +170,16 @@ prelink:
 	$(PRELINKCMDS)
 
 ifneq (,$(PCH))
-$(OBJECTS): $(GCH) $(PCH)
-$(GCH): $(PCH)
+$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
+$(GCH): $(PCH) | $(OBJDIR)
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
+else
+$(OBJECTS): | $(OBJDIR)
 endif
 
 $(OBJDIR)/test_opendialogmultiple.o: ../../test/test_opendialogmultiple.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake_linux_zenity/test_pickfolder.make b/build/gmake_linux_zenity/test_pickfolder.make
index c785a60..61c103b 100644
--- a/build/gmake_linux_zenity/test_pickfolder.make
+++ b/build/gmake_linux_zenity/test_pickfolder.make
@@ -24,7 +24,7 @@ ifeq ($(config),release_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x64/libnfd.a
   LDDEPS += ../lib/Release/x64/libnfd.a
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Release/x64 -m64 -s -lnfd
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x64 -L/usr/lib64 -m64 -s -lnfd
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -51,7 +51,7 @@ ifeq ($(config),release_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x86/libnfd.a
   LDDEPS += ../lib/Release/x86/libnfd.a
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Release/x86 -m32 -s -lnfd
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x86 -L/usr/lib32 -m32 -s -lnfd
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -78,7 +78,7 @@ ifeq ($(config),debug_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Debug/x64 -m64 -lnfd_d
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x64 -L/usr/lib64 -m64 -lnfd_d
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -105,7 +105,7 @@ ifeq ($(config),debug_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Debug/x86 -m32 -lnfd_d
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x86 -L/usr/lib32 -m32 -lnfd_d
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -125,23 +125,33 @@ RESOURCES := \
 
 CUSTOMFILES := \
 
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
+SHELLTYPE := posix
+ifeq (.exe,$(findstring .exe,$(ComSpec)))
+	SHELLTYPE := msdos
 endif
 
-$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
+$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
 	@echo Linking test_pickfolder
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(CUSTOMFILES): | $(OBJDIR)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
 ifeq (posix,$(SHELLTYPE))
 	$(SILENT) mkdir -p $(TARGETDIR)
 else
 	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
 endif
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
+
+$(OBJDIR):
+	@echo Creating $(OBJDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(OBJDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
+endif
 
 clean:
 	@echo Cleaning test_pickfolder
@@ -160,24 +170,16 @@ prelink:
 	$(PRELINKCMDS)
 
 ifneq (,$(PCH))
-$(OBJECTS): $(GCH) $(PCH)
-$(GCH): $(PCH)
+$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
+$(GCH): $(PCH) | $(OBJDIR)
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
+else
+$(OBJECTS): | $(OBJDIR)
 endif
 
 $(OBJDIR)/test_pickfolder.o: ../../test/test_pickfolder.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake_linux_zenity/test_savedialog.make b/build/gmake_linux_zenity/test_savedialog.make
index 8f18f6a..505ed88 100644
--- a/build/gmake_linux_zenity/test_savedialog.make
+++ b/build/gmake_linux_zenity/test_savedialog.make
@@ -24,7 +24,7 @@ ifeq ($(config),release_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x64/libnfd.a
   LDDEPS += ../lib/Release/x64/libnfd.a
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Release/x64 -m64 -s -lnfd
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x64 -L/usr/lib64 -m64 -s -lnfd
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -51,7 +51,7 @@ ifeq ($(config),release_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += ../lib/Release/x86/libnfd.a
   LDDEPS += ../lib/Release/x86/libnfd.a
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Release/x86 -m32 -s -lnfd
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Release/x86 -L/usr/lib32 -m32 -s -lnfd
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -78,7 +78,7 @@ ifeq ($(config),debug_x64)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L../lib/Debug/x64 -m64 -lnfd_d
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x64 -L/usr/lib64 -m64 -lnfd_d
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -105,7 +105,7 @@ ifeq ($(config),debug_x86)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS += -lnfd_d
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L../lib/Debug/x86 -m32 -lnfd_d
+  ALL_LDFLAGS += $(LDFLAGS) -L../lib/Debug/x86 -L/usr/lib32 -m32 -lnfd_d
   LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -125,23 +125,33 @@ RESOURCES := \
 
 CUSTOMFILES := \
 
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
+SHELLTYPE := posix
+ifeq (.exe,$(findstring .exe,$(ComSpec)))
+	SHELLTYPE := msdos
 endif
 
-$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
+$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
 	@echo Linking test_savedialog
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(CUSTOMFILES): | $(OBJDIR)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
 ifeq (posix,$(SHELLTYPE))
 	$(SILENT) mkdir -p $(TARGETDIR)
 else
 	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
 endif
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
+
+$(OBJDIR):
+	@echo Creating $(OBJDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(OBJDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
+endif
 
 clean:
 	@echo Cleaning test_savedialog
@@ -160,24 +170,16 @@ prelink:
 	$(PRELINKCMDS)
 
 ifneq (,$(PCH))
-$(OBJECTS): $(GCH) $(PCH)
-$(GCH): $(PCH)
+$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
+$(GCH): $(PCH) | $(OBJDIR)
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
+else
+$(OBJECTS): | $(OBJDIR)
 endif
 
 $(OBJDIR)/test_savedialog.o: ../../test/test_savedialog.c
 	@echo $(notdir $<)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)

From 82fa1bc00a1399f7b60b8fb0639650c9885c8d86 Mon Sep 17 00:00:00 2001
From: Michael Labbe <mike@frogtoss.com>
Date: Mon, 30 Sep 2019 10:40:07 -0700
Subject: [PATCH 08/15] Extra warnings + zenity bugfixes.

Tested on Linux gcc only so far.

Did this because lots of bug reports are results of people
copying source into their projects who are running at higher
warning levels than the generated projects.

Zenity: simple_exec's release asserts not actually asserting.

Cleaned up numerous warnings.
---
 build/gmake_linux/nfd.make        | 16 ++++++++--------
 build/gmake_linux_zenity/nfd.make | 16 ++++++++--------
 build/gmake_macosx/nfd.make       |  8 ++++----
 build/gmake_windows/nfd.make      | 16 ++++++++--------
 build/premake5.lua                |  2 ++
 src/nfd_common.c                  |  6 +++---
 src/nfd_common.h                  |  4 +++-
 src/nfd_zenity.c                  |  4 ----
 src/simple_exec.h                 |  4 +++-
 9 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/build/gmake_linux/nfd.make b/build/gmake_linux/nfd.make
index d7e1beb..379ae12 100644
--- a/build/gmake_linux/nfd.make
+++ b/build/gmake_linux/nfd.make
@@ -19,8 +19,8 @@ ifeq ($(config),release_x64)
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
   ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fno-exceptions `pkg-config --cflags gtk+-3.0`
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fno-exceptions `pkg-config --cflags gtk+-3.0`
+  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -Wall -Wextra -fno-exceptions `pkg-config --cflags gtk+-3.0`
+  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -Wall -Wextra -fno-exceptions `pkg-config --cflags gtk+-3.0`
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS +=
   LDDEPS +=
@@ -46,8 +46,8 @@ ifeq ($(config),release_x86)
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
   ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fno-exceptions `pkg-config --cflags gtk+-3.0`
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fno-exceptions `pkg-config --cflags gtk+-3.0`
+  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -Wall -Wextra -fno-exceptions `pkg-config --cflags gtk+-3.0`
+  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -Wall -Wextra -fno-exceptions `pkg-config --cflags gtk+-3.0`
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS +=
   LDDEPS +=
@@ -73,8 +73,8 @@ ifeq ($(config),debug_x64)
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
   ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -fno-exceptions `pkg-config --cflags gtk+-3.0`
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -g -fno-exceptions `pkg-config --cflags gtk+-3.0`
+  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wall -Wextra -fno-exceptions `pkg-config --cflags gtk+-3.0`
+  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wall -Wextra -fno-exceptions `pkg-config --cflags gtk+-3.0`
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS +=
   LDDEPS +=
@@ -100,8 +100,8 @@ ifeq ($(config),debug_x86)
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
   ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -g -fno-exceptions `pkg-config --cflags gtk+-3.0`
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -g -fno-exceptions `pkg-config --cflags gtk+-3.0`
+  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -g -Wall -Wextra -fno-exceptions `pkg-config --cflags gtk+-3.0`
+  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -g -Wall -Wextra -fno-exceptions `pkg-config --cflags gtk+-3.0`
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS +=
   LDDEPS +=
diff --git a/build/gmake_linux_zenity/nfd.make b/build/gmake_linux_zenity/nfd.make
index ae83276..21870bd 100644
--- a/build/gmake_linux_zenity/nfd.make
+++ b/build/gmake_linux_zenity/nfd.make
@@ -19,8 +19,8 @@ ifeq ($(config),release_x64)
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
   ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fno-exceptions
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fno-exceptions
+  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -Wall -Wextra -fno-exceptions
+  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -Wall -Wextra -fno-exceptions
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS +=
   LDDEPS +=
@@ -46,8 +46,8 @@ ifeq ($(config),release_x86)
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
   ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fno-exceptions
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fno-exceptions
+  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -Wall -Wextra -fno-exceptions
+  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -Wall -Wextra -fno-exceptions
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS +=
   LDDEPS +=
@@ -73,8 +73,8 @@ ifeq ($(config),debug_x64)
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
   ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -fno-exceptions
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -g -fno-exceptions
+  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wall -Wextra -fno-exceptions
+  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wall -Wextra -fno-exceptions
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS +=
   LDDEPS +=
@@ -100,8 +100,8 @@ ifeq ($(config),debug_x86)
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
   ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -g -fno-exceptions
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -g -fno-exceptions
+  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -g -Wall -Wextra -fno-exceptions
+  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -g -Wall -Wextra -fno-exceptions
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS +=
   LDDEPS +=
diff --git a/build/gmake_macosx/nfd.make b/build/gmake_macosx/nfd.make
index a46d407..390dcee 100644
--- a/build/gmake_macosx/nfd.make
+++ b/build/gmake_macosx/nfd.make
@@ -27,8 +27,8 @@ ifeq ($(config),release_x64)
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
   ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fno-exceptions
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fno-exceptions
+  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -Wall -Wextra -fno-exceptions
+  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -Wall -Wextra -fno-exceptions
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS +=
   LDDEPS +=
@@ -62,8 +62,8 @@ ifeq ($(config),debug_x64)
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
   ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -fno-exceptions
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -g -fno-exceptions
+  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wall -Wextra -fno-exceptions
+  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wall -Wextra -fno-exceptions
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS +=
   LDDEPS +=
diff --git a/build/gmake_windows/nfd.make b/build/gmake_windows/nfd.make
index 41615be..ebcb5e9 100644
--- a/build/gmake_windows/nfd.make
+++ b/build/gmake_windows/nfd.make
@@ -19,8 +19,8 @@ ifeq ($(config),release_x64)
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
   ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fno-exceptions
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fno-exceptions
+  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -Wall -Wextra -fno-exceptions
+  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -Wall -Wextra -fno-exceptions
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS +=
   LDDEPS +=
@@ -46,8 +46,8 @@ ifeq ($(config),release_x86)
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
   ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fno-exceptions
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fno-exceptions
+  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -Wall -Wextra -fno-exceptions
+  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -Wall -Wextra -fno-exceptions
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS +=
   LDDEPS +=
@@ -73,8 +73,8 @@ ifeq ($(config),debug_x64)
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
   ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -fno-exceptions
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -g -fno-exceptions
+  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wall -Wextra -fno-exceptions
+  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wall -Wextra -fno-exceptions
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS +=
   LDDEPS +=
@@ -100,8 +100,8 @@ ifeq ($(config),debug_x86)
   INCLUDES += -I../../src/include
   FORCE_INCLUDE +=
   ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -g -fno-exceptions
-  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -g -fno-exceptions
+  ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -g -Wall -Wextra -fno-exceptions
+  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -g -Wall -Wextra -fno-exceptions
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS +=
   LDDEPS +=
diff --git a/build/premake5.lua b/build/premake5.lua
index 3e13fb5..e95e1b3 100644
--- a/build/premake5.lua
+++ b/build/premake5.lua
@@ -70,6 +70,8 @@ workspace "NativeFileDialog"
     includedirs {root_dir.."src/include/"}
     targetdir(build_dir.."/lib/%{cfg.buildcfg}/%{cfg.platform}")
 
+    warnings "extra"
+
     -- system build filters
     filter "system:windows"
       language "C++"
diff --git a/src/nfd_common.c b/src/nfd_common.c
index 269fbd2..55517f5 100644
--- a/src/nfd_common.c
+++ b/src/nfd_common.c
@@ -92,13 +92,13 @@ int NFDi_SafeStrncpy( char *dst, const char *src, size_t maxCopy )
 
 
 /* adapted from microutf8 */
-size_t NFDi_UTF8_Strlen( const nfdchar_t *str )
+int32_t NFDi_UTF8_Strlen( const nfdchar_t *str )
 {
 	/* This function doesn't properly check validity of UTF-8 character 
 	sequence, it is supposed to use only with valid UTF-8 strings. */
     
-	size_t character_count = 0;
-	size_t i = 0; /* Counter used to iterate over string. */
+	int32_t character_count = 0;
+	int32_t i = 0; /* Counter used to iterate over string. */
 	nfdchar_t maybe_bom[4];
 	
 	/* If there is UTF-8 BOM ignore it. */
diff --git a/src/nfd_common.h b/src/nfd_common.h
index a3f6b4a..1a9ab16 100644
--- a/src/nfd_common.h
+++ b/src/nfd_common.h
@@ -12,6 +12,8 @@
 
 #include "nfd.h"
 
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -26,7 +28,7 @@ void  *NFDi_Malloc( size_t bytes );
 void   NFDi_Free( void *ptr );
 void   NFDi_SetError( const char *msg );
 int    NFDi_SafeStrncpy( char *dst, const char *src, size_t maxCopy );
-size_t NFDi_UTF8_Strlen( const nfdchar_t *str );
+int32_t NFDi_UTF8_Strlen( const nfdchar_t *str );
 int    NFDi_IsFilterSegmentChar( char ch );
     
 #ifdef __cplusplus
diff --git a/src/nfd_zenity.c b/src/nfd_zenity.c
index 1b89037..5f93133 100644
--- a/src/nfd_zenity.c
+++ b/src/nfd_zenity.c
@@ -133,10 +133,6 @@ static nfdresult_t ZenityCommon(char** command, int commandLen, const char* defa
 
 static nfdresult_t AllocPathSet(char* zenityList, nfdpathset_t *pathSet )
 {
-    size_t bufSize = 0;
-    nfdchar_t *p_buf;
-    size_t count = 0;
-    
     assert(zenityList);
     assert(pathSet);
     
diff --git a/src/simple_exec.h b/src/simple_exec.h
index 7640479..6308dfe 100644
--- a/src/simple_exec.h
+++ b/src/simple_exec.h
@@ -28,7 +28,7 @@ int runCommandArray(char** stdOut, int* stdOutByteCount, int* returnCode, int in
 #include <stdarg.h>
 #include <fcntl.h>
 
-#define release_assert(x) do { int __release_assert_tmp__ = (x); assert(__release_assert_tmp__); } while(0)
+#define release_assert(exp) { if (!(exp)) { abort(); } }
 
 enum PIPE_FILE_DESCRIPTORS
 {
@@ -70,6 +70,7 @@ int runCommandArray(char** stdOut, int* stdOutByteCount, int* returnCode, int in
         case -1:
         {
             release_assert(0 && "Fork failed");
+            break;
         }
 
         case 0: // child
@@ -158,6 +159,7 @@ int runCommandArray(char** stdOut, int* stdOutByteCount, int* returnCode, int in
                     case -1:
                     {
                         release_assert(0 && "read() failed");
+                        break;
                     }
 
                     default:

From ed2419bbbf0a1d00bc1ea8b56e6b52f0dc5bcd74 Mon Sep 17 00:00:00 2001
From: michael Labbe <mike@frogtoss.com>
Date: Mon, 30 Sep 2019 11:24:23 -0700
Subject: [PATCH 09/15] msvc compile warning free with /w4

---
 src/nfd_win.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/nfd_win.cpp b/src/nfd_win.cpp
index d171856..2c503d2 100644
--- a/src/nfd_win.cpp
+++ b/src/nfd_win.cpp
@@ -86,11 +86,9 @@ static size_t GetUTF8ByteCountForWChar( const wchar_t *str )
     return bytesNeeded+1;
 }
 
-// write to outPtr -- no free() necessary.  No memory stomp tests are done -- they must be done
-// before entering this function.
+// write to outPtr -- no free() necessary.
 static int CopyWCharToExistingNFDCharBuffer( const wchar_t *inStr, nfdchar_t *outPtr )
 {
-    int inStrCharacterCount = static_cast<int>(wcslen(inStr));
     int bytesNeeded = static_cast<int>(GetUTF8ByteCountForWChar( inStr ));
 
     /* invocation copies null term */
@@ -148,7 +146,8 @@ static int AppendExtensionToSpecBuf( const char *ext, char *specBuf, size_t spec
 
     char extWildcard[NFD_MAX_STRLEN];
     int bytesWritten = sprintf_s( extWildcard, NFD_MAX_STRLEN, "*.%s", ext );
-    assert( bytesWritten == strlen(ext)+2 );
+    assert( bytesWritten == (int)(strlen(ext)+2) );
+    _NFD_UNUSED(bytesWritten);
     
     strncat( specBuf, extWildcard, specBufLen - strlen(specBuf) - 1 );
 
@@ -195,7 +194,6 @@ static nfdresult_t AddFiltersToDialog( ::IFileDialog *fileOpenDialog, const char
     p_filterList = filterList;
     char typebuf[NFD_MAX_STRLEN] = {0};  /* one per comma or semicolon */
     char *p_typebuf = typebuf;
-    char filterName[NFD_MAX_STRLEN] = {0};
 
     char specbuf[NFD_MAX_STRLEN] = {0}; /* one per semicolon */
 

From c6b2ae5f2a0e7bdad4d42573e2ef635b79b18ef8 Mon Sep 17 00:00:00 2001
From: michael Labbe <mike@frogtoss.com>
Date: Mon, 30 Sep 2019 11:36:30 -0700
Subject: [PATCH 10/15] mingw unused variable warning fix

---
 src/nfd_win.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/nfd_win.cpp b/src/nfd_win.cpp
index 2c503d2..949da2b 100644
--- a/src/nfd_win.cpp
+++ b/src/nfd_win.cpp
@@ -156,7 +156,6 @@ static int AppendExtensionToSpecBuf( const char *ext, char *specBuf, size_t spec
 
 static nfdresult_t AddFiltersToDialog( ::IFileDialog *fileOpenDialog, const char *filterList )
 {
-    const wchar_t EMPTY_WSTR[] = L"";
     const wchar_t WILDCARD[] = L"*.*";
 
     if ( !filterList || strlen(filterList) == 0 )

From 85f3bacd4de595439ab1cd57233c9479f756d98a Mon Sep 17 00:00:00 2001
From: Michael Labbe <mike@frogtoss.com>
Date: Mon, 30 Sep 2019 11:57:02 -0700
Subject: [PATCH 11/15] macos increase warning level

---
 build/vs2010/nfd.vcxproj                   | 8 ++++----
 build/xcode4/nfd.xcodeproj/project.pbxproj | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build/vs2010/nfd.vcxproj b/build/vs2010/nfd.vcxproj
index 012948b..52e1248 100644
--- a/build/vs2010/nfd.vcxproj
+++ b/build/vs2010/nfd.vcxproj
@@ -91,7 +91,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
@@ -109,7 +109,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
@@ -127,7 +127,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -141,7 +141,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
diff --git a/build/xcode4/nfd.xcodeproj/project.pbxproj b/build/xcode4/nfd.xcodeproj/project.pbxproj
index 4e28e87..0b3f6a8 100644
--- a/build/xcode4/nfd.xcodeproj/project.pbxproj
+++ b/build/xcode4/nfd.xcodeproj/project.pbxproj
@@ -148,6 +148,7 @@
 				USER_HEADER_SEARCH_PATHS = (
 					../../src/include,
 				);
+				WARNING_CFLAGS = "-Wall -Wextra";
 			};
 			name = Debug;
 		};
@@ -184,6 +185,7 @@
 				USER_HEADER_SEARCH_PATHS = (
 					../../src/include,
 				);
+				WARNING_CFLAGS = "-Wall -Wextra";
 			};
 			name = Release;
 		};

From bde3afdd64b8d87869d29d9c11b8e0e3416fc9fc Mon Sep 17 00:00:00 2001
From: michael Labbe <mike@frogtoss.com>
Date: Mon, 30 Sep 2019 12:10:25 -0700
Subject: [PATCH 12/15] Remove scons

---
 docs/build.md   |   9 +----
 src/SConstruct  | 102 ------------------------------------------------
 test/SConstruct |  74 -----------------------------------
 3 files changed, 2 insertions(+), 183 deletions(-)
 delete mode 100644 src/SConstruct
 delete mode 100644 test/SConstruct

diff --git a/docs/build.md b/docs/build.md
index 93fb759..5d13581 100644
--- a/docs/build.md
+++ b/docs/build.md
@@ -13,16 +13,11 @@ Most of the building instructions are included in [README.md](/README.md). This
 
 ### Package Maintainer Only ###
 
-I support a custom Premake action: `premake5 dist`, which generates all of the checked in project types in subdirectories.  It is useful to run this command if you are submitting a pull request to test all of the supported premake configurations.  Do not check in the built projects; I will do so before accepting your pull request.
+I support a custom Premake action: `premake5 dist`, which generates all of the checked in project types in subdirectories.  It is useful to run this command if you are submitting a pull request to test all of the supported premake configurations.  Do not check in the built projects; I will do so while accepting your pull request.
 
 ## SCons build (deprecated) ##
 
-NFD used to use [SCons](http://www.scons.org) for cross-platform builds.  For the time being, the SCons scripts are still available.
-
-After installing SCons, build it with:
-
-    cd src
-    scons debug=[0,1]
+As of 1.1.6, the deprecated and unmaintained SCons support is removed.
 
 ## Compiling with Mingw ##
 
diff --git a/src/SConstruct b/src/SConstruct
deleted file mode 100644
index b1a9e48..0000000
--- a/src/SConstruct
+++ /dev/null
@@ -1,102 +0,0 @@
-# 
-# Native File Dialog
-#
-# Scons build script -- GCC, Clang, Visual Studio
-# Does not build test
-#
-# SCons builds are deprecated -- see README.md for details.
-
-import os
-        
-
-# target arch is build arch -- extend here for OS cross compiling
-target_os=str(Platform())
-
-# Corresponds to TARGET_ARCH set to environ.
-target_arch = ARGUMENTS.get('target_arch', None)
-
-# visual studio does not import from environment
-if target_os != 'win32':
-    IMPORT_FROM_ENV =['CC', 'CXX', 'CFLAGS', 'CXXFLAGS', 'ARFLAGS']
-else:
-    IMPORT_FROM_ENV =[]
-
-
-debug = int(ARGUMENTS.get( 'debug', 0 ))
-
-nfd_files = ['nfd_common.c']
-
-# Due to a Scons limitation, TARGET_ARCH cannot be appended to an existing environment.
-if target_arch != None:
-    nfd_env = Environment( TARGET_ARCH=target_arch )
-else:
-    nfd_env = Environment()
-
-# import specific environment variables from the command line, overriding
-# Scons environment defaults
-for env_key in IMPORT_FROM_ENV:
-    if env_key in os.environ:
-        print "Making %s => %s" % ( env_key, os.environ[env_key] )
-        nfd_env[env_key] = os.environ[env_key]
-
-# Windows runtime library types
-win_rtl = {'debug': '/MDd',     
-           'release': '/MD'}   
-
-def set_debug(env):
-    if target_os == 'win32':
-        env.Append( CCFLAGS=['/Z7',       # obj contains full symbols
-                            win_rtl['debug']
-                        ])
-    else:
-        env.Append( CFLAGS=['-g'] )
-
-
-def set_release(env):
-    if target_os == 'win32':
-        env.Append( CCFLAGS=[win_rtl['release'],  
-                            '/O2'] )
-    else:
-        env.Append( CFLAGS=['-O3'] )
-                    
-
-def set_warnings(env):
-    if target_os == 'win32':
-        env.Append( CCFLAGS=['/W3'],
-                    CPPDEFINES=['_CRT_SECURE_NO_WARNINGS'] )
-    else:
-        env.Append( CFLAGS=['-Wall', '-pedantic'] )
-
-
-def get_lib_name(base, is_debug):
-    if is_debug:
-        return base + '_d'
-    else:
-        return base
-
-
-# Cocoa OS X builds - clang
-if target_os == 'darwin':
-    nfd_files.append('nfd_cocoa.m')
-    nfd_env.CC='clang -fcolor-diagnostics'
-
-# Linux GTK+ 3 builds - GCC
-elif target_os == 'posix':
-    nfd_files.append('nfd_gtk.c')
-    nfd_env.ParseConfig( 'pkg-config --cflags gtk+-3.0' )
-
-# Windows builds - Visual Studio
-elif target_os == 'win32':
-    nfd_files.append('nfd_win.cpp')
-
-if debug:
-    set_debug(nfd_env)
-else:
-    set_release(nfd_env)
-
-set_warnings(nfd_env)
-
-nfd_env.Append( CPPPATH=['.','./include'] )
-nfd_env.StaticLibrary( get_lib_name('nfd', debug), nfd_files )
-
-print "*** Scons builds are deprecated!  See README.md for details."
diff --git a/test/SConstruct b/test/SConstruct
deleted file mode 100644
index bf4f0c7..0000000
--- a/test/SConstruct
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# Native file dialog
-#
-# Build tests
-#
-# SCons builds are deprecated -- see README.md for details.
-
-target_arch=str(Platform())
-debug = int(ARGUMENTS.get( 'debug', 0 ))
-
-files = {'test_opendialog':         ['test_opendialog.c'],
-         'test_opendialogmultiple': ['test_opendialogmultiple.c'],
-         'test_savedialog':         ['test_savedialog.c']}
-
-test_env = Environment()
-
-
-# Windows runtime library types
-win_rtl = {'debug': '/MDd',     
-           'release': '/MD'}    
-
-
-def set_debug(env):
-    if target_arch == 'win32':
-        env.Append( CFLAGS=['/Z7',       # obj contains full symbols
-                            win_rtl['debug'] ] )
-    else:
-        env.Append( CFLAGS=['-g'] )
-
-
-def set_release(env):
-    if target_arch == 'win32':
-        env.Append( CFLAGS=[win_rtl['release'],
-                            '/O2', 
-                            ])
-    else:
-        env.Append( CFLAGS=['-O3'] )
-
-
-def get_lib_name(base, is_debug):
-    if is_debug:
-        return base + '_d'
-    else:
-        return base
-
-
-if debug:
-    set_debug(test_env)
-else:
-    set_release(test_env)
-
-test_env.Append( CPPPATH=['../src/include'], # API header path only, no internals allowed
-                 LIBPATH=['../src'],
-                 LIBS=get_lib_name('nfd', debug) )
-
-
-# Cocoa OS X builds
-if target_arch == 'darwin':
-    test_env.Append( FRAMEWORKS='AppKit' )
-    test_env.CC='clang -fcolor-diagnostics'
-
-# Linux GTK+ 3 builds
-elif target_arch == 'posix':
-    test_env.ParseConfig( 'pkg-config --cflags --libs gtk+-3.0' )
-
-elif target_arch == 'win32':
-    test_env.Append( 
-        LINKFLAGS=['/NODEFAULTLIB:LIBCMT'])
-
-for codebase in files:
-    output_name = get_lib_name(codebase, debug)
-    test_env.Program( output_name, files[codebase] )
-
-print "*** Scons builds are deprecated!  See README.md for details."

From d107cbbda998ae4980257a797dafaee39463c50d Mon Sep 17 00:00:00 2001
From: michael Labbe <mike@frogtoss.com>
Date: Mon, 30 Sep 2019 12:37:01 -0700
Subject: [PATCH 13/15] update docs

---
 README.md                                     | 21 ++++++++++++++-----
 docs/build.md                                 |  4 ++++
 ...tting_pull_requests.md => contributing.md} |  0
 3 files changed, 20 insertions(+), 5 deletions(-)
 rename docs/{submitting_pull_requests.md => contributing.md} (100%)

diff --git a/README.md b/README.md
index 947e645..17bd12c 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,10 @@ See [NFD.h](src/include/nfd.h) for more options.
 
 ## Changelog ##
 
+ - Major version increments denote API breakage.
+ - Minor version increments denote minor ABI or build parameter breakage.
+ - Micro version increments just recompile.
+
 release | what's new                  | date
 --------|-----------------------------|---------
 1.0.0   | initial                     | oct 2014
@@ -71,7 +75,10 @@ release | what's new                  | date
 1.1.4   | improve win32 errorhandling | dec 2018
 1.1.4   | macos fix focus bug         | dec 2018
 1.1.5   | win32 fix com reinitialize  | aug 2019
-   
+1.1.6   | fix osx filter bug          | aug 2019
+1.1.6   | remove deprecated scons     | aug 2019
+1.1.6   | fix mingw compilation       | aug 2019
+1.1.6   | -Wextra warning cleanup     | aug 2019
 
 ## Building ##
 
@@ -85,7 +92,7 @@ Previously, NFD used SCons to build.  It still works, but is now deprecated; upd
 
 ### Makefiles ###
 
-The makefile offers five options, with `release_x64` as the default.
+The makefile offers up to four options, with `release_x64` as the default.
 
     make config=release_x86
     make config=release_x64
@@ -99,6 +106,7 @@ The makefile offers five options, with `release_x64` as the default.
  3. Add `build/<debug|release>/<arch>` to the library search path.
 
 #### Linux GTK ####
+
 `apt-get libgtk-3-dev` installs the gtk dependency for library compilation.
 
 On Linux, you have the option of compiling and linking against GTK.  If you use it, the recommended way to compile is to include the arguments of `pkg-config --cflags --libs gtk+-3.0`.
@@ -108,16 +116,18 @@ On Linux, you have the option of compiling and linking against GTK.  If you use
 Alternatively, you can use the Zenity backend by running the Makefile in `build/gmake_linux_zenity`.  Zenity runs the dialog in its own address space, but requires the user to have Zenity correctly installed and configured on their system.
 
 #### MacOS ####
+
 On Mac OS, add `AppKit` to the list of frameworks.
 
 #### Windows ####
-On Windows, ensure you are building against `comctl32.lib`.
+
+On Windows, ensure you are linking against `comctl32.lib`.
 
 ## Usage ##
 
 See `NFD.h` for API calls.  See `tests/*.c` for example code.
 
-After compiling, `build/bin` contains compiled test programs.
+After compiling, `build/bin` contains compiled test programs.  The appropriate subdirectory under `build/lib` contains the built library.
 
 ## File Filter Syntax ##
 
@@ -144,10 +154,11 @@ See [test_opendialogmultiple.c](test/test_opendialogmultiple.c).
 
 # Known Limitations #
 
-I accept quality code patches, or will resolve these and other matters through support.  See [submitting pull requests](docs/submitting_pull_requests.md) for details.
+I accept quality code patches, or will resolve these and other matters through support.  See [contributing](docs/contributing.md) for details.
 
  - No support for Windows XP's legacy dialogs such as `GetOpenFileName`.
  - No support for file filter names -- ex: "Image Files" (*.png, *.jpg).  Nameless filters are supported, however.
+ - GTK Zenity implementation's process exec error handling does not gracefully handle numerous error cases, choosing to abort rather than cleanup and return.
 
 # Copyright and Credit #
 
diff --git a/docs/build.md b/docs/build.md
index 5d13581..a1f7327 100644
--- a/docs/build.md
+++ b/docs/build.md
@@ -33,3 +33,7 @@ Use the Makefile in `build/gmake_windows` to build Native File Dialog with mingw
 The author has not attempted to build or even install an x86 toolchain for mingw.
 
 If you report an issue, be sure to run make with `verbose=1` so commands are visible.
+
+## Adding NFD source directly to your project ##
+
+Lots of developers add NFD source directly to their projects instead of using the included build scripts.  As of 1.1.6, this is an acknowledged approach to building.  Of course, everyone has a slightly different toolchain with various warnings and linters enabled.  If you run a linter or catch a warning, please consider submitting a pull request to help NFD build cleanly for everyone.
diff --git a/docs/submitting_pull_requests.md b/docs/contributing.md
similarity index 100%
rename from docs/submitting_pull_requests.md
rename to docs/contributing.md

From 77275dbc6d5b7176a42cd4e6a0f0b698cb05d1d2 Mon Sep 17 00:00:00 2001
From: michael Labbe <mike@frogtoss.com>
Date: Mon, 30 Sep 2019 12:42:08 -0700
Subject: [PATCH 14/15] attempt markdown improvement

---
 README.md | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 17bd12c..ea1aea1 100644
--- a/README.md
+++ b/README.md
@@ -19,8 +19,6 @@ Features:
  - Optional Zenity support on Linux to avoid linking GTK.
  - Tested, works alongside [http://www.libsdl.org](SDL2) on all platforms, for the game developers out there.
 
-**Note:** I am considering deprecating mingw support on Windows.  Please contribute your thoughts at [this issue](https://github.com/mlabbe/nativefiledialog/issues/68).
-
 # Example Usage #
 
 ```C
@@ -70,15 +68,15 @@ release | what's new                  | date
 1.1.1   | mingw support, build fixes  | aug 2016
 1.1.2   | test_pickfolder() added     | aug 2016
 1.1.3   | zenity linux backend added  | nov 2017
-1.1.3   | fix char type in decls      | nov 2017
+<i></i> | fix char type in decls      | nov 2017
 1.1.4   | fix win32 memleaks          | dec 2018
-1.1.4   | improve win32 errorhandling | dec 2018
-1.1.4   | macos fix focus bug         | dec 2018
+<i></i> | improve win32 errorhandling | dec 2018
+<i></i> | macos fix focus bug         | dec 2018
 1.1.5   | win32 fix com reinitialize  | aug 2019
 1.1.6   | fix osx filter bug          | aug 2019
-1.1.6   | remove deprecated scons     | aug 2019
-1.1.6   | fix mingw compilation       | aug 2019
-1.1.6   | -Wextra warning cleanup     | aug 2019
+<i></i> | remove deprecated scons     | aug 2019
+<i></i> | fix mingw compilation       | aug 2019
+<i></i> | -Wextra warning cleanup     | aug 2019
 
 ## Building ##
 

From 244e256ee494441878f62f099a90de8d12797fd4 Mon Sep 17 00:00:00 2001
From: michael Labbe <mike@frogtoss.com>
Date: Mon, 30 Sep 2019 13:01:59 -0700
Subject: [PATCH 15/15] readme

---
 README.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index ea1aea1..e34afa9 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ int main( void )
 }
 ```
 
-See [NFD.h](src/include/nfd.h) for more options.
+See self-documenting API [NFD.h](src/include/nfd.h) for more options.
 
 # Screenshots #
 
@@ -57,9 +57,9 @@ See [NFD.h](src/include/nfd.h) for more options.
 
 ## Changelog ##
 
- - Major version increments denote API breakage.
- - Minor version increments denote minor ABI or build parameter breakage.
- - Micro version increments just recompile.
+ - **Major** version increments denote API or ABI departure.
+ - **Minor** version increments denote build or trivial departures.
+ - **Micro** version increments just recompile and drop-in.
 
 release | what's new                  | date
 --------|-----------------------------|---------
@@ -84,7 +84,7 @@ NFD uses [Premake5](https://premake.github.io/download.html) generated Makefiles
 
 If you need to run Premake5 directly, further [build documentation](docs/build.md) is available.
 
-Previously, NFD used SCons to build.  It still works, but is now deprecated; updates to it are discouraged.  Opt to use the native build system where possible.
+Previously, NFD used SCons to build.  As of 1.1.6, SCons support has been removed entirely.
 
 `nfd.a` will be built for release builds, and `nfd_d.a` will be built for debug builds.
 
@@ -157,6 +157,7 @@ I accept quality code patches, or will resolve these and other matters through s
  - No support for Windows XP's legacy dialogs such as `GetOpenFileName`.
  - No support for file filter names -- ex: "Image Files" (*.png, *.jpg).  Nameless filters are supported, however.
  - GTK Zenity implementation's process exec error handling does not gracefully handle numerous error cases, choosing to abort rather than cleanup and return.
+ - GTK 3 spams one warning per dialog created.
 
 # Copyright and Credit #