Skip to content

Commit 5f43758

Browse files
ThorstenBuxThorstenBux
committed
include libjpeg dependency
1 parent a1fdb2e commit 5f43758

File tree

14 files changed

+3142
-4
lines changed

14 files changed

+3142
-4
lines changed

‎Source/ARX/AR2/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
if(NOT ARX_TARGET_PLATFORM_WINDOWS)
2-
find_package(JPEG REQUIRED)
2+
if(NOT ARX_TARGET_PLATFORM_EMSCRIPTEN)
3+
find_package(JPEG REQUIRED)
4+
endif()
35
else()
46
find_path(JPEG_INCLUDE_DIR
57
NAMES jconfig.h jmorecfg.h jpeglib.h jversion.h

‎Source/ARX/ARVideo/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
# their changes propagate to this main build file.
1111
#
1212
if(NOT ARX_TARGET_PLATFORM_WINDOWS)
13-
find_package(JPEG REQUIRED)
13+
if(NOT ARX_TARGET_PLATFORM_EMSCRIPTEN)
14+
find_package(JPEG REQUIRED)
15+
endif()
1416
else()
1517
find_path(JPEG_INCLUDE_DIR
1618
NAMES jconfig.h jmorecfg.h jpeglib.h jversion.h

‎Source/ARX/OCVT/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
if(NOT ARX_TARGET_PLATFORM_WINDOWS)
2-
find_package(JPEG REQUIRED)
2+
if(NOT ARX_TARGET_PLATFORM_EMSCRIPTEN)
3+
find_package(JPEG REQUIRED)
4+
endif()
35
else()
46
find_path(JPEG_INCLUDE_DIR
57
NAMES jconfig.h jmorecfg.h jpeglib.h jversion.h

‎Source/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@ if(ARX_TARGET_PLATFORM_VARIANT)
6666
set(ARX_PLATFORM_NAME_FILESYSTEM "${ARX_PLATFORM_NAME_LC}-${ARX_TARGET_PLATFORM_VARIANT}")
6767
else()
6868
if (ARX_TARGET_PLATFORM_EMSCRIPTEN)
69-
# 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")
69+
# 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")
70+
set(JPEG_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/depends/emscripten/libjpeg/includes)
71+
72+
set(JPEG_LIBRARIES ${PROJECT_SOURCE_DIR}/depends/emscripten/libjpeg/)
73+
message("JPEG_INCLUDE_DIR ${JPEG_LIBRARIES}")
7074
set(HAVE_INTEL_SIMD 0)
7175
if(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
7276
set(ARX_PLATFORM_NAME_FILESYSTEM "macos")

‎Source/depends/emscripten/libjpeg/includes/jconfig.h

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
/* jconfig.vc --- jconfig.h for Microsoft Visual C++ on Windows 9x or NT. */
2+
/* This file also works for Borland C++ 32-bit (bcc32) on Windows 9x or NT. */
3+
/* see jconfig.txt for explanations */
4+
5+
#define HAVE_PROTOTYPES
6+
#define HAVE_UNSIGNED_CHAR
7+
#define HAVE_UNSIGNED_SHORT
8+
/* #define void char */
9+
/* #define const */
10+
#undef CHAR_IS_UNSIGNED
11+
#define HAVE_STDDEF_H
12+
#define HAVE_STDLIB_H
13+
#undef NEED_BSD_STRINGS
14+
#undef NEED_SYS_TYPES_H
15+
#undef NEED_FAR_POINTERS /* we presume a 32-bit flat memory model */
16+
#undef NEED_SHORT_EXTERNAL_NAMES
17+
#undef INCOMPLETE_TYPES_BROKEN
18+
19+
/* Define "boolean" as unsigned char, not enum, per Windows custom */
20+
#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
21+
typedef unsigned char boolean;
22+
#endif
23+
#ifndef FALSE /* in case these macros already exist */
24+
#define FALSE 0 /* values of boolean */
25+
#endif
26+
#ifndef TRUE
27+
#define TRUE 1
28+
#endif
29+
#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
30+
31+
32+
#ifdef JPEG_INTERNALS
33+
34+
#undef RIGHT_SHIFT_IS_UNSIGNED
35+
36+
#endif /* JPEG_INTERNALS */
37+
38+
#ifdef JPEG_CJPEG_DJPEG
39+
40+
#define BMP_SUPPORTED /* BMP image file format */
41+
#define GIF_SUPPORTED /* GIF image file format */
42+
#define PPM_SUPPORTED /* PBMPLUS PPM/PGM image file format */
43+
#undef RLE_SUPPORTED /* Utah RLE image file format */
44+
#define TARGA_SUPPORTED /* Targa image file format */
45+
46+
#define TWO_FILE_COMMANDLINE /* optional */
47+
#define USE_SETMODE /* Microsoft has setmode() */
48+
#undef NEED_SIGNAL_CATCHER
49+
#undef DONT_USE_B_MODE
50+
#undef PROGRESS_REPORT /* optional */
51+
52+
#endif /* JPEG_CJPEG_DJPEG */

0 commit comments

Comments
 (0)