From d2af825640abb6da4f990892fc13ee3e489883a2 Mon Sep 17 00:00:00 2001
From: Torsten Paul <Torsten.Paul@gmx.de>
Date: Thu, 25 Dec 2014 18:19:26 +0100
Subject: [PATCH] Enable resource lookup for Windows build (needed for dev and
 MSYS2 package).

---
 src/PlatformUtils.cc | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/PlatformUtils.cc b/src/PlatformUtils.cc
index 329fb8fb..e4d80225 100644
--- a/src/PlatformUtils.cc
+++ b/src/PlatformUtils.cc
@@ -25,7 +25,6 @@ static std::string lookupResourcesPath()
 	fs::path resourcedir(applicationpath);
 	PRINTDB("Looking up resource folder with application path '%s'", resourcedir.c_str());
 	
-#ifndef WIN32
 #ifdef __APPLE__
 	const char *searchpath[] = {
 	    "../Resources", 	// Resources can be bundled on Mac.
@@ -34,7 +33,15 @@ static std::string lookupResourcesPath()
 	    NULL
 	};
 #else
-	const char *searchpath[] = {
+#ifdef WIN32
+    const char *searchpath[] = {
+        ".", // Release location
+        RESOURCE_FOLDER("../share/openscad"), // MSYS2 location
+        "..", // Dev location
+        NULL
+    };
+#else
+    const char *searchpath[] = {
 	    RESOURCE_FOLDER("../share/openscad"),
 	    RESOURCE_FOLDER("../../share/openscad"),
 	    ".",
@@ -43,6 +50,7 @@ static std::string lookupResourcesPath()
 	    NULL
 	};
 #endif	
+#endif
 
 	fs::path tmpdir;
 	for (int a = 0;searchpath[a] != NULL;a++) {
@@ -57,7 +65,6 @@ static std::string lookupResourcesPath()
 		break;
 	    }
 	}
-#endif // !WIN32
 
 	// resourcedir defaults to applicationPath
 	std::string result = boosty::stringy(boosty::canonical(resourcedir));