Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kalwalt merged 3 commits into from
Jan 10, 2020
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6afdd8a
set HAVE_NFT 1 and adding linking libs: libKPM libAR2
kalwalt Aug 23, 2019
109cfcb
deleting libjpeg includes and lib because emscripten already add it
kalwalt Jan 4, 2020
2a1976e
-s ALLOW_MEMORY_GROWTH=1 not needed
kalwalt Jan 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Source/ARX/AR2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -67,4 +65,3 @@ set(FRAMEWORK_HEADERS
${hprefixed}
PARENT_SCOPE
)

8 changes: 0 additions & 8 deletions Source/ARX/ARVideo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions Source/ARX/KPM/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -101,4 +99,3 @@ set(FRAMEWORK_HEADERS
${hprefixed}
PARENT_SCOPE
)

5 changes: 1 addition & 4 deletions Source/ARX/OCVT/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set(PRIVATE_HEADERS
)

set(SOURCE
OCVConfig.cpp
OCVConfig.cpp
HarrisDetector.cpp
OCVFeatureDetector.cpp
PlanarTracker.cpp
Expand All @@ -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)
Expand All @@ -63,4 +61,3 @@ set(FRAMEWORK_HEADERS
${hprefixed}
PARENT_SCOPE
)

15 changes: 5 additions & 10 deletions Source/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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()
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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)
Expand All @@ -248,4 +244,3 @@ else()
add_subdirectory(depends)
add_subdirectory(Utilities)
endif()

4 changes: 2 additions & 2 deletions Source/artoolkitx.js/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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} -s ALLOW_MEMORY_GROWTH=1")

@kalwalt kalwalt Jan 10, 2020

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i need to check if this is still necessary


#To generate source maps the -g4 needs to be passed to the LINK_FLAGS
if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
Expand Down
12 changes: 6 additions & 6 deletions Source/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand All @@ -251,7 +251,7 @@ else

fi
fi

fi
# /BUILD_ANDROID

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
52 changes: 0 additions & 52 deletions Source/depends/emscripten/libjpeg/includes/jconfig.h
View file
Open in desktop

This file was deleted.

Loading