浏览代码

xbo fixes

ncannasse 7 年之前
父节点
当前提交
2c46e1b5ee
共有 2 个文件被更改,包括 8 次插入5 次删除
  1. 2 2
      libs/fmt/fmt.c
  2. 6 3
      src/hlc.h

+ 2 - 2
libs/fmt/fmt.c

@@ -2,7 +2,7 @@
 #include <png.h>
 #include <hl.h>
 
-#ifdef HL_CONSOLE
+#if defined(HL_CONSOLE) && !defined(HL_XBO)
 extern bool sys_jpg_decode( vbyte *data, int dataLen, vbyte *out, int width, int height, int stride, int format, int flags );
 #else
 #	include <turbojpeg.h>
@@ -18,7 +18,7 @@ typedef struct {
 } pixel;
 
 HL_PRIM bool HL_NAME(jpg_decode)( vbyte *data, int dataLen, vbyte *out, int width, int height, int stride, int format, int flags ) {
-#ifdef HL_CONSOLE
+#if defined(HL_CONSOLE) && !defined(HL_XBO)
 	return sys_jpg_decode(data, dataLen, out, width, height, stride, format, flags);
 #else
 	tjhandle h = tjInitDecompress();

+ 6 - 3
src/hlc.h

@@ -46,16 +46,19 @@
 // disable some warnings triggered by HLC code generator
 
 #ifdef HL_VCC
-#	pragma warning(disable:4702) // unreachable code
 #	pragma warning(disable:4100) // unreferenced param
 #	pragma warning(disable:4101) // unreferenced local var
 #	pragma warning(disable:4102) // unreferenced label
+#	pragma warning(disable:4204) // nonstandard extension
+#	pragma warning(disable:4221) // nonstandard extension
+#	pragma warning(disable:4244) // possible loss of data
 #	pragma warning(disable:4700) // uninitialized local variable used
+#	pragma warning(disable:4701) // potentially uninitialized local variable
+#	pragma warning(disable:4702) // unreachable code
 #	pragma warning(disable:4703) // potentially uninitialized local
-#	pragma warning(disable:4723) // potential divide by 0
 #	pragma warning(disable:4715) // control paths must return a value
 #	pragma warning(disable:4716) // must return a value (ends with throw)
-#	pragma warning(disable:4701) // potentially uninitialized local variable
+#	pragma warning(disable:4723) // potential divide by 0
 #else
 #	pragma GCC diagnostic ignored "-Wunused-variable"
 #	pragma GCC diagnostic ignored "-Wunused-function"