Merge branch 'pr/78' into mingw

aothms · aothms · commit 009870135fcb · 2016-06-05T14:01:55.000+02:00
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -184,7 +184,7 @@ IF(UNICODE_SUPPORT)
 		MESSAGE(STATUS "ICU libraries found")
 		# NOTE icudata appears to be icudt on Windows/MSVC and icudata on others
 		#      dl is included to resolve dlopen and friends symbols
-		IF(MSVC)
+		IF(MSVC OR MINGW)
 			SET(ICU_LIBRARIES icuuc icudt)
 			ADD_DEBUG_VARIANTS(ICU_LIBRARIES "${ICU_LIBRARIES}" "d")
 			ADD_DEFINITIONS(-DU_STATIC_IMPLEMENTATION) # required for static ICU
diff --git a/src/ifcconvert/ColladaSerializer.cpp b/src/ifcconvert/ColladaSerializer.cpp
@@ -223,7 +223,7 @@ void ColladaSerializer::ColladaExporter::ColladaScene::write() {
 		closeVisualScene();
 		closeLibrary();
 
-		COLLADASW::Scene scene (mSW, COLLADASW::URI ("#" + scene_id));
+		COLLADASW::Scene scene (mSW, COLLADASW::URI ("#" + scene_id), COLLADASW::URI ("#" + scene_id));
 		scene.add();		
 	}
 }
diff --git a/src/ifcgeomserver/IfcGeomServer.cpp b/src/ifcgeomserver/IfcGeomServer.cpp
@@ -27,7 +27,7 @@
 #include <iostream>
 #include <boost/cstdint.hpp>
 
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && defined(__CYGWIN__)
 #define SET_BINARY_STREAMS
 #endif
 #ifdef SET_BINARY_STREAMS
diff --git a/src/ifcparse/IfcParse.cpp b/src/ifcparse/IfcParse.cpp
@@ -54,10 +54,12 @@ void init_locale() {
 		locale = _create_locale(LC_NUMERIC, "C");
 	}
 }
-#else
+//#else
+#endif
+
 #ifdef __APPLE__
 #include <xlocale.h>
-#endif
+//#endif
 static locale_t locale = (locale_t) 0;
 void init_locale() {
 	if (locale == (locale_t) 0) {
@@ -66,6 +68,28 @@ void init_locale() {
 }
 #endif
 
+#ifdef __MINGW64__
+#include <locale>
+#include <sstream>
+
+typedef void* locale_t;
+static locale_t locale = (locale_t) 0;
+
+void init_locale() {}
+
+double strtod_l(const char* start, char** end, locale_t loc) {
+    double d;
+    std::stringstream ss;
+    ss.imbue(std::locale::classic());
+    ss << start;
+    ss >> d;
+    size_t nread = ss.tellg();
+    *end = const_cast<char*>(start) + nread;
+    return d;
+}
+#endif
+
+
 // 
 // Opens the file, gets the filesize and reads a chunk in memory
 //

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ void ColladaSerializer::ColladaExporter::ColladaScene::write() {`
`223`	`223`	`closeVisualScene();`
`224`	`224`	`closeLibrary();`
`225`	`225`
`226`		`- COLLADASW::Scene scene (mSW, COLLADASW::URI ("#" + scene_id));`
	`226`	`+ COLLADASW::Scene scene (mSW, COLLADASW::URI ("#" + scene_id), COLLADASW::URI ("#" + scene_id));`
`227`	`227`	`scene.add();`
`228`	`228`	`}`
`229`	`229`	`}`