Skip to content

P
proview
Commit 35ac0181 authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Merge branch 'master'

parents f883b35f 066135eb
Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 38 deletions
build.sh
View file @ 35ac0181
......@@ -72,7 +72,7 @@ fi
btype="dbg"
ename=$ver$hw
desc=$verl
gui="qt"
pwre add $ename $root/src \"\" $root/rls $btype $os $hw "$desc"
pwre init $ename
......@@ -81,7 +81,7 @@ pwre init $ename
mkdir -p $pwre_broot
pwre configure
pwre create_all_modules
pwre build_all_modules
pwre build_all_modules $gui
# Create a package version html file
$root/src/tools/pkg/deb/pwrrt/build.sh -v
......
src/tools/bld/src/os_linux/exe_generic.mk
View file @ 35ac0181
......@@ -41,6 +41,7 @@ endif
vpath %.c $(hw_source):$(os_source):$(co_source)
vpath %.cpp $(hw_source):$(os_source):$(co_source)
vpath %.cqt $(hw_source):$(os_source):$(co_source)
vpath %.l $(hw_source):$(os_source):$(co_source)
vpath %.h $(hw_source):$(os_source):$(co_source)
vpath %.hpp $(hw_source):$(os_source):$(co_source)
......@@ -51,7 +52,16 @@ c_sources := $(sort \
$(foreach file, \
$(foreach dir, \
$(source_dirs), \
$(wildcard $(dir)/*.c $(dir)/*.cpp) \
$(wildcard $(dir)/*.c $(dir)/*.cpp $(dir)/*.cqt) \
), $(notdir $(file)) \
) \
)
cqt_sources := $(sort \
$(foreach file, \
$(foreach dir, \
$(source_dirs), \
$(wildcard $(dir)/*.cqt) \
), $(notdir $(file)) \
) \
)
......@@ -104,7 +114,11 @@ export_includes := $(addprefix $(inc_dir)/,$(h_includes) $(hpp_includes))
l_targets := $(addprefix $(bld_dir)/,$(basename $(l_sources)))
l_targets := $(addsuffix $(c_ext),$(l_targets))
cqt_objects := $(patsubst %.cqt, %_moc.o, $(cqt_sources))
cqt_objects := $(addprefix $(bld_dir)/,$(basename $(cqt_objects)))
objects := $(addprefix $(bld_dir)/,$(basename $(c_sources)))
objects += $(cqt_objects)
objects += $(addprefix $(bld_dir)/,$(basename $(l_sources)))
objects := $(strip $(addsuffix $(obj_ext),$(objects)))
......
src/tools/bld/src/os_linux/hw_arm/variables.mk
View file @ 35ac0181
......@@ -116,7 +116,11 @@ log_done =
#csetos := -DOS_LINUX=1 -DOS=linux -D_LINUX -DHW_ARM=1 -DHW=ARM
#cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) -I$(jdk)/include -I$(jdk)/include/linux
csetos := $(pwre_conf_cc_define)
cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirgtk) $(pwre_conf_incdirgst)
ifeq ($(flavour),gtk)
cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirgtk) $(pwre_conf_incdirgst)
else
cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirqt)
endif
rm := rm
cp := cp
cpflags :=
......
src/tools/bld/src/os_linux/hw_x86/variables.mk
View file @ 35ac0181
......@@ -125,7 +125,11 @@ log_done =
#cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) -I/usr/X11R6/include -I$(jdk)/include -I$(jdk)/include/linux \
`pkg-config --cflags gtk+-2.0` -DPREFIX=\"/usr/local\" -DSYSCONFDIR=\"/etc\" -DDATADIR=\"/usr/share\" -DLIBDIR=\"/usr/lib\" $(cmysql) $(cgtk) $(clibusb)
csetos := $(pwre_conf_cc_define)
cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirgtk) $(pwre_conf_incdirgst)
ifeq ($(flavour),gtk)
cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirgtk) $(pwre_conf_incdirgst)
else
cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirqt)
endif
rm := rm
cp := cp
cpflags :=
......
src/tools/bld/src/os_linux/hw_x86_64/variables.mk
View file @ 35ac0181
......@@ -124,7 +124,11 @@ log_done =
#cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) -I/usr/X11R6/include -I$(jdk)/include -I$(jdk)/include/linux \
`pkg-config --cflags gtk+-2.0` -DPREFIX=\"/usr/local\" -DSYSCONFDIR=\"/etc\" -DDATADIR=\"/usr/share\" -DLIBDIR=\"/usr/lib\" $(cmysql) $(cgtk) $(clibusb)
csetos := $(pwre_conf_cc_define)
cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirgtk) $(pwre_conf_incdirgst)
ifeq ($(flavour),gtk)
cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirgtk) $(pwre_conf_incdirgst)
else
cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirqt)
endif
rm := rm
cp := cp
cpflags :=
......
src/tools/bld/src/os_linux/lib_generic.mk
View file @ 35ac0181
......@@ -35,6 +35,7 @@ vpath %.h $(hw_source):$(os_source):$(co_source)
vpath %.hpp $(hw_source):$(os_source):$(co_source)
vpath %.c $(hw_source):$(os_source):$(co_source)
vpath %.cpp $(hw_source):$(os_source):$(co_source)
vpath %.cqt $(hw_source):$(os_source):$(co_source)
vpath %.x $(hw_source):$(os_source):$(co_source)
vpath %.pdr $(hw_source):$(os_source):$(co_source)
vpath %.java $(hw_source):$(os_source):$(co_source)
......@@ -47,7 +48,16 @@ sources := $(sort \
$(foreach file, \
$(foreach dir, \
$(source_dirs), \
$(wildcard $(dir)/$(comp_name)*.c $(dir)/$(comp_name)*.cpp) \
$(wildcard $(dir)/$(comp_name)*.c $(dir)/$(comp_name)*.cpp $(dir)/$(comp_name)*.cqt) \
), $(notdir $(file)) \
) \
)
cqt_sources := $(sort \
$(foreach file, \
$(foreach dir, \
$(source_dirs), \
$(wildcard $(dir)/*.cqt) \
), $(notdir $(file)) \
) \
)
......@@ -115,6 +125,8 @@ meth_sources := $(sort \
) \
)
cqt_objects := $(patsubst %.cqt, %_moc.o, $(cqt_sources))
xdr_includes := $(addprefix $(inc_dir)/,$(patsubst %.x, %.h, $(xdr_sources)))
xdr_objects := $(patsubst %.x, %_xdr.o, $(xdr_sources))
......@@ -141,6 +153,7 @@ export_lib := $(lib_dir)/$(lib_name)$(lib_ext)
java_classes := $(addsuffix .class, $(basename $(java_sources)))
objects := $(addsuffix $(obj_ext), $(basename $(sources)))
objects += $(xdr_objects) $(pdr_objects)
objects += $(cqt_objects)
objects += $(java_classes)
objects := $(addprefix $(bld_dir)/, $(objects))
......
src/tools/bld/src/os_linux/rules.mk
View file @ 35ac0181
......@@ -102,6 +102,21 @@ endif
@ $(log_c_obj)
@ $(cxx) $(cxxflags) $(csetos) $(cinc) $(cobj) $(source)
$(bld_dir)/%.o : %.cqt
ifeq ($(nodep),)
@ $(log_c_d)
@ $(SHELL) -ec '$(cxx) -x c++ -MM $(csetos) $(mmflags) $(cinc) $(source) \
| sed '\''s|$*\.o[ ]*|$(bld_dir)/&|g'\'' > $(bld_dir)/$(sname).d'
endif
@ echo "Generating ../../$(sname)_moc.cpp from ../../$(sname).h using moc"
@ moc $(csetos) $(cinc) ../../$(sname).h \
-o $(bld_dir)/$(sname)_moc.cpp
@ echo "Compiling ../../$(sname)_moc.cpp"
@ $(cxx) $(cxxflags) $(csetos) $(cinc) -o $(bld_dir)/$(sname)_moc.o $(bld_dir)/$(sname)_moc.cpp
@ $(cp) $(source) $(bld_dir)/$(sname).cpp
@ $(log_c_obj)
@ $(cxx) $(cxxflags) $(csetos) $(cinc) $(cobj) $(bld_dir)/$(sname).cpp
$(bld_dir)/%.o : $(tmp_dir)/%.cpp
ifeq ($(nodep),)
......@@ -122,6 +137,21 @@ endif
@ $(log_c_obj)
@ $(cxx) $(cxxflags) $(csetos) $(cinc) $(cobj) $(source)
$(obj_dir)/%.o : %.cqt
ifeq ($(nodep),)
@ $(log_c_d)
@ $(SHELL) -ec '$(cxx) -x c++ -MM $(cinc) $(csetos) $(mmflags) $(source) \
| sed '\''s|$*\.o[ ]*|$(obj_dir)/&|g'\'' > $(obj_dir)/$(sname).d'
endif
@ echo "Generating ../../$(sname)_moc.cpp from ../../$(sname).h using moc"
@ moc $(csetos) $(cinc) ../../$(sname).h \
-o $(bld_dir)/$(sname)_moc.cpp
@ echo "Compiling ../../$(sname)_moc.cpp"
@ $(cxx) $(cxxflags) $(csetos) $(cinc) -o $(bld_dir)/$(sname)_moc.o $(bld_dir)/$(sname)_moc.cpp
@ $(cp) $(source) $(bld_dir)/$(sname).cpp
@ $(log_c_obj)
@ $(cxx) $(cxxflags) $(csetos) $(cinc) $(cobj) $(bld_dir)/$(sname).cpp
$(inc_dir)/%.h : %.x
@ $(log_x_h)
......@@ -169,7 +199,6 @@ endif
(%.o) : %.o
@ echo "Error, rule shall not be used: (%.o) : %.o"
$(inc_dir)/%.h : %.h
@ $(log_h_h)
@ $(cp) $(cpflags) $(source) $(target)
......
src/tools/pwre/src/os_linux/pwre.pl
View file @ 35ac0181
......@@ -352,12 +352,6 @@ sub ebuild # args: pass flavour
my $pass = $_[0];
my $flavour = $_[1];
if ( $_[1] eq "motif") {
$flavour = "motif";
}
else {
$flavour = "gtk";
}
if ( $pass eq "rt" ) {
_module("rt");
......@@ -617,12 +611,6 @@ sub ebuild # args: pass flavour
sub import ()
{
my $flavour = $_[1];
if ( $_[1] eq "motif") {
$flavour = "motif";
}
else {
$flavour = "gtk";
}
my($vmsinc) = $ENV{"pwre_vmsinc"};
if ( $vmsinc ne "" ) {
......@@ -840,7 +828,7 @@ sub method_build ()
my $flavour;
my $program;
if ( $_[0] eq "motif" || $_[0] eq "gtk") {
if ( $_[0] eq "motif" || $_[0] eq "gtk" || $_[0] eq "qt" ) {
$flavour = $_[0];
}
else {
......@@ -865,7 +853,7 @@ sub method_build ()
merge();
}
if ( $flavour eq "") {
$flavour = "gtk";
$flavour = "qt";
}
if ( $_[0] eq "wb" ) {
printf("-- Method build %s %s\n", $program, $flavour);
......@@ -966,9 +954,10 @@ sub build_module ()
}
if ( $_[0] eq "motif" || $_[1] eq "motif" || $_[2] eq "motif" || $_[3] eq "motif") {
$flavour = "motif";
}
else {
} elsif ( $_[0] eq "gtk" || $_[1] eq "gtk" || $_[2] eq "gtk" || $_[3] eq "gtk") {
$flavour = "gtk";
} else {
$flavour = "qt";
}
if (!defined($ENV{"pwre_env"})) {
......@@ -1186,12 +1175,6 @@ sub copy ()
system("$cmd");
my $flavour = $_[1];
if ( $_[1] eq "motif") {
$flavour = "motif";
}
else {
$flavour = "gtk";
}
my($cmd) = "make -f $bindir/import_files.mk" . " " . $_[0] . "_" . $flavour;
system("$cmd");
......@@ -1325,8 +1308,8 @@ sub list ()
print("-- Defined environments:\n");
foreach $env (sort keys (%envdb)) {
$varstr = $envdb{$env};
($sroot, $vmsinc, $broot, $btype, $os, $hw, $desc) = split(/:/, $varstr);
@vars = ($sroot, $vmsinc, $broot, $btype, $os, $hw, $desc);
($sroot, $vmsinc, $broot, $btype, $os, $hw, $flavour, $desc) = split(/:/, $varstr);
@vars = ($sroot, $vmsinc, $broot, $btype, $os, $hw, $flavour, $desc);
printf(" %s %s\n", $env, $desc);
}
print("--\n");
......
src/tools/pwre/src/os_linux/pwre_configure.sh
View file @ 35ac0181
......@@ -159,6 +159,8 @@ pwre_config_check_lib()
conf_libgtk=$conf_libgtk" -l${lib%.*}"
elif test $4 == "motif"; then
conf_libmotif=$conf_libmotif" -l${lib%.*}"
elif test $4 == "qt"; then
conf_libqt=$conf_libqt" -l${lib%.*}"
elif test $4 == "wb"; then
conf_libwb=$conf_libwb" -l${lib%.*}"
elif test $4 == "mq"; then
......@@ -184,6 +186,9 @@ pwre_config_check_lib()
elif test $3 == "gtk"; then
conf_libgtk=$conf_libgtk" \\\`pkg-config --libs gtk+-2.0\\\`"
conf_incdirgtk=$conf_incdirgtk" \\\`pkg-config --cflags gtk+-2.0\\\`"
elif test $3 == "qt"; then
conf_libqt=$conf_libqt" \\\`pkg-config --libs QtCore QtGui QtNetwork phonon\\\`"
conf_incdirqt=$conf_incdirqt" \\\`pkg-config --cflags QtCore QtGui QtNetwork phonon\\\`"
elif test $3 == "gst"; then
conf_libgst=$conf_libgst" \\\`pkg-config --libs gstreamer-interfaces-0.10 gstreamer-0.10\\\`"
conf_incdirgst=$conf_incdirgst" \\\`pkg-config --cflags gstreamer-interfaces-0.10 gstreamer-0.10\\\`"
......@@ -274,11 +279,13 @@ conf_libwb=""
conf_libmq=""
conf_libwmq=""
conf_libpnak=""
conf_libgtk=""
conf_libgtk=""
conf_libqt=""
conf_libmotif=""
conf_libgst=""
conf_libdir=""
conf_incdirgtk=""
conf_incdirqt=""
conf_incdirgst=""
let inc_cnt=0
let lib_cnt=0
......@@ -383,8 +390,15 @@ echo "export PWRE_CONF_LOCKDBS=$lockdbs" >> $cfile
if [ $pwre_hw == "hw_arm" ] && [ $ebuild -eq 1 ]; then
echo "Arm ebuild"
pwre_config_check_lib gtk GTK gtk gtk 0 "/usr/lib/libgtk-x11-2.0.so:/usr/lib/$hwpl-linux-$gnu/libgtk-x11-2.0.so"
pwre_config_check_include gtk GTK 1 "/usr/local/include/gtk-2.0/gtk.h:/usr/local/include/gtk-2.0/gtk/gtk.h:/usr/include/gtk-2.0/gtk/gtk.h"
if [ $pwre_conf_qt -eq 1 ]; then
pwre_config_check_lib qt QT qt qt 0 "/usr/lib/libQtGui.so:/usr/lib/$hwpl-linux-$gnu/libQtGui.so"
pwre_config_check_include qt QT 1 "/usr/include/qt4/QtGui/QtGui"
else
pwre_config_check_lib gtk GTK gtk gtk 0 "/usr/lib/libgtk-x11-2.0.so:/usr/lib/$hwpl-linux-$gnu/libgtk-x11-2.0.so"
pwre_config_check_include gtk GTK 1 "/usr/local/include/gtk-2.0/gtk.h:/usr/local/include/gtk-2.0/gtk/gtk.h:/usr/include/gtk-2.0/gtk/gtk.h"
fi
pwre_config_check_include jni JNI 1 $jdk/include/jni.h
pwre_config_check_include jni JNI 0 $jdk/include/linux/jni_md.h
......@@ -412,9 +426,11 @@ if [ $pwre_hw == "hw_arm" ] && [ $ebuild -eq 1 ]; then
echo "export pwre_conf_libpwrprofibus=\"-lpwr_pnak_dummy\"" >> $cfile
echo "export pwre_conf_libpwrxtt=\"-lpwr_xtt -lpwr_ge -lpwr_cow -lpwr_flow -lpwr_glow\"" >> $cfile
echo "export pwre_conf_libpwrxttgtk=\" -lpwr_xtt_gtk -lpwr_ge_gtk -lpwr_cow_gtk -lpwr_flow_gtk -lpwr_glow_gtk\"" >> $cfile
echo "export pwre_conf_libpwrxttqt=\" -lpwr_xtt_qt -lpwr_ge_qt -lpwr_cow_qt -lpwr_flow_qt -lpwr_glow_qt\"" >> $cfile
echo "export pwre_conf_libpwrxttmotif=\" -lpwr_xtt_motif -lpwr_ge_motif -lpwr_cow_motif -lpwr_flow_motif -lpwr_glow_motif\"" >> $cfile
echo "export pwre_conf_libpwrwb=\"-lpwr_wb\"" >> $cfile
echo "export pwre_conf_libpwrwbgtk=\"-lpwr_wb_gtk\"" >> $cfile
echo "export pwre_conf_libpwrwbqt=\"-lpwr_wb_qt\"" >> $cfile
echo "export pwre_conf_libpwrwbmotif=\"-lpwr_wb_motif\"" >> $cfile
echo "export pwre_conf_libpwropc=\"-lpwr_opc\"" >> $cfile
echo "export pwre_conf_libpwrremote=\"-lpwr_remote\"" >> $cfile
......@@ -427,11 +443,13 @@ if [ $pwre_hw == "hw_arm" ] && [ $ebuild -eq 1 ]; then
echo "export pwre_conf_libwmq=\"$conf_libwmq\"" >> $cfile
echo "export pwre_conf_libpnak=\"$conf_libpnak\"" >> $cfile
echo "export pwre_conf_libgtk=\"$conf_libgtk\"" >> $cfile
echo "export pwre_conf_libqt=\"$conf_libqt\"" >> $cfile
echo "export pwre_conf_libmotif=\"$conf_libmotif\"" >> $cfile
echo "export pwre_conf_libgst=\"$conf_libgtk\"" >> $cfile
echo "export pwre_conf_libdir=\"$conf_libdir\"" >> $cfile
echo "export pwre_conf_incdir=\"$conf_incdir\"" >> $cfile
echo "export pwre_conf_incdirgtk=\"$conf_incdirgtk\"" >> $cfile
echo "export pwre_conf_incdirqt=\"$conf_incdirqt\"" >> $cfile
echo "export pwre_conf_dtt_platform=\"arm_linux\"" >> $cfile
else
......@@ -443,7 +461,11 @@ else
#Gtk
echo "Mandatory :"
pwre_config_check_lib gtk GTK gtk gtk 0 "/usr/lib/libgtk-x11-2.0.so:/usr/lib/$hwpl-linux-$gnu/libgtk-x11-2.0.so"
if [ $pwre_conf_qt -eq 1 ]; then
pwre_config_check_lib qt QT qt qt 0 "/usr/lib/libQtGui.so:/usr/lib/$hwpl-linux-$gnu/libQtGui.so"
else
pwre_config_check_lib gtk GTK gtk gtk 0 "/usr/lib/libgtk-x11-2.0.so:/usr/lib/$hwpl-linux-$gnu/libgtk-x11-2.0.so"
fi
pwre_config_check_lib librpcsvc LIBRPCSVC lib lib 0 "/usr/lib/librpcsvc.so:/usr/lib/librpcsvc.a:/usr/lib/$hwpl-linux-$gnu/librpcsvc.a"
pwre_config_check_lib libasound LIBASOUND lib lib 0 "/usr/lib/libasound.so:/usr/lib/libasound.a:/usr/lib/$hwpl-linux-$gnu/libasound.so"
......@@ -457,7 +479,11 @@ else
pwre_config_check_lib libfl LIBFL lib lib 0 "/usr/lib/libfl.so:/usr/lib/libfl.a:/usr/lib/$hwpl-linux-$gnu/libfl.so"
pwre_config_check_lib libX11 LIBX11 lib lib 0 "/usr/lib/libX11.so:/usr/lib/$hwpl-linux-$gnu/libX11.so"
pwre_config_check_include gtk GTK 1 "/usr/local/include/gtk-2.0/gtk.h:/usr/local/include/gtk-2.0/gtk/gtk.h:/usr/include/gtk-2.0/gtk/gtk.h"
if [ $pwre_conf_qt -eq 1 ]; then
pwre_config_check_include qt QT 1 "/usr/include/qt4/QtGui/QtGui"
else
pwre_config_check_include gtk GTK 1 "/usr/local/include/gtk-2.0/gtk.h:/usr/local/include/gtk-2.0/gtk/gtk.h:/usr/include/gtk-2.0/gtk/gtk.h"
fi
pwre_config_check_include alsa ALSA 1 "/usr/include/alsa/asoundlib.h"
echo ""
......@@ -521,9 +547,11 @@ else
echo "export pwre_conf_libpwrpowerlinkcn=\"$conf_libpowerlinkcn\"" >> $cfile
echo "export pwre_conf_libpwrxtt=\"-lpwr_xtt -lpwr_ge -lpwr_cow -lpwr_flow -lpwr_glow\"" >> $cfile
echo "export pwre_conf_libpwrxttgtk=\" -lpwr_xtt_gtk -lpwr_ge_gtk -lpwr_cow_gtk -lpwr_flow_gtk -lpwr_glow_gtk\"" >> $cfile
echo "export pwre_conf_libpwrxttqt=\" -lpwr_xtt_qt -lpwr_ge_qt -lpwr_cow_qt -lpwr_flow_qt -lpwr_glow_qt\"" >> $cfile
echo "export pwre_conf_libpwrxttmotif=\" -lpwr_xtt_motif -lpwr_ge_motif -lpwr_cow_motif -lpwr_flow_motif -lpwr_glow_motif\"" >> $cfile
echo "export pwre_conf_libpwrwb=\"-lpwr_wb\"" >> $cfile
echo "export pwre_conf_libpwrwbgtk=\"-lpwr_wb_gtk\"" >> $cfile
echo "export pwre_conf_libpwrwbqt=\"-lpwr_wb_qt\"" >> $cfile
echo "export pwre_conf_libpwrwbmotif=\"-lpwr_wb_motif\"" >> $cfile
echo "export pwre_conf_libpwropc=\"-lpwr_opc\"" >> $cfile
echo "export pwre_conf_libpwrremote=\"-lpwr_remote\"" >> $cfile
......@@ -536,11 +564,13 @@ else
echo "export pwre_conf_libwmq=\"$conf_libwmq\"" >> $cfile
echo "export pwre_conf_libpnak=\"$conf_libpnak\"" >> $cfile
echo "export pwre_conf_libgtk=\"$conf_libgtk\"" >> $cfile
echo "export pwre_conf_libqt=\"$conf_libqt\"" >> $cfile
echo "export pwre_conf_libgst=\"$conf_libgst\"" >> $cfile
echo "export pwre_conf_libmotif=\"$conf_libmotif\"" >> $cfile
echo "export pwre_conf_libdir=\"$conf_libdir\"" >> $cfile
echo "export pwre_conf_incdir=\"$conf_incdir\"" >> $cfile
echo "export pwre_conf_incdirgtk=\"$conf_incdirgtk\"" >> $cfile
echo "export pwre_conf_incdirqt=\"$conf_incdirqt\"" >> $cfile
echo "export pwre_conf_incdirgst=\"$conf_incdirgst\"" >> $cfile
fi
src/tools/pwre/src/os_linux/pwre_function
View file @ 35ac0181
......@@ -161,6 +161,12 @@ set_env()
else
export pwre_conf_gtk=0
fi
# Qt
if [ -e /usr/lib/x86_64-linux-gnu/libQtGui.so ]; then
export pwre_conf_qt=1
else
export pwre_conf_qt=0
fi
# libusb
if [ -e /usr/lib/libusb-1.0.so ]; then
......
src/tools/pwre/src/os_linux/pwre_merge.sh
View file @ 35ac0181
......@@ -77,7 +77,7 @@ else
for lib in $libraries; do
arname=${lib##/*/}
if [ $arname = "libpwr_rt.a" ] || [ $arname = "libpwr_cow.a" ] || [ $arname = "libpwr_cow_motif.a" ] || [ $arname = "libpwr_cow_gtk.a" ] || [ $arname = "libpwr_wb.a" ] || [ $arname = "libpwr_wb_motif.a" ] || [ $arname = "libpwr_wb_gtk.a" ] || [ $arname = "libpwr_xtt.a" ] || [ $arname = "libpwr_xtt_motif.a" ] || [ $arname = "libpwr_xtt_gtk.a" ]; then
if [ $arname = "libpwr_rt.a" ] || [ $arname = "libpwr_cow.a" ] || [ $arname = "libpwr_cow_motif.a" ] || [ $arname = "libpwr_cow_gtk.a" ] || [ $arname = "libpwr_cow_qt.a" ] || [ $arname = "libpwr_wb.a" ] || [ $arname = "libpwr_wb_motif.a" ] || [ $arname = "libpwr_wb_gtk.a" ] || [ $arname = "libpwr_wb_qt.a" ] || [ $arname = "libpwr_xtt.a" ] || [ $arname = "libpwr_xtt_motif.a" ] || [ $arname = "libpwr_xtt_gtk.a" ] || [ $arname = "libpwr_xtt_qt.a" ]; then
if [ $ver -eq 1 ]; then
echo "Merge $lib"
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7