Adding NFT to the emscripten version and improving compilation ( libjpeg )

Source/ARX/AR2/CMakeLists.txt

@@ -52,12 +52,10 @@ target_include_directories(AR2
     PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../AR/include
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../ARUtil/include
-    PRIVATE ${JPEG_INCLUDE_DIR}
 )
 
 target_link_libraries(AR2
     INTERFACE ${LIBS}
-    PRIVATE ${JPEG_LIBRARIES}
 )
 
 # Pass on headers to parent.
@@ -67,4 +65,3 @@ set(FRAMEWORK_HEADERS
    ${hprefixed}
    PARENT_SCOPE
 )
-

Source/ARX/ARVideo/CMakeLists.txt

@@ -30,14 +30,6 @@ set(PUBLIC_HEADERS
     include/ARX/ARVideo/videoRGBA.h
 )
 
-set(INCLUDE_DIRS
-    ${JPEG_INCLUDE_DIR}
-)
-
-set(LIBS
-    ${JPEG_LIBRARIES}
-)
-
 if (USE_CPARAM_SEARCH)
     find_package(CURL REQUIRED)
     if (NOT ARX_TARGET_PLATFORM_LINUX)

Source/ARX/KPM/CMakeLists.txt

@@ -86,12 +86,10 @@ target_include_directories(KPM
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/FreakMatcher
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../ARUtil/include
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../AR/include
-    PRIVATE ${JPEG_INCLUDE_DIR}
 )
 
 target_link_libraries(KPM
     INTERFACE ${LIBS}
-    PRIVATE ${JPEG_LIBRARIES}
 )
 
 # Pass on headers to parent.
@@ -101,4 +99,3 @@ set(FRAMEWORK_HEADERS
    ${hprefixed}
    PARENT_SCOPE
 )
-

Source/ARX/OCVT/CMakeLists.txt

@@ -14,7 +14,7 @@ set(PRIVATE_HEADERS
 )
 
 set(SOURCE
-    OCVConfig.cpp 
+    OCVConfig.cpp
     HarrisDetector.cpp
     OCVFeatureDetector.cpp
     PlanarTracker.cpp
@@ -32,13 +32,11 @@ target_include_directories(OCVT
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../ARUtil/include
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../AR/include
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/ARX/OCVT
-    PRIVATE ${JPEG_INCLUDE_DIR}
     PRIVATE ${OpenCV_INCLUDE_DIR}
 )
 
 target_link_libraries(OCVT
     INTERFACE ${LIBS}
-    PRIVATE ${JPEG_LIBRARIES}
 )
 
 if(NOT ARX_TARGET_PLATFORM_WINDOWS)
@@ -63,4 +61,3 @@ set(FRAMEWORK_HEADERS
    ${hprefixed}
    PARENT_SCOPE
 )
-

Source/CMakeLists.txt

@@ -66,10 +66,6 @@ if(ARX_TARGET_PLATFORM_VARIANT)
     set(ARX_PLATFORM_NAME_FILESYSTEM "${ARX_PLATFORM_NAME_LC}-${ARX_TARGET_PLATFORM_VARIANT}")
 else()
     if (ARX_TARGET_PLATFORM_EMSCRIPTEN)
-        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")
@@ -92,7 +88,7 @@ endif()
 add_definitions("-DARX_TARGET_PLATFORM_${ARX_PLATFORM_NAME_UC}=1")
 if(CMAKE_CONFIGURATION_TYPES)
   # Definitions for multi-configuration generator, e.g. Xcode, Visual Studio.
-  set_property(DIRECTORY APPEND PROPERTY 
+  set_property(DIRECTORY APPEND PROPERTY
     COMPILE_DEFINITIONS $<$<CONFIG:Debug>:DEBUG=1>
   )
 else()
@@ -170,11 +166,11 @@ else()
 endif()
 if (ARX_TARGET_PLATFORM_EMSCRIPTEN)
     set(HAVE_OPENCV 0)
-    set(HAVE_NFT 0)
+    set(HAVE_NFT 1)
     set(HAVE_2D 0)
 else()
-    set(HAVE_NFT 0)
-    set(HAVE_2D 0)
+    set(HAVE_NFT 1)
+    set(HAVE_2D 1)
 endif()
 
 # Cached and project-specific platform variables.
@@ -221,7 +217,7 @@ elseif(ARX_TARGET_PLATFORM_LINUX)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=core2 -fPIC -Wl,-rpath-link,${PROJECT_SOURCE_DIR}/depends/${ARX_PLATFORM_NAME_FILESYSTEM}/lib")
         set(HAVE_INTEL_SIMD 1)
     endif()
-    
+
     set(VENDOR_DIR ${CMAKE_SOURCE_DIR}/vendor)
 
 elseif(ARX_TARGET_PLATFORM_WINDOWS)
@@ -248,4 +244,3 @@ else()
     add_subdirectory(depends)
     add_subdirectory(Utilities)
 endif()
-

Source/artoolkitx.js/CMakeLists.txt

@@ -14,7 +14,7 @@ message("CMAKE_CURRENT_BINARY_DIR: ${CMAKE_CURRENT_BINARY_DIR}")
 add_definitions("-std=c++11")
 
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../ARX ${CMAKE_CURRENT_BINARY_DIR}/../ARX/AR ${CMAKE_CURRENT_BINARY_DIR}/../ARX/ARUtil ${CMAKE_CURRENT_BINARY_DIR}/../ARX/AR2 ${CMAKE_CURRENT_BINARY_DIR}/../ARX/KPM ${CMAKE_CURRENT_BINARY_DIR}/../ARX/ARVideo ${CMAKE_CURRENT_BINARY_DIR}/../ARX/ARG)
-link_libraries(libARX libARVideo libAR libARG libARUtil)
+link_libraries(libARX libARVideo libAR libAR2 libARG libARUtil libKPM)
 
 add_executable(artoolkitx  ${PROJECT_SOURCE_DIR}/artoolkitx.js/ARX_js.cpp ${PROJECT_SOURCE_DIR}/artoolkitx.js/ARX_bindings.cpp)
 
@@ -24,7 +24,7 @@ set(MODULE_OPTIONS "-s MODULARIZE_INSTANCE=1 -s EXPORT_NAME='artoolkitXjs' -s EX
 
 math(EXPR MEM 256*1024*1024)
 message("CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
-set(MEMORY "-s TOTAL_MEMORY=${MEM}")
+set(MEMORY "-s TOTAL_MEMORY=${MEM} ")
 
 #To generate source maps the -g4 needs to be passed to the LINK_FLAGS
 if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")

Source/build.sh

@@ -159,7 +159,7 @@ fi
 # iOS
 if [ $BUILD_IOS ] ; then
 
-    
+
     if [ ! -d "depends/ios/Frameworks/opencv2.framework" ] ; then
         curl --location "https://github.com/artoolkitx/opencv/releases/download/4.0.0-pre-artoolkitx/opencv-4.0.0-pre-artoolkitx-ios.zip" -o opencv2.zip
         unzip opencv2.zip -d depends/ios/Frameworks
@@ -242,7 +242,7 @@ else
         cd $OURDIR
         cp -v "../Examples/Square tracking example/Android/ARSquareTracking/ARSquareTrackingExample/build/outputs/apk/release/"ARSquareTrackingExample-release-unsigned.apk ../Examples/
         cp -v "../Examples/Square tracking example with OSG/Android/ARSquareTracking/ARSquareTrackingExample/build/outputs/apk/release/"ARSquareTrackingExample-release-unsigned.apk ../Examples/ARSquareTrackingExampleOSG-release-unsigned.apk
-        
+
         echo "Building example AR2dTracking as APK"
         cd $OURDIR
         cd "../Examples/2d tracking example/Android/AR2DTracking_Proj"; ./gradlew -q assembleRelease;
@@ -251,7 +251,7 @@ else
 
     fi
 fi
-    
+
 fi
 # /BUILD_ANDROID
 
@@ -277,7 +277,7 @@ if [ $BUILD_EM ]; then
     fi
     cd build-em
     rm -f CMakeCache.txt
-    emconfigure cmake .. -DCMAKE_BUILD_TYPE=${DEBUG+Debug}${DEBUG-Release} -DCMAKE_CXX_FLAGS="-s USE_LIBJPEG" -DCMAKE_C_FLAGS="-s USE_LIBJPEG" -DCMAKE_C_FLAGS_RELEASE="-DNDEBUG -O3" -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG -O3"
+    emconfigure cmake .. -DCMAKE_BUILD_TYPE=${DEBUG+Debug}${DEBUG-Release} -DCMAKE_CXX_FLAGS="-s USE_LIBJPEG=1" -DCMAKE_C_FLAGS="-s USE_LIBJPEG=1" -DCMAKE_C_FLAGS_RELEASE="-DNDEBUG -O3" -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG -O3"
     if [ "${DEBUG+Debug}${DEBUG-Release}" = "Debug" ]; then
         emmake make VERBOSE=1
     else
@@ -345,8 +345,8 @@ if [ $BUILD_LINUX ] ; then
                 fi
             fi
         fi
-    fi    
-    
+    fi
+
 
 	if [ ! -d "build-linux-x86_64" ] ; then
 		mkdir build-linux-x86_64