Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
adaa7517
Commit
adaa7517
authored
Dec 20, 2010
by
Claes Sjofors
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pwre configure, separate library variable for mq
parent
79fafcd0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
remote/exe/rs_remote_mq/src/os_templ/link_rule.mk
remote/exe/rs_remote_mq/src/os_templ/link_rule.mk
+2
-1
src/tools/pwre/src/os_linux/pwre_configure.sh
src/tools/pwre/src/os_linux/pwre_configure.sh
+6
-1
No files found.
remote/exe/rs_remote_mq/src/os_templ/link_rule.mk
View file @
adaa7517
...
...
@@ -4,7 +4,8 @@ link_rule_mk := 1
ifeq
($(pwre_conf_mq),1)
link
=
$(ldxx)
$(elinkflags)
$(domap)
-o
$(export_exe)
\
$(export_obj)
$(objects)
$(rt_msg_eobjs)
\
$(pwre_conf_libdir)
$(pwre_conf_libpwrremote)
$(pwre_conf_libpwrrt)
$(pwre_conf_lib)
$(pwre_conf_libdir)
$(pwre_conf_libpwrremote)
$(pwre_conf_libpwrrt)
\
$(pwre_conf_libmq)
$(pwre_conf_lib)
else
link
=
echo
"Mq not installed"
endif
...
...
src/tools/pwre/src/os_linux/pwre_configure.sh
View file @
adaa7517
...
...
@@ -111,6 +111,8 @@ pwre_config_check_lib()
conf_libmotif
=
$conf_libmotif
" -l
${
lib
%.*
}
"
elif
test
$4
==
"wb"
;
then
conf_libwb
=
$conf_libwb
" -l
${
lib
%.*
}
"
elif
test
$4
==
"mq"
;
then
conf_libmq
=
$conf_libmq
" -l
${
lib
%.*
}
"
else
conf_lib
=
$conf_lib
" -l
${
lib
%.*
}
"
fi
...
...
@@ -200,6 +202,7 @@ dhw=`eval echo ${pwre_hw} | tr [:lower:] [:upper:]`
conf_cc_define
=
"-D
$dos
=1 -D
$dhw
=1 -DOS=
${
pwre_os
:3
}
-DHW=
${
pwre_hw
:3
}
-D_
${
dos
:3
}
"
conf_lib
=
""
conf_libwb
=
""
conf_libmq
=
""
conf_libgtk
=
""
conf_libmotif
=
""
conf_libdir
=
""
...
...
@@ -284,6 +287,7 @@ if test $pwre_hw == "hw_arm"; then
echo
"export pwre_conf_libpwrsev=
\"
-lpwr_sev
\"
"
>>
$cfile
echo
"export pwre_conf_lib=
\"
-lpthread -lm -lrt -lcrypt
\"
"
>>
$cfile
echo
"export pwre_conf_libwb=
\"
$conf_libwb
\"
"
>>
$cfile
echo
"export pwre_conf_libmq=
\"
$conf_libmq
\"
"
>>
$cfile
echo
"export pwre_conf_libgtk=
\"
$conf_libgtk
\"
"
>>
$cfile
echo
"export pwre_conf_libmotif=
\"
$conf_libmotif
\"
"
>>
$cfile
echo
"export pwre_conf_libdir=
\"
$conf_libdir
\"
"
>>
$cfile
...
...
@@ -306,7 +310,7 @@ else
pwre_config_check_lib libz LIBZ lib lib 0 /usr/lib/libz.so:/usr/lib/libz.a
pwre_config_check_lib libcrypt LIBCRYPT lib lib 0 /usr/lib/libcrypt.so:/usr/lib/libcrypt.a
pwre_config_check_lib mysql MYSQL lib lib 1 /usr/lib/libmysqlclient.so:/usr/lib/mysql/libmysqlclient.so
pwre_config_check_lib mq MQ lib
lib
1 /usr/lib/libdmq.so
pwre_config_check_lib mq MQ lib
mq
1 /usr/lib/libdmq.so
pwre_config_check_lib libpnioif PNAK lib lib 1 /usr/lib/libpnioif.a:/usr/local/lib/libpnioif.a
pwre_config_check_lib libusb LIBUSB lib lib 1 /usr/lib/libusb-1.0.so
pwre_config_check_lib librt LIBRT lib lib 0 /usr/lib/librt.so:/usr/lib/librt.a
...
...
@@ -355,6 +359,7 @@ else
echo
"export pwre_conf_libpwrsev=
\"
-lpwr_sev
\"
"
>>
$cfile
echo
"export pwre_conf_lib=
\"
$conf_lib
\"
"
>>
$cfile
echo
"export pwre_conf_libwb=
\"
$conf_libwb
\"
"
>>
$cfile
echo
"export pwre_conf_libmq=
\"
$conf_libmq
\"
"
>>
$cfile
echo
"export pwre_conf_libgtk=
\"
$conf_libgtk
\"
"
>>
$cfile
echo
"export pwre_conf_libmotif=
\"
$conf_libmotif
\"
"
>>
$cfile
echo
"export pwre_conf_libdir=
\"
$conf_libdir
\"
"
>>
$cfile
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment