Merge pull request #49 from virxkane/win32-mingw-fixes

Desktop: fix build failures on win32/mingw.

Author: buggins

CMakeLists.txt

@@ -214,6 +214,10 @@ endif (NOT WIN32 AND NOT CR3_FREETYPE)
 
 if (NOT FREETYPE_FOUND)
   message("System FREETYPE not found, will build local one\n")
+  if (NOT HarfBuzz_FOUND)
+    SET(HARFBUZZ_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/harfbuzz/src)
+    SET(HARFBUZZ_LIBRARIES harfbuzz)
+  endif (NOT HarfBuzz_FOUND)
   ADD_SUBDIRECTORY(thirdparty/freetype)
   SET(FREETYPE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/freetype/include)
   SET(FREETYPE_LIBRARIES freetype)

crengine/src/wordfmt.cpp

@@ -21,6 +21,7 @@
 #include "../include/wordfmt.h"
 
 #ifdef _WIN32
+#if defined(_MSC_VER) || (defined(__MINGW64_VERSION_MAJOR) && defined(NO_OLDNAMES)) || (defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) && !defined(_EMULATE_GLIBC))
 extern "C" {
 	int strcasecmp(const char *s1, const char *s2) {
         return _stricmp(s1,s2);
@@ -29,6 +30,7 @@ extern "C" {
 //	int	optind = 0;
 }
 #endif
+#endif	// _WIN32
 
 #ifdef _DEBUG
 #define TRACE(x, ...) CRLog::trace(x)