include libjpeg dependency

webarkit · Aug 18, 2019 · 5f43758 · 5f43758
1 parent a1fdb2e
commit 5f43758
Show file tree

Hide file tree

Showing 14 changed files with 3,142 additions and 4 deletions.
diff --git a/Source/ARX/AR2/CMakeLists.txt b/Source/ARX/AR2/CMakeLists.txt
@@ -1,5 +1,7 @@
 if(NOT ARX_TARGET_PLATFORM_WINDOWS)
-	find_package(JPEG REQUIRED)
+  if(NOT ARX_TARGET_PLATFORM_EMSCRIPTEN)
+    find_package(JPEG REQUIRED)
+  endif()
 else()
 	find_path(JPEG_INCLUDE_DIR
 		NAMES jconfig.h jmorecfg.h jpeglib.h jversion.h

diff --git a/Source/ARX/ARVideo/CMakeLists.txt b/Source/ARX/ARVideo/CMakeLists.txt
@@ -10,7 +10,9 @@
 # their changes propagate to this main build file.
 #
 if(NOT ARX_TARGET_PLATFORM_WINDOWS)
-	find_package(JPEG REQUIRED)
+  if(NOT ARX_TARGET_PLATFORM_EMSCRIPTEN)
+    find_package(JPEG REQUIRED)
+  endif()
 else()
 	find_path(JPEG_INCLUDE_DIR
 		NAMES jconfig.h jmorecfg.h jpeglib.h jversion.h

diff --git a/Source/ARX/OCVT/CMakeLists.txt b/Source/ARX/OCVT/CMakeLists.txt
@@ -1,5 +1,7 @@
 if(NOT ARX_TARGET_PLATFORM_WINDOWS)
-	find_package(JPEG REQUIRED)
+  if(NOT ARX_TARGET_PLATFORM_EMSCRIPTEN)
+    find_package(JPEG REQUIRED)
+  endif()
 else()
 	find_path(JPEG_INCLUDE_DIR
 		NAMES jconfig.h jmorecfg.h jpeglib.h jversion.h

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
@@ -66,7 +66,11 @@ if(ARX_TARGET_PLATFORM_VARIANT)
     set(ARX_PLATFORM_NAME_FILESYSTEM "${ARX_PLATFORM_NAME_LC}-${ARX_TARGET_PLATFORM_VARIANT}")
 else()
     if (ARX_TARGET_PLATFORM_EMSCRIPTEN)
-        # add_definitions("-msse -msse2 -msse3 -mssse3 -I${PROJECT_SOURCE_DIR}/depends/emscripten/opencv-3.4.1 -I${PROJECT_SOURCE_DIR}/depends/emscripten/opencv-3.4.1/modules/core/include -I${PROJECT_SOURCE_DIR}/depends/emscripten/opencv-3.4.1/modules/highgui/include -I${PROJECT_SOURCE_DIR}/depends/emscripten/opencv-3.4.1/modules/imgcodecs/include -I${PROJECT_SOURCE_DIR}/depends/emscripten/opencv-3.4.1/modules/videoio/include -I${PROJECT_SOURCE_DIR}/depends/emscripten/opencv-3.4.1/modules/imgproc/include -I${PROJECT_SOURCE_DIR}/depends/emscripten/opencv-3.4.1/modules/calib3d/include -I${PROJECT_SOURCE_DIR}/depends/emscripten/opencv-3.4.1/modules/features2d/include -I${PROJECT_SOURCE_DIR}/depends/emscripten/opencv-3.4.1/modules/flann/include -I${PROJECT_SOURCE_DIR}/depends/emscripten/opencv-3.4.1/modules/video/include -I${PROJECT_SOURCE_DIR}/ARX/OCVT/include")
+        # add_definitions("-msse -msse2 -msse3 -mssse3 -s USE_LIBJPEG -I${PROJECT_SOURCE_DIR}/depends/emscripten/opencv-3.4.1 -I${PROJECT_SOURCE_DIR}/depends/emscripten/opencv-3.4.1/modules/core/include -I${PROJECT_SOURCE_DIR}/depends/emscripten/opencv-3.4.1/modules/highgui/include -I${PROJECT_SOURCE_DIR}/depends/emscripten/opencv-3.4.1/modules/imgcodecs/include -I${PROJECT_SOURCE_DIR}/depends/emscripten/opencv-3.4.1/modules/videoio/include -I${PROJECT_SOURCE_DIR}/depends/emscripten/opencv-3.4.1/modules/imgproc/include -I${PROJECT_SOURCE_DIR}/depends/emscripten/opencv-3.4.1/modules/calib3d/include -I${PROJECT_SOURCE_DIR}/depends/emscripten/opencv-3.4.1/modules/features2d/include -I${PROJECT_SOURCE_DIR}/depends/emscripten/opencv-3.4.1/modules/flann/include -I${PROJECT_SOURCE_DIR}/depends/emscripten/opencv-3.4.1/modules/video/include -I${PROJECT_SOURCE_DIR}/ARX/OCVT/include")
+        set(JPEG_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/depends/emscripten/libjpeg/includes)
+
+        set(JPEG_LIBRARIES ${PROJECT_SOURCE_DIR}/depends/emscripten/libjpeg/)
+        message("JPEG_INCLUDE_DIR ${JPEG_LIBRARIES}")
         set(HAVE_INTEL_SIMD 0)
         if(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
             set(ARX_PLATFORM_NAME_FILESYSTEM "macos")

diff --git a/Source/depends/emscripten/libjpeg/includes/jconfig.h b/Source/depends/emscripten/libjpeg/includes/jconfig.h
@@ -0,0 +1,52 @@
+/* jconfig.vc --- jconfig.h for Microsoft Visual C++ on Windows 9x or NT. */
+/* This file also works for Borland C++ 32-bit (bcc32) on Windows 9x or NT. */
+/* see jconfig.txt for explanations */
+
+#define HAVE_PROTOTYPES
+#define HAVE_UNSIGNED_CHAR
+#define HAVE_UNSIGNED_SHORT
+/* #define void char */
+/* #define const */
+#undef CHAR_IS_UNSIGNED
+#define HAVE_STDDEF_H
+#define HAVE_STDLIB_H
+#undef NEED_BSD_STRINGS
+#undef NEED_SYS_TYPES_H
+#undef NEED_FAR_POINTERS	/* we presume a 32-bit flat memory model */
+#undef NEED_SHORT_EXTERNAL_NAMES
+#undef INCOMPLETE_TYPES_BROKEN
+
+/* Define "boolean" as unsigned char, not enum, per Windows custom */
+#ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */
+typedef unsigned char boolean;
+#endif
+#ifndef FALSE			/* in case these macros already exist */
+#define FALSE	0		/* values of boolean */
+#endif
+#ifndef TRUE
+#define TRUE	1
+#endif
+#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
+
+
+#ifdef JPEG_INTERNALS
+
+#undef RIGHT_SHIFT_IS_UNSIGNED
+
+#endif /* JPEG_INTERNALS */
+
+#ifdef JPEG_CJPEG_DJPEG
+
+#define BMP_SUPPORTED		/* BMP image file format */
+#define GIF_SUPPORTED		/* GIF image file format */
+#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
+#undef RLE_SUPPORTED		/* Utah RLE image file format */
+#define TARGA_SUPPORTED		/* Targa image file format */
+
+#define TWO_FILE_COMMANDLINE	/* optional */
+#define USE_SETMODE		/* Microsoft has setmode() */
+#undef NEED_SIGNAL_CATCHER
+#undef DONT_USE_B_MODE
+#undef PROGRESS_REPORT		/* optional */
+
+#endif /* JPEG_CJPEG_DJPEG */