Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
PeTrack
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pedestrian Dynamics Empiricism
PeTrack
Commits
7efa40ac
Commit
7efa40ac
authored
5 years ago
by
d.kilic
Browse files
Options
Downloads
Patches
Plain Diff
Added 64Bit compiled Dependecies and changed .pro accordingly (only for
me by now) Solution for Crash, see
#1
parent
d2fbafc5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
3rdparty
+1
-1
1 addition, 1 deletion
3rdparty
petrack.pro
+35
-14
35 additions, 14 deletions
petrack.pro
with
36 additions
and
15 deletions
3rdparty
@
a83913a3
Compare
3675f622
...
a83913a3
Subproject commit
3675f6226847a79ef0cda4e0ddcf4760e80002e8
Subproject commit
a83913a3452d1d344ff69499e6c193f4a88c9ae4
This diff is collapsed.
Click to expand it.
petrack.pro
+
35
−
14
View file @
7efa40ac
...
...
@@ -253,7 +253,7 @@ contains(hostname, [zZ][aA][mM]852) {
#
OpenCV
#
CVPATH
=
"C:/OpenCV/opencv300/build/install"
#
CVPATH
=
"3rdparty/windows/opencv-3.1.0"
CVPATH
=
"../petrack/3rdparty/windows/opencv-4.2.0"
CVPATH
=
"../petrack/3rdparty/windows/opencv-4.2.0
_64bit
"
CVVERSION
=
"420"
CV_MAJOR_VERSION
=
"4"
...
...
@@ -263,7 +263,7 @@ contains(hostname, [zZ][aA][mM]852) {
INCLUDEPATH
+=
$$
{
CVPATH
}
/
include
/
opencv
INCLUDEPATH
+=
$$
{
CVPATH
}
/
include
/
opencv2
QWTPATH
=
"..
/
petrack
/
3rdparty
/
windows
/
Qwt-6.1.4"
QWTPATH
=
"..
\
petrack
\
3rdparty
\
windows
\
Qwt-6.1.4
_64bit
"
#
QWTPATH
=
"D:/petrack/trunk/3rdparty/windows/qwt-6.1.2"
INCLUDEPATH
+=
$$
{
QWTPATH
}
/
include
...
...
@@ -272,18 +272,39 @@ contains(hostname, [zZ][aA][mM]852) {
#
QWT
=
false
#
true
/
false
#
LIBELAS
=
false
#
fuer
64
bit
-
lopencv_ffmpeg_64
LIBS
+=
-
L
$$
{
CVPATH
}
/
x64
/
mingw
/
bin
\
-
lopencv_core
$$
{
CVVERSION
}
\
-
lopencv_highgui
$$
{
CVVERSION
}
\
-
lopencv_imgproc
$$
{
CVVERSION
}
\
-
lopencv_calib3d
$$
{
CVVERSION
}
\
-
lopencv_video
$$
{
CVVERSION
}
\
-
lopencv_videoio_ffmpeg
$$
{
CVVERSION
}
\
-
lopencv_aruco
$$
{
CVVERSION
}
\
-
lopencv_videoio
$$
{
CVVERSION
}
\
-
lopencv_imgcodecs
$$
{
CVVERSION
}
QMAKE_CXXFLAGS
+=
-
march
=
i686
#
CONFIG
(
debug
,
debug
|
release
){
#
#
fuer
64
bit
-
lopencv_ffmpeg_64
#
LIBS
+=
-
L
$$
{
CVPATH
}
/
x64
/
mingw
/
bin
\
#
-
lopencv_core
$$
{
CVVERSION
}
d
\
#
-
lopencv_highgui
$$
{
CVVERSION
}
d
\
#
-
lopencv_imgproc
$$
{
CVVERSION
}
d
\
#
-
lopencv_calib3d
$$
{
CVVERSION
}
d
\
#
-
lopencv_video
$$
{
CVVERSION
}
d
\
#
-
lopencv_videoio_ffmpeg
$$
{
CVVERSION
}
\
#
-
lopencv_aruco
$$
{
CVVERSION
}
d
\
#
-
lopencv_videoio
$$
{
CVVERSION
}
d
\
#
-
lopencv_imgcodecs
$$
{
CVVERSION
}
d
#
QMAKE_CXXFLAGS
+=
-
march
=
i686
#
}
else
{
#
fuer
64
bit
-
lopencv_ffmpeg_64
LIBS
+=
-
L
$$
{
CVPATH
}
/
x64
/
mingw
/
bin
\
-
lopencv_core
$$
{
CVVERSION
}
\
-
lopencv_highgui
$$
{
CVVERSION
}
\
-
lopencv_imgproc
$$
{
CVVERSION
}
\
-
lopencv_calib3d
$$
{
CVVERSION
}
\
-
lopencv_video
$$
{
CVVERSION
}
\
-
lopencv_videoio_ffmpeg
$$
{
CVVERSION
}
_64
\
-
lopencv_aruco
$$
{
CVVERSION
}
\
-
lopencv_videoio
$$
{
CVVERSION
}
\
-
lopencv_imgcodecs
$$
{
CVVERSION
}
#
QMAKE_CXXFLAGS
+=
-
march
=
i686
QMAKE_CXXFLAGS
+=
-
fpermissive
#
}
}
else
:
contains
(
hostname
,
ias7171
)
{
#
Ann
Katrin
32
-
Bit
DEFINES
+=
STEREO_DISABLED
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment