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
2be40e09
Commit
2be40e09
authored
Aug 01, 2018
by
Christoffer Ackelman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed compilation error if both qt and gtk versions are compiled
parent
5cd4a83b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
6 deletions
+4
-6
src/tools/pwre/src/os_linux/pwre_configure.sh
src/tools/pwre/src/os_linux/pwre_configure.sh
+4
-6
No files found.
src/tools/pwre/src/os_linux/pwre_configure.sh
View file @
2be40e09
...
@@ -466,10 +466,9 @@ else
...
@@ -466,10 +466,9 @@ else
#Gtk
#Gtk
echo
"Mandatory :"
echo
"Mandatory :"
if [
$pwre_conf_qt
-eq 1
]; then
if [
! -z
$pwre_conf_qt
]; then
pwre_config_check_lib qt QT qt qt 0
"/usr/lib/libQtGui.so:/usr/lib/
$hwpl
-linux-
$gnu
/libQtGui.so"
pwre_config_check_lib qt QT qt qt 0
"/usr/lib/libQtGui.so:/usr/lib/
$hwpl
-linux-
$gnu
/libQtGui.so"
fi
elif [ ! -z
$pwre_conf_gtk
]; then
if [
$pwre_conf_gtk
-eq 1 ]; then
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_lib gtk GTK gtk gtk 0
"/usr/lib/libgtk-x11-2.0.so:/usr/lib/
$hwpl
-linux-
$gnu
/libgtk-x11-2.0.so"
fi
fi
...
@@ -485,13 +484,12 @@ else
...
@@ -485,13 +484,12 @@ 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 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_lib libX11 LIBX11 lib lib 0
"/usr/lib/libX11.so:/usr/lib/
$hwpl
-linux-
$gnu
/libX11.so"
if [
$pwre_conf_qt
-eq 1
]; then
if [
! -z
$pwre_conf_qt
]; then
pwre_config_check_include qt QT 1
"/usr/include/qt4/QtGui"
pwre_config_check_include qt QT 1
"/usr/include/qt4/QtGui"
pwre_config_check_include qt QT 1
"/usr/include/qt4/QtCore/QtCore"
pwre_config_check_include qt QT 1
"/usr/include/qt4/QtCore/QtCore"
pwre_config_check_include qt QT 1
"/usr/include/qt4/QtGui/QtGui"
pwre_config_check_include qt QT 1
"/usr/include/qt4/QtGui/QtGui"
pwre_config_check_include qt QT 1
"/usr/include/qt4/QtNetwork/QtNetwork"
pwre_config_check_include qt QT 1
"/usr/include/qt4/QtNetwork/QtNetwork"
fi
elif [ ! -z
$pwre_conf_gtk
]; then
if [
$pwre_conf_gtk
-eq 1 ]; then
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"
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
fi
pwre_config_check_include alsa ALSA 1
"/usr/include/alsa/asoundlib.h"
pwre_config_check_include alsa ALSA 1
"/usr/include/alsa/asoundlib.h"
...
...
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