Merge branch 'bugfixes'

Conflicts: lib/framework/stdio_ext.cpp lib/framework/stdio_ext.h
Warzone2100 · Oct 26, 2014 · b0a5e0b · b0a5e0b
2 parents 5991794 + a41b6e2
commit b0a5e0b
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 6 deletions.
diff --git a/3rdparty/quesoglc/GL/glc.h b/3rdparty/quesoglc/GL/glc.h
@@ -47,7 +47,11 @@
 #  define __WIN32__
 #endif
 
-#ifdef __WIN32__
+// NOTE: For mingw-w64, we must define _GDI32_ otherwise we would be making WINGDIAPI DECLSPEC_IMPORT
+// which we do not want (that is for shared libs, aka dlls).  See wingdi.h to see where the check is.
+// refs: http://sourceforge.net/p/mingw-w64/patches/41/
+#if defined(__WIN32__) && !defined(WINGDIAPI)
+#  define _GDI32_
 #  include <windows.h>
 #endif
 

diff --git a/lib/exceptionhandler/exchndl.cpp b/lib/exceptionhandler/exchndl.cpp
@@ -81,8 +81,11 @@ DWORD GetModuleBase(DWORD dwAddress)
 extern "C"
 {
 #include "include/demangle.h"
-#include "include/coff/internal.h"
-#include "include/libcoff.h"
+// cross compiler does not like these...
+#if !defined(WZ_CC_MINGW)
+  #include "include/coff/internal.h"
+  #include "include/libcoff.h"
+#endif
 }
 
 // Read in the symbol table.

diff --git a/lib/framework/stdio_ext.cpp b/lib/framework/stdio_ext.cpp
@@ -24,7 +24,38 @@
 #include <string.h>
 #include <assert.h>
 
-#if defined(WZ_OS_WIN)
+#if defined(WZ_CC_MSVC)
+int vslcatprintf(char* str, size_t size, const char* format, va_list ap)
+{
+	size_t str_len;
+
+	if (str == NULL
+	 || size == 0)
+	{
+		return vsnprintf(NULL, 0, format, ap);
+	}
+
+	str_len = strlen(str);
+
+	assert(str_len < size);
+
+	return vsnprintf(&str[str_len], size - str_len, format, ap);
+}
+
+
+int slcatprintf(char* str, size_t size, const char* format, ...)
+{
+	va_list ap;
+	int count;
+
+	va_start(ap, format);
+		count = vslcatprintf(str, size, format, ap);
+	va_end(ap);
+
+	return count;
+}
+
+
 int vasprintf(char** strp, const char* format, va_list ap)
 {
 	int count;

diff --git a/lib/framework/stdio_ext.h b/lib/framework/stdio_ext.h
@@ -25,7 +25,26 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#if defined(WZ_OS_WIN) || defined(DOXYGEN)
+#if defined(WZ_CC_MSVC) || defined(DOXYGEN)
+/** A variant on snprintf which appends its output string to the given string
+ *  buffer, rather than to replace it.
+ *  \param str the string to append to
+ *  \param size the size of the buffer \c str expressed in bytes
+ *  \param format the formatting string
+ *  \param ap a variable arguments list of variables to use in the formatting
+ *            string
+ *  \return the amount of characters appended to the string
+ */
+extern int vslcatprintf(char* str, size_t size, const char* format, va_list ap);
+
+
+/** A variant on snprintf which appends its output string to the given string
+ *  The function's interface is similar to vslcatprintf(), so look at that
+ *  function's description.
+ */
+extern int slcatprintf(char* str, size_t size, const char* format, ...) WZ_DECL_FORMAT(printf, 3, 4);
+
+
 // These functions are GNU extensions; so make sure they are available on Windows also
 
 /**

diff --git a/lib/framework/wzglobal.h b/lib/framework/wzglobal.h
@@ -222,7 +222,7 @@
 
 #elif defined(__GNUC__)
 #  define WZ_CC_GNU
-#  if defined(__MINGW32__)
+#  if defined(__MINGW32__) || defined(__MINGW64__)
 #    define WZ_CC_MINGW
 #  endif
 #  if defined(__INTEL_COMPILER)
@@ -532,6 +532,10 @@
 
 #if defined(WZ_OS_WIN)
 #  if defined(WZ_CC_MINGW)
+// NOTE: For mingw-w64, we must define _GDI32_ otherwise we would be making WINGDIAPI DECLSPEC_IMPORT
+// which we do not want (that is for shared libs, aka dlls).  See wingdi.h to see where the check is.
+// refs: http://sourceforge.net/p/mingw-w64/patches/41/
+#    define _GDI32_
 #    include <unistd.h>
 #    include <sys/param.h>
 #    include <w32api.h>