Skip to content

Commit 60e3c66

Browse files
sweetdream779sweetdream779
committed
change abiFilters
1 parent f6d82fb commit 60e3c66

File tree

2,104 files changed

+641394
-4
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,104 files changed

+641394
-4
lines changed

‎FaceTracker/app/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ cmake_minimum_required(VERSION 3.4.1)
66
set(CMAKE_VERBOSE_MAKEFILE on)
77
set (CMAKE_CXX_STANDARD 11)
88

9-
# OpenCV stuff
109
include_directories($ENV{OPENCV_ANDROID_SDK}/sdk/native/jni/include)
1110
add_library( lib_opencv SHARED IMPORTED )
1211
set_target_properties(lib_opencv PROPERTIES IMPORTED_LOCATION $ENV{OPENCV_ANDROID_SDK}/sdk/native/libs/${ANDROID_ABI}/libopencv_java3.so)

‎FaceTracker/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ android {
2424
externalNativeBuild {
2525
cmake {
2626
cppFlags "-frtti -fexceptions -std=c++11"
27-
//abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
28-
abiFilters "${cpuType}"
27+
abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
28+
//abiFilters "${cpuType}"
2929
arguments "-DANDROID_STL=gnustl_shared"
3030
//arguments "-DANDROID_STL=c++_shared"
3131
// AL: arguments "-DANDROID_STL=c++_shared", "-DBUILD_opencv_apps:BOOL=ON", "-DBUILD_SHARED_LIBS:BOOL=ON"

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,7 @@ export OPENCV_ANDROID_SDK=/Users/hoopoe/Tools/OpenCV-android-sdk
2121
to /sdcard/Download
2222

2323
3. dlib adapted to work with -DANDROID_STL=gnustl_shared
24+
25+
Path needed to be changed:
26+
1) OPENCV_ANDROID_SDK in CMakeLists.txt
27+

‎dlib‎

Submodule dlib deleted from ef4b7a0

‎dlib/.gitignore‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
**/.idea
2+
*~
3+
*.swp
4+
*.o
5+
*.so
6+
build
7+
dist
8+
*.egg-info/
9+

‎dlib/.hgignore‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/build/
2+
/build2/
3+
/build_clang/
4+
\.swp$
5+
\.swo$
6+
\.o$
7+
\.a$
8+
\.so$
9+
\.orig$
10+
\.obj$
11+
\.pyc$
12+
^build/
13+
^dist/
14+
^\.cache/
15+
^\.eggs/
16+
^dlib\.egg-info/
17+
^docs/release/
18+
^docs/docs/web/
19+
^docs/docs/chm/
20+
^docs/docs/cache/
21+
^docs/docs/log.txt$
22+
^docs/docs/old_log.txt$
23+
^dlib/test/debug.txt$
24+
^dlib/test/test$
25+
^dlib/test/makefile.bak$
26+
python_examples/.*.so$
27+
python_examples/.*.pyd$
28+
python_examples/.*.dll$
29+
python_examples/.*.lib$
30+
docs/docs/python/classes.txt
31+
docs/docs/python/functions.txt
32+
syntax: glob
33+
dlib/test/build64/*
34+
*.svm
35+
dlib/test/build_python
36+
dlib/test/test_log.txt
37+
dlib/test/build_vc2015_64/*
38+
dlib/test/build_vc2013_64/*
39+
dlib/test/build_vc2012_64/*
40+
dlib/java/libmyproject.so
41+
dlib/java/myproject.jar
42+
dlib/java/swig_test.class
43+

‎dlib/.hgtags‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
7f7ffcda900ae3c8de0a562cc7e9d3f51e523a39 v17.39
2+
43cbb1c92eaeba09bd0e9c72bb0783044492e651 v17.40
3+
f6c79ee4083449640e45cc7e48ef2e7636687d90 v17.41
4+
e516e232b94254db264e34b61458e0eabd78bea8 v17.42
5+
43d280b34aa9dd68c62208d72f3b8e48ed047684 v17.43
6+
9ed76e89b6644208d4536b3396c7664445bd4520 v17.44
7+
d20f5ce805d53b5fec9d5dd250159d28480041cf v17.45
8+
cfbd4102b1ee25ca3531819abbbe93971d6dc65a v17.46
9+
f58ff52144bddbccb5a372e6c4befb4b6ad98021 v17.47
10+
b90ab60d8a18fc8616fb895b0d059c1cf07db3ce v17.48
11+
4312a45be8b45634f8ffafcb2b5a425bd426642b v17.49
12+
df60c7686f3982791e218977edb64d638151ca3b v18.0
13+
8d0762ab49b9ee8d1d3fc1fc02926c6bde6d5542 v18.1
14+
5de237bc41c1c2e63d0731731eee231a4213a31b v18.2
15+
7f21bd92812d2d08fe9a881a401cbf0f6b104081 v18.3
16+
78be73b57b829adb20a452ad910f7039a09c9474 v18.4
17+
3026cfaf82c5a878b2c81ee4d6445237d453e372 v18.5
18+
6a929c3ad782f17e34d364665e6e277e3ff99912 v18.6
19+
5a3fb1f81041978948e6148a1f56ab56cf678c69 v18.7
20+
a6c2b16111b8023dbded7299dcc7e6acd26671b8 v18.8
21+
4de62892e10850e8f0205b4857cf48b31fd730c8 v18.9
22+
5a14394843c04628990857e5db94ff6bc43c2da0 v18.10
23+
dd8e950033d5026373acce9ed4b2ffb85908d3b5 v18.11
24+
4e3941b13ca859f788853cfcef9973ac4b161e65 v18.12
25+
67c3ad208aae9537cf16f64936dd62e2210caa96 v18.13
26+
cae7fcc9e6a9b28b44a703e4598f44286fec734d v18.14
27+
feaff82884ded598bde93c635eb3ded9c0933a07 v18.15
28+
42a25c606cf924a8d41d2fc96b9c85f839d21a04 v18.16
29+
ce6f364987865b19bdb1b4730ac5403e2bb55dc4 v18.17
30+
7ae1775f61a44b7f07866050b50ad3ade581f019 v18.18
31+
4d6b102506bb9e2f195c7ddf984cc2d86b8643e7 before_dnn_serialization_cleanup
32+
7210589728f6d83f6cb7d21cd24d114a5364d9e2 v19.0
33+
ad6cd2a3bfd54d48f6b4a1b6d3ef8c0ce278a8d9 v19.1
34+
f8fa027c760270d8122427838b89e95ccf0b80a1 v19.2
35+
26cdc89f4795a1f924d80d208b9ed22437c01600 v19.3
36+
74c4985dfb28f1b91286ab38f35bc026326ec995 v19.4
37+
9121e039950df93507fdf27bbb102bb5bc1ab429 v19.5
38+
3eaa0e35b1b4b912897b664abd78a23cc7705c9b v19.6
39+
fb51c77524ff13ca58b4846f8778a38f35b6f986 v19.7
40+
fef491c3b8182c68df0a80fa727ccb5929a45821 v19.8
41+
0cbf133b31c13f665fc32227952315844a66ff85 v19.9

‎dlib/.travis.yml‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
sudo: required
2+
3+
matrix:
4+
include:
5+
###################
6+
- language: cpp
7+
compiler: clang
8+
os: linux
9+
env:
10+
- VARIANT=test
11+
script:
12+
- dlib/travis/build-and-test.sh
13+
14+
###################
15+
- language: cpp
16+
compiler: clang
17+
os: linux
18+
env:
19+
- VARIANT=examples
20+
script:
21+
- dlib/travis/build-and-test.sh
22+
23+
###################
24+
- language: cpp
25+
compiler: gcc
26+
os: linux
27+
env:
28+
- VARIANT=test
29+
script:
30+
- dlib/travis/build-and-test.sh
31+
32+
###################
33+
- language: cpp
34+
compiler: gcc
35+
os: linux
36+
env:
37+
- VARIANT=tools
38+
script:
39+
- dlib/travis/build-and-test.sh
40+
41+
###################
42+
- language: cpp
43+
compiler: gcc
44+
os: linux
45+
env:
46+
- VARIANT=dlib_all_source_cpp
47+
script:
48+
- dlib/travis/build-and-test.sh
49+
50+
########### test with C++17 ########
51+
- language: cpp
52+
compiler: gcc
53+
os: linux
54+
env:
55+
- VARIANT=test
56+
- CXXFLAGS=-std=c++17
57+
# Need to set MATRIX_EVAL to set CC and CXX env vars. You would
58+
# think you could just set them in the env area like any other, but
59+
# travis is wonky about CC and CXX vars so you have to do it this way.
60+
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
61+
addons:
62+
apt:
63+
sources:
64+
- ubuntu-toolchain-r-test
65+
packages:
66+
- g++-7
67+
script:
68+
- dlib/travis/build-and-test.sh
69+
70+
###################
71+
- language: cpp
72+
compiler: gcc
73+
os: linux
74+
env:
75+
- VARIANT=examples
76+
script:
77+
- dlib/travis/build-and-test.sh
78+
79+
###################
80+
- language: python
81+
python: 2.7
82+
env:
83+
- VARIANT=python-api
84+
script:
85+
- dlib/travis/build-and-test.sh
86+
87+
###################
88+
- language: python
89+
python: 3.5
90+
env:
91+
- VARIANT=python-api
92+
script:
93+
- dlib/travis/build-and-test.sh
94+
95+
###################
96+
# # Disabled because travis's OS X machines take hours (or days) to begin
97+
# running. Or maybe they are just broken entirely. Who knows.
98+
#- language: cpp
99+
# os: osx
100+
# osx_image: xcode9.2
101+
# env:
102+
# - VARIANT=test
103+
# script:
104+
# - dlib/travis/build-and-test.sh
105+
106+
107+

‎dlib/CMakeLists.txt‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
cmake_minimum_required(VERSION 2.8.12)
2+
3+
4+
5+
6+
#############################################################################
7+
# #
8+
# READ examples/CMakeLists.txt TO SEE HOW TO USE DLIB FROM C++ WITH CMAKE #
9+
# #
10+
#############################################################################
11+
12+
13+
14+
15+
16+
get_directory_property(has_parent PARENT_DIRECTORY)
17+
if(NOT has_parent)
18+
# When you call add_subdirectory(dlib) from a parent CMake project dlib's
19+
# CMake scripts will assume you want to statically compile dlib into
20+
# whatever you are building rather than create a standalone copy of dlib.
21+
# This means CMake will build dlib as a static library, disable dlib's
22+
# install targets so they don't clutter your project, and adjust a few other
23+
# minor things that are convenient when statically building dlib as part of
24+
# your own projects.
25+
#
26+
# On the other hand, if there is no parent CMake project or if
27+
# DLIB_IN_PROJECT_BUILD is set to false, CMake will compile dlib as a normal
28+
# standalone library (either shared or static, based on the state of CMake's
29+
# BUILD_SHARED_LIBS flag), and include the usual install targets so you can
30+
# install dlib on your computer via `make install`. Since the only reason
31+
# to build this CMakeLists.txt (the one you are reading right now) by itself
32+
# is if you want to install dlib, we indicate as such by setting
33+
# DLIB_IN_PROJECT_BUILD to false.
34+
set(DLIB_IN_PROJECT_BUILD false)
35+
endif()
36+
add_subdirectory(dlib)

‎dlib/ISSUE_TEMPLATE.md‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
IF YOU ARE REPORTING A BUG OR PROBLEM WITH DLIB THEN FILL OUT THE ENTIRE TEMPLATE BELOW. ISSUES ASKING QUESTIONS ABOUT WHY SOMETHING DOESN'T WORK THAT FAIL TO FILL OUT THE ENTIRE TEMPLATE WILL BE CLOSED.
2+
3+
It is OK to suggest interesting improvements to dlib, even if you are not volunteering to implement them. **However, the issue tracker is not a code writing service, do not ask for someone to write code for you.** E.g. Do not ask for feature improvements to the example programs. **If there is some feature improvement you want in an example program then it's up to you to write it**.
4+
5+
Before you ask a question, check Google for a solution, [the dlib FAQ](http://dlib.net/faq.html), or consult the dlib documentation. Every single function in dlib is documented in detail. If you obviously haven't read the documentation your issue will be closed.
6+
7+
If you aren't reporting a bug or problem with dlib then delete this template and write whatever you want here.
8+
9+
<!-- ================================================================== -->
10+
<!-- ================== BUG/PROBLEM REPORT TEMPLATE ================== -->
11+
<!-- ================================================================== -->
12+
13+
14+
<!-- Delete the above instructions and then provide a general summary of the issue in the Title above. Then fill out the template below. FAILURE TO FILL OUT EVERY PART WILL RESULT IN YOUR ISSUE BEING CLOSED -->
15+
16+
## Expected Behavior
17+
<!--- Tell us what should happen. What were you doing? What part of dlib are you using? What do you think should happen? -->
18+
19+
## Current Behavior
20+
<!--- Tell us what happens instead of the expected behavior. If you get an error, include the entire error message in the bug report. DO NOT POST SCREEN SHOTS. Paste in the text instead. If the issue is some kind of build problem, include the entire CMake output along with the error message. -->
21+
22+
## Steps to Reproduce
23+
<!--- Provide an unambiguous set of steps to reproduce this problem. Include code to reproduce, if relevant -->
24+
25+
26+
27+
* **Version**: <!-- What version of dlib? -->
28+
* **Where did you get dlib**: <!-- Did you get it from an official source like dlib.net, this github repo, or somewhere else? -->
29+
* **Platform**: <!-- include something like `lsb_release -a` output, or if Windows, version and 32-bit or
30+
64-bit -->
31+
* **Compiler**: <!-- What compiler are you using? What version of that compiler? -->

0 commit comments

Comments
 (0)