diff --git a/configure.ac b/configure.ac index 082efd5..6411b9c 100644 --- a/configure.ac +++ b/configure.ac @@ -422,7 +422,7 @@ PKG_CHECK_MODULES([OpenEXR], OpenEXR, [ _cppflags=$CPPFLAGS _ldflags=$LDFLAGS - CPPFLAGS="$SQ_EXR_CFLAGS $CPPFLAGS" + CPPFLAGS="$SQ_EXR_CFLAGS $CPPFLAGS $USE_EXCEPTIONS" LDFLAGS="$LDFLAGS $SQ_EXR_LDFLAGS" AC_LANG_SAVE diff --git a/kernel/kls_camera/Makefile.am b/kernel/kls_camera/Makefile.am index 275b9c4..d5e1a79 100644 --- a/kernel/kls_camera/Makefile.am +++ b/kernel/kls_camera/Makefile.am @@ -36,4 +36,4 @@ EXTRA_DIST = libkls_camera.so.ui ksquirrel-libs-camera2ppm.in install-data-am: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - $(INSTALL) --mode=0644 libkls_camera.so.ui $(DESTDIR)$(pkgdatadir)/libkls_camera.so.ui + $(INSTALL) -m 0644 libkls_camera.so.ui $(DESTDIR)$(pkgdatadir)/libkls_camera.so.ui diff --git a/kernel/kls_djvu/Makefile.am b/kernel/kls_djvu/Makefile.am index e546bff..ea51058 100644 --- a/kernel/kls_djvu/Makefile.am +++ b/kernel/kls_djvu/Makefile.am @@ -14,4 +14,4 @@ EXTRA_DIST = libkls_djvu.so.ui install-data-am: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - $(INSTALL) --mode=0644 libkls_djvu.so.ui $(DESTDIR)$(pkgdatadir)/libkls_djvu.so.ui + $(INSTALL) -m 0644 libkls_djvu.so.ui $(DESTDIR)$(pkgdatadir)/libkls_djvu.so.ui diff --git a/kernel/kls_dxf/Makefile.am b/kernel/kls_dxf/Makefile.am index 7d3fc63..a9a7251 100644 --- a/kernel/kls_dxf/Makefile.am +++ b/kernel/kls_dxf/Makefile.am @@ -14,4 +14,4 @@ EXTRA_DIST = libkls_dxf.so.ui install-data-am: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - $(INSTALL) --mode=0644 libkls_dxf.so.ui $(DESTDIR)$(pkgdatadir)/libkls_dxf.so.ui + $(INSTALL) -m 0644 libkls_dxf.so.ui $(DESTDIR)$(pkgdatadir)/libkls_dxf.so.ui diff --git a/kernel/kls_gif/fmt_codec_gif.cpp b/kernel/kls_gif/fmt_codec_gif.cpp index a4981bf..33d13e7 100644 --- a/kernel/kls_gif/fmt_codec_gif.cpp +++ b/kernel/kls_gif/fmt_codec_gif.cpp @@ -50,9 +50,9 @@ static void PrintGifError(void) #endif { #if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR > 4 - char *Err = GifErrorString(ErrorCode); + const char *Err = GifErrorString(ErrorCode); #else - char *Err = GifErrorString(); + const char *Err = GifErrorString(); #endif if (Err != NULL) { diff --git a/kernel/kls_jpeg/fmt_codec_jpeg.cpp b/kernel/kls_jpeg/fmt_codec_jpeg.cpp index 60fe8e8..237a8d0 100644 --- a/kernel/kls_jpeg/fmt_codec_jpeg.cpp +++ b/kernel/kls_jpeg/fmt_codec_jpeg.cpp @@ -277,7 +277,7 @@ s32 fmt_codec::write_next_pass() s32 fmt_codec::write_scanline(RGBA *scan) { - RGB sr[writeimage.w]; + RGB *sr = new RGB[writeimage.w]; for(s32 s = 0;s < writeimage.w;s++) { @@ -288,6 +288,7 @@ s32 fmt_codec::write_scanline(RGBA *scan) (void)jpeg_write_scanlines(&m_cinfo, &row_pointer, 1); + delete [] sr; return SQE_OK; } diff --git a/kernel/kls_ljpeg/ljpeg2ppm/huffd.c b/kernel/kls_ljpeg/ljpeg2ppm/huffd.c index da5d2e9..456acf3 100644 --- a/kernel/kls_ljpeg/ljpeg2ppm/huffd.c +++ b/kernel/kls_ljpeg/ljpeg2ppm/huffd.c @@ -36,7 +36,10 @@ #include #include #include +#if defined(_MSC_VER) && (defined(WIN32) || defined(_Windows) || \ + defined(_WINDOWS) || defined(_WIN32) || defined(__WIN32__)) #include +#endif #include "jpeg.h" #include "mcu.h" #include "io.h" diff --git a/kernel/kls_ljpeg/ljpeg2ppm/ljpgtopnm.c b/kernel/kls_ljpeg/ljpeg2ppm/ljpgtopnm.c index c975892..c38c214 100644 --- a/kernel/kls_ljpeg/ljpeg2ppm/ljpgtopnm.c +++ b/kernel/kls_ljpeg/ljpeg2ppm/ljpgtopnm.c @@ -35,7 +35,10 @@ #include #include +#if defined(_MSC_VER) && (defined(WIN32) || defined(_Windows) || \ + defined(_WINDOWS) || defined(_WIN32) || defined(__WIN32__)) #include +#endif #include #include "jpeg.h" #include "mcu.h" diff --git a/kernel/kls_ljpeg/ljpeg2ppm/mcu.c b/kernel/kls_ljpeg/ljpeg2ppm/mcu.c index bb1f0b3..d590e72 100644 --- a/kernel/kls_ljpeg/ljpeg2ppm/mcu.c +++ b/kernel/kls_ljpeg/ljpeg2ppm/mcu.c @@ -30,7 +30,10 @@ #include #include +#if defined(_MSC_VER) && (defined(WIN32) || defined(_Windows) || \ + defined(_WINDOWS) || defined(_WIN32) || defined(__WIN32__)) #include +#endif #include #include "jpeg.h" #include "mcu.h" diff --git a/kernel/kls_ljpeg/ljpeg2ppm/read.c b/kernel/kls_ljpeg/ljpeg2ppm/read.c index e4855fd..ac12070 100644 --- a/kernel/kls_ljpeg/ljpeg2ppm/read.c +++ b/kernel/kls_ljpeg/ljpeg2ppm/read.c @@ -35,7 +35,10 @@ #include #include +#if defined(_MSC_VER) && (defined(WIN32) || defined(_Windows) || \ + defined(_WINDOWS) || defined(_WIN32) || defined(__WIN32__)) #include +#endif #include #include "jpeg.h" #include "mcu.h" diff --git a/kernel/kls_ljpeg/ljpeg2ppm/util.c b/kernel/kls_ljpeg/ljpeg2ppm/util.c index d5e99cb..9474291 100644 --- a/kernel/kls_ljpeg/ljpeg2ppm/util.c +++ b/kernel/kls_ljpeg/ljpeg2ppm/util.c @@ -36,7 +36,10 @@ #include #include #include +#if defined(_MSC_VER) && (defined(WIN32) || defined(_Windows) || \ + defined(_WINDOWS) || defined(_WIN32) || defined(__WIN32__)) #include +#endif #include "jpeg.h" #include "mcu.h" #include "proto.h" diff --git a/kernel/kls_svg/Makefile.am b/kernel/kls_svg/Makefile.am index 2bbc93d..9e2474c 100644 --- a/kernel/kls_svg/Makefile.am +++ b/kernel/kls_svg/Makefile.am @@ -16,4 +16,4 @@ EXTRA_DIST = libkls_svg.so.ui ksquirrel-libs-svg2png.in install-data-am: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - $(INSTALL) --mode=0644 libkls_svg.so.ui $(DESTDIR)$(pkgdatadir)/libkls_svg.so.ui + $(INSTALL) -m 0644 libkls_svg.so.ui $(DESTDIR)$(pkgdatadir)/libkls_svg.so.ui diff --git a/kernel/kls_tiff/Makefile.am b/kernel/kls_tiff/Makefile.am index 822a862..0414d92 100644 --- a/kernel/kls_tiff/Makefile.am +++ b/kernel/kls_tiff/Makefile.am @@ -12,6 +12,6 @@ EXTRA_DIST = libkls_tiff.so.ui install-data-am: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - $(INSTALL) --mode=0644 libkls_tiff.so.ui $(DESTDIR)$(pkgdatadir)/libkls_tiff.so.ui + $(INSTALL) -m 0644 libkls_tiff.so.ui $(DESTDIR)$(pkgdatadir)/libkls_tiff.so.ui AM_CXXFLAGS = -DTIFF_UI=\"${pkgdatadir}/libkls_tiff.so.ui\" diff --git a/kernel/kls_xcf/Makefile.am b/kernel/kls_xcf/Makefile.am index 6b9a50d..0af18aa 100644 --- a/kernel/kls_xcf/Makefile.am +++ b/kernel/kls_xcf/Makefile.am @@ -15,4 +15,4 @@ EXTRA_DIST = libkls_xcf.so.ui install-data-am: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - $(INSTALL) --mode=0644 libkls_xcf.so.ui $(DESTDIR)$(pkgdatadir)/libkls_xcf.so.ui + $(INSTALL) -m 0644 libkls_xcf.so.ui $(DESTDIR)$(pkgdatadir)/libkls_xcf.so.ui diff --git a/kernel/kls_xcf/xcf2pnm/Makefile.am b/kernel/kls_xcf/xcf2pnm/Makefile.am index c81ca26..15db50a 100644 --- a/kernel/kls_xcf/xcf2pnm/Makefile.am +++ b/kernel/kls_xcf/xcf2pnm/Makefile.am @@ -1,5 +1,6 @@ bin_PROGRAMS = ksquirrel-libs-xcf2pnm ksquirrel_libs_xcf2pnm_SOURCES = enums.c flatspec.c flatten.c io-unix.c pixels.c scaletab.c table.c utils.c xcf2pnm.c xcf-general.c +ksquirrel_libs_xcf2pnm_LDFLAGS = $(LIBICONV) -EXTRA_DIST = xcf2pnm.oi \ No newline at end of file +EXTRA_DIST = xcf2pnm.oi diff --git a/kernel/kls_xpm/Makefile.am b/kernel/kls_xpm/Makefile.am index 0188af0..882d749 100644 --- a/kernel/kls_xpm/Makefile.am +++ b/kernel/kls_xpm/Makefile.am @@ -14,4 +14,4 @@ EXTRA_DIST = rgbmap install-data-am: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - $(INSTALL) --mode=0644 rgbmap $(DESTDIR)$(pkgdatadir)/rgbmap \ No newline at end of file + $(INSTALL) -m 0644 rgbmap $(DESTDIR)$(pkgdatadir)/rgbmap